Commit Graph

28740 Commits

Author SHA1 Message Date
Wliu
3268765341 Revert "Decrease spec timeouts"
This reverts commit a9da862678.
2016-05-05 20:42:17 -04:00
Wliu
02d7bdeaaa Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-37 2016-05-04 15:58:21 -04:00
Antonio Scandurra
ca041384fe Merge pull request #11414 from atom/ns-switch-to-display-layers
Use display layers facility of text-buffer; delete all the code they replace
2016-05-04 20:46:15 +02:00
Damien Guard
ee3425d543 Merge pull request #11323 from clickthisnick/master
Update Grammar In Spec Files
2016-05-04 11:22:37 -07:00
Damien Guard
d3825e87f3 Merge pull request #11642 from atom/dg-buffered-process-options-shell
Fix some Buffered-Process specs, honor options.shell in Atom
2016-05-04 10:19:04 -07:00
Antonio Scandurra
89d6b1fcce ⬆️ text-buffer 2016-05-04 18:57:07 +02:00
Antonio Scandurra
3b46d7f50b Merge branch 'master' into ns-switch-to-display-layers
# Conflicts:
#	src/text-editor.coffee
2016-05-04 18:56:45 +02:00
Michelle Tilley
512f1fb540 ⬆️ symbols-view@0.113.0 2016-05-04 11:56:17 +02:00
Antonio Scandurra
6c6f8fc341 ⬆️ autocomplete-plus 2016-05-04 10:15:02 +02:00
simurai
b9dbb81bd5 Revert "⬆️ language-sass@0.50.0"
This reverts commit d29e96e358.
2016-05-04 12:05:04 +09:00
Wliu
d29e96e358 ⬆️ language-sass@0.50.0 2016-05-03 20:47:02 -04:00
Damien Guard
c56cbe3ce3 👕 Change fat arrow to thin arrow for linter warning 2016-05-03 16:50:06 -07:00
Lee Dohm
0e194f1021 ⬆️ line-ending-selector@0.5.0 2016-05-03 16:04:04 -07:00
Damien Guard
48703864c8 Switch to process.platform, stop clobbering process var and move windows block 2016-05-03 15:22:13 -07:00
Lee Dohm
d6d47c422c ⬆️ settings-view@0.236.0 2016-05-03 09:21:21 -07:00
Josh Abernathy
3781bd2062 Merge pull request #11671 from atom/disentangle-text-editors-global
Remove TextEditor's dependency on the textEditors global
2016-05-03 10:33:41 -04:00
Antonio Scandurra
004bb6122c 🎨 🐎 2016-05-03 13:24:28 +02:00
Antonio Scandurra
6b4c082bbf ⬆️ text-buffer 2016-05-03 13:06:16 +02:00
Antonio Scandurra
36bcb542a8 Don't move down a line if it's the last buffer row 2016-05-03 12:58:59 +02:00
Lee Dohm
72721af3c6 Merge pull request #11478 from atom/ku-prompt-save-as-if-save-fails
Prompt user to save as if save fails
2016-05-02 17:36:56 -07:00
Wliu
bb46933d58 Explicitly set mini to false when it isn't passed 2016-05-02 20:08:35 -04:00
Lee Dohm
ab24ce37fe Merge pull request #11669 from tcyrus/patch-1
Update package.json
2016-05-02 17:02:30 -07:00
Damien Guard
7542a401ff BufferedProcess whole-string spec now cross-platform 2016-05-02 15:37:36 -07:00
Lee Dohm
dd24e3b223 ⬆️ tabs@0.93.2 2016-05-02 13:19:19 -07:00
Wliu
6b4742355a Set background throttling directly 2016-05-02 20:10:44 +00:00
joshaber
d325e02def Test it. 2016-05-02 11:32:38 -04:00
joshaber
9adc822822 Mark text editors as being registered. 2016-05-02 11:32:29 -04:00
Timothy Cyrus
874be7d242 Update package.json
Update `marked` to fix sanitization issue on david-dm
2016-05-02 10:47:49 -04:00
Wliu
3e507e1157 atom.asar -> electron.asar 2016-05-02 14:27:42 +00:00
Antonio Scandurra
b7c6850413 Merge pull request #11506 from wvanlint/listener_order
Allow listeners to specify their calling order
2016-05-02 10:13:34 +02:00
Michelle Tilley
671334993f ⬆️ apm@1.10.0 2016-05-01 22:16:36 -07:00
Willem Van Lint
73748ef768 Order listeners by reverse registration order 2016-05-01 16:48:09 -07:00
Lee Dohm
57bf8f797b ⬆️ encoding-selector@0.22.0 2016-05-01 10:32:21 -07:00
Antonio Scandurra
f4a31261d0 Delete indent guides code from the presenter and the component
…because we're handling that behavior in `TextEditor` and `DisplayLayer`
now.
2016-05-01 11:48:39 +02:00
Antonio Scandurra
1c694df03b Don't show indent guides for mini editors 2016-05-01 11:42:28 +02:00
Antonio Scandurra
4f5efe98ff Overshoot to the nearest character when text nodes are not contiguous 2016-05-01 11:05:14 +02:00
Antonio Scandurra
334b4c1104 Overshoot to the end of the text node when the position cannot be found
...because the only possible scenario when a logical position in a text
node cannot be found is when the requested pixel position is exactly at
the end of the node.
2016-04-30 11:51:54 +02:00
Antonio Scandurra
02d9245c05 Merge branch 'master' into ns-switch-to-display-layers 2016-04-30 11:10:17 +02:00
Antonio Scandurra
7690331555 Merge branch 'master' into wl-electron-37
# Conflicts:
#	package.json
2016-04-30 09:23:14 +02:00
Antonio Scandurra
005022567b Merge pull request #11348 from atom/wl-drewmnoel-electron
Update Electron to 0.36.12
2016-04-30 09:19:17 +02:00
Antonio Scandurra
5a9bd28912 Merge pull request #11646 from atom/as-persist-state-on-reload
Persist the entire state on reload
2016-04-30 01:36:37 +02:00
Antonio Scandurra
539fc4090b ⬆️ bookmarks 2016-04-30 01:34:49 +02:00
Wliu
e237a37987 Merge remote-tracking branch 'refs/remotes/origin/master' into wl-electron-37 2016-04-29 18:43:48 -04:00
Wliu
a9da862678 Decrease spec timeouts
Reverts a35e24658d
2016-04-29 18:43:45 -04:00
Wliu
8d9324e234 ⬆️ language-sass@0.49.0 2016-04-29 18:30:19 -04:00
Wliu
5df4a8ccd0 ⬆️ electron@0.37.8 2016-04-29 18:22:05 -04:00
Wliu
b975c1ffc1 ⬆️ language-sass@0.48.0 2016-04-29 18:15:41 -04:00
Lee Dohm
f6352cb47b Merge pull request #11618 from delliott2016/master
Prompt for ctrl-o defaults to last directory where you opened a file
2016-04-29 10:53:17 -07:00
Lee Dohm
fc04e35621 Merge pull request #11634 from livelazily/get-completed-data
🐛 Wait for connection end to get completed data;
2016-04-29 09:35:16 -07:00
David Elliott
6c9d7ecc28 Remove random space 2016-04-29 08:39:14 -07:00