github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-15 17:15:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
29,055 Commits 140 Branches 571 Tags
de3b48b2d3d8a1e31f76fe748e52d396ce4949db
Commit Graph

29055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Abernathy
44d3f2dd07 Merge pull request #11614 from atom/remove-project-dependency 
Remove TextEditor's dependency on Project
 2016-04-26 15:47:32 -04:00
joshaber
aa9e8ab620 Update the spec. 2016-04-26 14:56:00 -04:00
joshaber
a7606710c0 Don't need Directory anymore. 2016-04-26 14:55:43 -04:00
joshaber
5fd556ac58 We need Directory now. 2016-04-26 14:55:37 -04:00
joshaber
a51c997b74 Merge branch 'master' into remove-project-dependency 2016-04-26 14:22:28 -04:00
Josh Abernathy
f960af51cd Merge pull request #11604 from atom/remove-view-registry-dependency 
Remove TextEditor's dependency on ViewRegistry
 2016-04-26 14:21:50 -04:00
joshaber
b6e7ef60d5 Merge branch 'remove-view-registry-dependency' into remove-project-dependency 2016-04-26 12:55:45 -04:00
joshaber
ee88b4b2c1 Merge branch 'master' into remove-view-registry-dependency 2016-04-26 12:44:01 -04:00
Josh Abernathy
bb1b89da60 Merge pull request #11603 from atom/remove-packagemanager-dependency 
Remove TextEditor's dependency on PackageManager
 2016-04-26 12:43:35 -04:00
joshaber
40d7761350 Bail if we don't have a grammar yet. 2016-04-26 11:48:52 -04:00
joshaber
53b7a20ad7 ⬆️ status-bar@1.2.6 2016-04-26 11:40:56 -04:00
joshaber
e1c17ed856 ⬆️ status-bar@1.2.5 2016-04-26 11:17:20 -04:00
joshaber
9732874999 Don't log anymore. 2016-04-26 11:02:01 -04:00
joshaber
f70b93d9c2 Merge branch 'remove-packagemanager-dependency' into remove-project-dependency 2016-04-26 11:01:28 -04:00
Josh Abernathy
355d5b3544 Merge pull request #11606 from atom/fix-infinite-recursion 
Fix infinite recursion in GitRepositoryAsync
 2016-04-26 10:38:28 -04:00
joshaber
5d7c2fc8ba Just observe the grammar. 2016-04-26 10:32:41 -04:00
joshaber
0541755ac8 Consistent indentation. 2016-04-26 09:49:38 -04:00
joshaber
67c7c60dcc Test getUpstreamBranch 2016-04-26 09:49:03 -04:00
joshaber
e16e987e08 Give the fixture a remote 2016-04-26 09:46:04 -04:00
joshaber
33a9240fe1 ⬆️ ohnogit@0.0.11 2016-04-26 09:45:56 -04:00
joshaber
ff43d917be Lower case 2016-04-26 09:23:54 -04:00
joshaber
f86a15e5fc Spec for getOriginURL 2016-04-26 09:22:56 -04:00
joshaber
f589bdd8d9 Add a remote to the fixture. 2016-04-26 09:22:38 -04:00
Antonio Scandurra
7ba9cc6329 Unfold all the folds intersecting the row when clicking fold indicators 2016-04-26 13:24:21 +02:00
Antonio Scandurra
38bd120fb1 🎨 2016-04-26 12:11:13 +02:00
Antonio Scandurra
f81f54e08a Apply 'folded' decoration only to 1st screen row of a wrapped buffer row 2016-04-26 12:11:05 +02:00
Antonio Scandurra
4f6687324e Include bufferRange in decorationsStateForScreenRowRange 2016-04-26 12:09:38 +02:00
Antonio Scandurra
f85c72978e Fix wrong implementation in TextEditor.prototype.screenRowForBufferRow 2016-04-26 12:06:41 +02:00
Antonio Scandurra
ebfd821237 Destroy folds corresponding to fold-markers and not the whole buffer row 2016-04-26 10:47:42 +02:00
Antonio Scandurra
00ebe6bbbc Merge branch 'master' into ns-switch-to-display-layers 
# Conflicts:
#	src/text-editor.coffee
 2016-04-26 10:19:39 +02:00
Antonio Scandurra
e3773f24fc 🔥 Delete obsolete code 2016-04-26 10:05:35 +02:00
Damien Guard
891071196f Ensure atom.cmd with --wait returns exit code of 0 for git commit usage #11605 2016-04-25 15:28:22 -07:00
joshaber
8d26fe133a s/original/origin 2016-04-25 17:10:39 -04:00
joshaber
fdb439be9c Call through to the underlying repo. 2016-04-25 17:09:07 -04:00
joshaber
7ed4d60967 Don't need to pass Project around anymore. 2016-04-25 17:03:26 -04:00
joshaber
9fa669b293 Set the initial path after saving in Project. 2016-04-25 17:02:51 -04:00
joshaber
5cf532ebe8 Move checkoutHeadRevision to Workspace. 2016-04-25 17:02:36 -04:00
joshaber
856697e55f Uh we seriously don't need package manager. 
Not sure how that slipped back in there.
 2016-04-25 16:31:28 -04:00
joshaber
8d7f1b8fba Don't need to pass view registry through anymore. 2016-04-25 16:26:28 -04:00
joshaber
32a53e392c Merge branch 'remove-packagemanager-dependency' into remove-view-registry-dependency 2016-04-25 16:26:04 -04:00
joshaber
1c6d9728c4 Don't need to pass packageManager in anymore. 2016-04-25 16:25:36 -04:00
joshaber
3a63f90ab2 We just say getElement now. 2016-04-25 16:24:27 -04:00
joshaber
58d8e6bca8 Typo 2016-04-25 16:11:38 -04:00
joshaber
759d64501d Better test. 2016-04-25 16:07:49 -04:00
joshaber
3b40fe5d8a Merge branch 'master' into remove-packagemanager-dependency 2016-04-25 16:07:35 -04:00
Josh Abernathy
2c91f3b71c Merge pull request #11602 from atom/disentangle-text-editor-pt-1 
Remove TextEditor's dependency on NotificationManager
 2016-04-25 15:56:52 -04:00
joshaber
6852d6e91c Test it. 2016-04-25 15:34:46 -04:00
joshaber
cf1b4e2217 Another new name. 2016-04-25 15:34:44 -04:00
joshaber
eaf6036a2c Wait a tick before sending the event. 2016-04-25 15:34:37 -04:00
joshaber
2266f1e3b6 Revert "Just use the already existing change grammar event." 
This reverts commit 9014634b3a.
 2016-04-25 15:15:31 -04:00