github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-19 02:44:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,822 Commits 140 Branches 571 Tags
b1f5d1e276bd04942ed3c5f68cabbce364fea365
Commit Graph

10822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
probablycorey
b1f5d1e276 Emit pane:before-item-destroyed event 2013-10-28 15:40:28 -07:00
Corey Johnson
a828f389f4 Merge pull request #1038 from atom/cj-add-user-keymap-file 
Use `~/.atom/keymap.cson` file instead of `~/atom/keymaps` directory
 2013-10-28 15:13:45 -07:00
probablycorey
91c8371752 Update collaboration from 0.30.0 to 0.33.0 2013-10-28 15:09:31 -07:00
probablycorey
05c70aceec Revert "Update changelog" 
This reverts commit d5b960f32b.
 2013-10-28 15:01:43 -07:00
probablycorey
c581135029 Remove changelog file 
Changelog entries are not entered via https://github.com/atom/atom/releases/
 2013-10-28 13:49:13 -07:00
probablycorey
dc54ebf416 Merge remote-tracking branch 'origin/master' into cj-add-user-keymap-file 2013-10-28 10:04:48 -07:00
probablycorey
d5b960f32b Update changelog 2013-10-28 10:04:29 -07:00
Corey Johnson
ef2a322229 Merge pull request #1037 from atom/cj-buffer-serialization 
When opening a window, only use serialized buffer text if the contents on disk have not changed.
 2013-10-28 09:48:43 -07:00
probablycorey
7c70c43c1c Update keymap documentation 2013-10-28 09:23:18 -07:00
probablycorey
cde0fae1f3 Rename Keymap::loadUserKeymaps to Keymap::loadUserKeymap 2013-10-28 09:19:23 -07:00
probablycorey
95107052d0 User keymap can be cson or json 2013-10-28 09:18:29 -07:00
Kevin Sawicki
232bc8be8e Merge pull request #1032 from atom/ks-comment-corruption 
Fix commenting on hard tab lines
 2013-10-26 15:26:31 -07:00
Kevin Sawicki
57577966e7 Add assert for .5 indent level 2013-10-26 15:21:02 -07:00
Kevin Sawicki
08d5231d28 Add assert for unindented line 2013-10-26 15:21:02 -07:00
Kevin Sawicki
05c3d89381 Measure indent prefix on each line being commented 
Previously a single indent string was used to replace all lines
which could corrupt lines using hard tabs since the indent string
used for replacement was two spaces causing the first character
of the line to be deleted.

Closes atom/language-c#1
 2013-10-26 15:21:02 -07:00
Kevin Sawicki
7a3dc2c3b8 Merge pull request #1039 from atom/ks-dont-async-before-bootstrapping 
Bootstrap before requiring async
 2013-10-26 15:20:25 -07:00
Kevin Sawicki
8eecc56d08 💄 Fix typo in variable name 2013-10-26 15:12:13 -07:00
Kevin Sawicki
e009ff6c59 Add missing parens 2013-10-26 15:07:20 -07:00
Kevin Sawicki
f500e2e9fc Add semicolon 2013-10-26 15:03:21 -07:00
Kevin Sawicki
2a98ccec8d Don't require async before bootstrapping 
async won't be available on the very first run of script/build
until it runs script/bootstrap for the first time so defer requiring
it until script/bootstrap completes.
 2013-10-26 15:01:19 -07:00
Kevin Sawicki
8742f6c06c Run apm from node_modules 2013-10-26 14:54:23 -07:00
probablycorey
330bb1df4b Add keymap.cson file to dot-atom 2013-10-25 16:39:06 -07:00
Kevin Sawicki
45ceb3f9f9 Merge pull request #1028 from atom/ks-less-one-point-five 
Upgrade to less 1.5.0
 2013-10-25 16:21:36 -07:00
probablycorey
97c183d6df Update docs 2013-10-25 16:19:55 -07:00
probablycorey
42362e6ce9 Load user-keymap.cson instead of keymaps dir 2013-10-25 16:19:38 -07:00
Kevin Sawicki
2266ea25e8 Upgrade to less-cache@0.9.0 2013-10-25 16:05:01 -07:00
Kevin Sawicki
970d7654cb Upgrade to grunt-contrib-less@0.8.0 2013-10-25 16:05:01 -07:00
Kevin Sawicki
82cbfb3829 Upgrade to less@1.5.0 2013-10-25 16:05:00 -07:00
probablycorey
c2c6b5f868 Update coffee-script to 1.6.3 2013-10-25 16:02:23 -07:00
probablycorey
0dd0c39918 Update comment 2013-10-25 15:29:52 -07:00
probablycorey
7002b4e5f6 Factor out common buffer loading code 2013-10-25 15:26:56 -07:00
Corey Johnson
78f1865bcf Merge pull request #1033 from atom/cj-search-modified-buffers 
Search modified buffers
 2013-10-25 15:19:53 -07:00
probablycorey
bb281ce5af 💄 2013-10-25 15:19:20 -07:00
probablycorey
b5b07c1052 Emit modified-status-changed event when using serialized text 2013-10-25 14:40:53 -07:00
probablycorey
c77b44d5ef Move variable assignment 2013-10-25 14:29:59 -07:00
probablycorey
feed72b68e Change @loadFromDisk to @useSerializedText 2013-10-25 14:21:39 -07:00
probablycorey
5cee47c207 Fix replication spec 
Don't rely on serialization to handle modifications after documents are
connected.
 2013-10-25 14:21:23 -07:00
probablycorey
2d40cb09d1 Remove focused spec 2013-10-25 14:03:27 -07:00
probablycorey
8956881192 Only load serialized content if the disk content's have not changed. 2013-10-25 13:50:16 -07:00
probablycorey
32bc8a6258 Remove initialText option from TextBuffer constructor 2013-10-25 13:50:06 -07:00
Kevin Sawicki
53547b5a8d Trigger commands on rootView when body is active element 2013-10-25 09:20:47 -07:00
Kevin Sawicki
6460cbe288 Upgrade to command-palette@0.6.0 2013-10-25 08:36:32 -07:00
Kevin Sawicki
29646cdff8 💄 Use Date.now 2013-10-24 18:58:43 -07:00
Kevin Sawicki
feff67457d 🚱 Include namespace when canceling subscription 
Emissary does not clear our namespace listeners when calling off
with only the event name and the handler.
 2013-10-24 18:45:00 -07:00
probablycorey
1f30231d5c Project.scan scans buffer if the file is modified 
Closes #487
 2013-10-24 15:32:32 -07:00
Ben Ogle
3e584f29b1 Upgrade to find-and-replace@0.32.0 2013-10-24 15:17:29 -07:00
probablycorey
c424f7bafa Remove console.log 2013-10-24 15:04:38 -07:00
probablycorey
48fbdc69fb Update collaboration version 2013-10-24 14:43:05 -07:00
probablycorey
c1b0ba2773 Check for cmake dependency before building Atom 2013-10-24 14:40:03 -07:00
Matt Colyer
d4949c872b Merge pull request #1019 from atom/api-docs 
More detailed pass at API documentation
 2013-10-24 13:54:03 -07:00