github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,400 Commits 140 Branches 571 Tags
d49bb2416bbcd8cc6703e59fda727dfa28435243
Commit Graph

7667 Commits

Author SHA1 Message Date
Kevin Sawicki
d49bb2416b Use subscribe instead of namespace 2014-02-12 13:01:47 -08:00
Kevin Sawicki
1d2c3bce20 Remove unused requires 2014-02-12 13:01:47 -08:00
Kevin Sawicki
48f69880e0 💄 Use this instead of @ 2014-02-12 13:01:47 -08:00
Kevin Sawicki
ed7de42ba0 Use single interval to blink all cursors 2014-02-12 13:01:47 -08:00
Kevin Sawicki
4e2218b005 Use @ instead of EditorView prefix 2014-02-12 08:59:06 -08:00
Kevin Sawicki
8b83918a24 📝 Doc params in window.coffee 2014-02-12 08:54:16 -08:00
Kevin Sawicki
a1ce1c9ef6 📝 . instead of , 2014-02-12 08:43:16 -08:00
Cheng Zhao
823a79610f 💄 "Private:" is not needed anymore. 2014-02-12 20:41:09 +08:00
Cheng Zhao
3929189e7a Merge branch 'master' into privilege-escalation 
Conflicts:
	src/text-buffer.coffee
 2014-02-12 19:32:49 +08:00
Kevin Sawicki
fb73240654 Guard against non-existent .workspace element 2014-02-11 17:13:37 -08:00
Kevin Sawicki
cc890ebdc0 Add editor.fontFamily config default 
This causes it to display in the settings view.
 2014-02-11 17:00:25 -08:00
Corey Johnson
7708d645c9 Merge pull request #1526 from atom/ks-remove-immediate-and-sync-activate-calls 
Remove immediate/sync option to activatePackage
 2014-02-11 16:56:49 -08:00
Kevin Sawicki
29cbea4d50 📝 optional not option 2014-02-11 16:53:36 -08:00
Kevin Sawicki
8b1b3d237d Init pendingUpdateOperation in ctor 2014-02-11 16:53:00 -08:00
Kevin Sawicki
7d7f208fc5 Add missing keybidings to menu 
This was caused by the test element not simulating a div element
with the .workspace class.
 2014-02-11 16:48:32 -08:00
Kevin Sawicki
d6fc3e6d01 Move insertDelta computation under transact call 2014-02-11 15:55:32 -08:00
Kevin Sawicki
04d8584742 Use fold directly 2014-02-11 15:55:32 -08:00
Kevin Sawicki
de88d6b624 Support moving up folds around folds 2014-02-11 15:55:32 -08:00
Kevin Sawicki
32a15796c1 Mention screen rows are used 2014-02-11 15:55:32 -08:00
Kevin Sawicki
905e456a15 Only fold valid buffer rows 2014-02-11 15:55:32 -08:00
Kevin Sawicki
04c59952d5 Support moving down folds around folds 2014-02-11 15:55:32 -08:00
Kevin Sawicki
a93bfb5f8c Make sure moved lines don't go into a fold 2014-02-11 15:55:32 -08:00
Kevin Sawicki
f9cdc4883e Move around folds when moving lines down 2014-02-11 15:55:32 -08:00
Kevin Sawicki
4d230a0517 📝 Pluralize line 2014-02-11 15:55:31 -08:00
Kevin Sawicki
dda412d5ec Add window:reset-font-size command 2014-02-11 15:40:12 -08:00
probablycorey
c6baed045d Merge remote-tracking branch 'origin/master' into ks-remove-immediate-and-sync-activate-calls 
Conflicts:
	package.json
 2014-02-11 12:29:02 -08:00
probablycorey
57e7335907 Merge branch 'cj-update-markdown-preview' 
Conflicts:
	src/pane.coffee
 2014-02-11 11:33:46 -08:00
Corey Johnson
15442c3dba Merge pull request #1527 from atom/cj-update-markdown-preview 
Changes inspired by Markdown Preview
 2014-02-11 11:27:02 -08:00
probablycorey
a2fcc7aa7a Add Workspace::getActiveEditor and Pane::getActiveEditor 2014-02-11 10:58:24 -08:00
probablycorey
4b529ae167 Make methods private 2014-02-11 09:33:12 -08:00
probablycorey
51fbb1be07 Add Pane::getActiveItem 2014-02-11 08:59:34 -08:00
probablycorey
af1f57048b Add Pane::getActiveItem 2014-02-11 08:55:45 -08:00
Kevin Sawicki
d9ddf516f8 📝 Clarify TextBuffer::isInConflict 2014-02-11 08:46:21 -08:00
Kevin Sawicki
1436b8eb5e Rename path variables to filePath 2014-02-11 08:46:00 -08:00
Kevin Sawicki
1645efa2ce Clear conflict when the buffer is saved 2014-02-11 08:46:00 -08:00
Cheng Zhao
d0fe2c9a5b Cache content after file is written successfully. 2014-02-11 15:10:41 +08:00
Cheng Zhao
84ee94dfd1 Support privilege escalation when writing file. 2014-02-11 14:58:15 +08:00
probablycorey
2a2858554a Remove synchronous package loading shims 2014-02-10 15:52:34 -08:00
Kevin Sawicki
c00c5c97f1 Remove unused file extension API 2014-02-10 14:43:47 -08:00
Kevin Sawicki
2248bbf8fb Remove unused ivars 2014-02-10 14:43:28 -08:00
probablycorey
ffb7093cf3 Merge branch 'cj-make-package-activation-consistent' into cj-update-markdown-preview 
Conflicts:
	src/deserializer-manager.coffee
	src/workspace.coffee
 2014-02-10 14:17:46 -08:00
probablycorey
d415ec9a00 Add custom load and activate method to Theme Package 2014-02-10 13:39:38 -08:00
Kevin Sawicki
8425c15cd7 💄 Use Array::filter instead of for/in/when 2014-02-10 13:21:08 -08:00
Kevin Sawicki
81e86c1467 📝 Remove Internal: comment 2014-02-10 11:48:21 -08:00
Kevin Sawicki
0724dd7a7c Remove unused requires 2014-02-10 11:47:07 -08:00
Kevin Sawicki
8eee4d87be Guard against missing workspace view 2014-02-10 11:41:08 -08:00
probablycorey
e6d7413af1 Always call deactivate on loaded packages 2014-02-10 11:24:02 -08:00
Kevin Sawicki
31a154d7eb Use subscription to track if disabled packages are observed 2014-02-10 09:17:15 -08:00
probablycorey
ae7306572b Guard against empty activationDeferred var 2014-02-07 21:00:50 -08:00
Kevin Sawicki
1a81248c88 💄 Remove extra space 2014-02-07 17:14:24 -08:00