Max Brunsfeld
911be22b8b
Merge pull request #8933 from atom/mb-fix-text-buffer-load-serialization
...
Upgrade text-buffer to fix serialization incompatibility
2015-09-24 14:09:25 -07:00
Max Brunsfeld
9a8989d707
⬆️ text-buffer
2015-09-24 13:46:29 -07:00
Max Brunsfeld
e6e4ec285a
Merge branch 'beta'
2015-09-24 12:16:25 -07:00
Max Brunsfeld
cd527b8cff
Merge branch 'stable' into beta
2015-09-24 12:16:05 -07:00
Max Brunsfeld
235d6f7ff8
Prepare 1.0.18
2015-09-24 12:15:25 -07:00
Max Brunsfeld
c3d75bea92
Prepare 1.0.17
2015-09-24 11:37:40 -07:00
Max Brunsfeld
7a0fa8ecdc
Merge pull request #8897 from ssorallen/lowercase-optional
...
Use lowercase 'optional' keyword used by docs
2015-09-24 11:26:07 -07:00
Kevin Sawicki
238f5a9622
Clean root electron directory
2015-09-24 10:30:10 -07:00
Kevin Sawicki
acc9b463df
Merge branch 'beta'
2015-09-24 09:11:00 -07:00
Kevin Sawicki
d29ff7556c
Merge branch 'stable' into beta
2015-09-24 09:05:46 -07:00
Kevin Sawicki
c2b7924830
Merge pull request #8927 from atom/ks-electron-upgrade
...
Upgrade to Electron 0.30.7
2015-09-24 08:57:32 -07:00
Kevin Sawicki
b06e5a7bcb
⬆️ electron@0.30.7
2015-09-24 08:07:19 -07:00
Antonio Scandurra
2e6bb53303
Maintain scroll history
2015-09-24 16:25:58 +02:00
Antonio Scandurra
365a586466
Ensure realScroll... is up to date with scroll...
2015-09-24 15:16:40 +02:00
Ivan Žužak
f20c73aa9b
⬆️ settings-view@0.222.0
2015-09-24 15:06:36 +02:00
Antonio Scandurra
99e77dc09d
Port leftover specs from DisplayBuffer
2015-09-24 11:41:02 +02:00
Antonio Scandurra
270334b713
Adjust pixelRectForScreenRange to return absolute values
2015-09-24 11:30:46 +02:00
Antonio Scandurra
19ca87f79f
💚 Fix specs
2015-09-24 11:27:54 +02:00
Antonio Scandurra
535a9da946
wip
2015-09-24 11:21:26 +02:00
Antonio Scandurra
a137e50857
Merge pull request #8895 from atom/as-undefined-offset-height
...
Allow null TextEditorComponent::domNode during visibility check
2015-09-24 10:33:44 +02:00
Antonio Scandurra
3236c8f0f8
Let's start with deprecations!
2015-09-24 10:07:38 +02:00
Antonio Scandurra
c76525fc63
Restore scroll position after we have pixel position requirements
2015-09-24 10:01:11 +02:00
Antonio Scandurra
6673c892d5
Remove references to TextEditor::scroll...
2015-09-24 09:15:10 +02:00
simurai
9daefc7395
⬆️ one-dark/light-syntax@v1.1.1
2015-09-24 16:11:14 +09:00
Antonio Scandurra
1f81c633e0
Serialize state using logical coordinates
2015-09-24 09:01:51 +02:00
Antonio Scandurra
89fea629c6
Merge branch 'master' into as-display-buffer-logical-coordinates
2015-09-24 08:28:35 +02:00
Cheng Zhao
c148df11c9
Merge pull request #8900 from atom/cz-update-native-modules
...
Update all native modules and their dependents to Nan 2
2015-09-24 13:45:44 +08:00
Max Brunsfeld
feb4bd619f
Remove extra space
2015-09-23 17:33:00 -07:00
Max Brunsfeld
3c48af049d
Name files correctly for beta in debian and rpm packages
2015-09-23 17:33:00 -07:00
Max Brunsfeld
a97029c3d2
Merge pull request #8721 from scv119/autoupdate
...
Add --no-auto-update while run `scripts/build` to disable autoupdate
2015-09-23 17:31:52 -07:00
Nathan Sobo
af83249d4e
Merge branch 'stable' into beta
2015-09-23 16:59:50 -06:00
Max Brunsfeld
cd31f9506a
Install apm as apm-beta in beta version
2015-09-23 14:10:07 -07:00
Max Brunsfeld
1102a9687b
Install beta atom shell script as /bin/atom-beta on linux
2015-09-23 14:10:07 -07:00
Max Brunsfeld
b944061eb6
Use beta version when shell script is launched as 'atom-beta'
2015-09-23 14:10:07 -07:00
Max Brunsfeld
a9531fc4dd
Install atom command as 'atom-beta' when using beta version
2015-09-23 14:10:07 -07:00
Max Brunsfeld
69949eef31
Compute app name based on productName & channel
2015-09-23 14:10:07 -07:00
Max Brunsfeld
2a1c9f0cf3
Merge branch 'master' into cz-update-native-modules
...
Conflicts:
package.json
2015-09-23 12:48:12 -07:00
Max Brunsfeld
bb2bd5492f
Merge branch 'master' into cz-update-native-modules
...
Conflicts:
package.json
2015-09-23 12:46:08 -07:00
Nathan Sobo
de2bce4f1d
More helpful hints
2015-09-23 13:07:31 -06:00
Antonio Scandurra
4ffeb68403
Ensure domNode is not set arbitrarily to null
2015-09-23 19:01:57 +02:00
Antonio Scandurra
6f120de1a6
Bring back the visible row range API
2015-09-23 18:52:04 +02:00
Antonio Scandurra
91ef57ed29
Merge branch 'master' into as-display-buffer-logical-coordinates
...
# Conflicts:
# src/display-buffer.coffee
2015-09-23 18:46:16 +02:00
Antonio Scandurra
36b0aa0126
🔥
2015-09-23 18:45:32 +02:00
Nathan Sobo
0a67cb9729
Merge pull request #8682 from atom/tj-remove-deprecations
...
Remove deprecated code
2015-09-23 10:41:26 -06:00
Nathan Sobo
50ce1c4afc
Guard against undefined state in Workspace.deserialize
2015-09-23 10:16:59 -06:00
Ivan Zuzak
abe924f231
Assign error in catch block for clarity
2015-09-23 10:07:01 -06:00
Ivan Žužak
17b68160cd
Fix coffelint error causing Travis builds to fail
...
Currently, running coffeelint produces this error and causes Travis
builds to fail:
```
Running "coffeelint:src" (coffeelint) task
src/command-installer.coffee
✖ line 73 Line contains inconsistent indentation Expected 2 got 0
✖ 1 error
Warning: Task "coffeelint:src" failed. Use --force to continue.
Error: Task "coffeelint:src" failed.
```
See https://github.com/clutchski/coffeelint/issues/189 for more information
on this problem and suggested approach, and for a different place in Atom
where this approach is used see this:
ca39c106d6/src/config.coffee (L984)
2015-09-23 10:06:52 -06:00
Antonio Scandurra
2112b0a302
🔥 Remove unused method
2015-09-23 17:49:41 +02:00
Antonio Scandurra
e85f61cced
Continue emitting events when setting scroll top in the model
2015-09-23 17:43:53 +02:00
Antonio Scandurra
baf27bf99a
Preserve un-rounded scroll positions
2015-09-23 17:40:48 +02:00
