github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-03 11:14:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
27,126 Commits 140 Branches 571 Tags
dcb9371c134a5748ee6cb2bdcfed6202011fb659
Commit Graph

27126 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joshaber
dcb9371c13 Test it. 2016-01-07 13:07:36 -05:00
joshaber
0bef58a8a4 Added a fixture that has submodules. 2016-01-07 13:05:36 -05:00
joshaber
a86d3b6d94 Stop logging. 2016-01-07 12:44:56 -05:00
joshaber
75fe311e22 Refresh the status for submodules too. 2016-01-07 12:19:51 -05:00
joshaber
6c4d97d0f2 Merge branch 'master' into dh-async-repo 2016-01-06 13:52:18 -05:00
Josh Abernathy
61475ed77c Merge pull request #10296 from viatsko/repository-providers-priority 
This change gives custom repositoryProviders more priority
 2016-01-06 13:49:46 -05:00
Antonio Scandurra
7fbc24c0f2 Merge pull request #10139 from sparanoid/patch-1 
Prevent committing `blob-store`
 2016-01-06 11:10:46 +01:00
Tunghsiao Liu
eaab7d4ae9 Merge branch 'master' into patch-1 2016-01-06 11:40:24 +08:00
Max Brunsfeld
972d62f9d2 ⬆️ text-buffer 2016-01-05 17:23:32 -08:00
Max Brunsfeld
f4a9ee464d Merge branch 'beta' 2016-01-05 17:23:03 -08:00
Valerii Iatsko
3b8375d2b4 This change gives custom repositoryProviders more priority - this wil allow us to override base git repository implementation 2016-01-06 00:05:58 +01:00
joshaber
eedac0a951 We'll store them by path instead of by name. 2016-01-05 17:31:34 -05:00
joshaber
26cd7c63cc s/upstreamByPath/upstream 
We’ll track submodule status separately.
 2016-01-05 17:10:01 -05:00
joshaber
51bf940fb3 ⬆️ nodegit@0.6.3 2016-01-05 15:51:34 -05:00
joshaber
e060cfe03b Merge branch 'master' into dh-async-repo 2016-01-05 15:50:43 -05:00
joshaber
5045477b5d path is never used. 2016-01-05 15:28:48 -05:00
joshaber
757bbae1e2 s//openNodeGitRepository/openRepository. 2016-01-05 15:26:16 -05:00
Josh Abernathy
2c4f5c2b02 Merge pull request #10236 from atom/cascade-windows 
Cascade new windows on OS X
 2016-01-05 15:18:11 -05:00
joshaber
d224efb00d Just test the x coordinate, I suppose. 2016-01-05 14:40:09 -05:00
joshaber
740e8c660a Put it with its friends. 2016-01-05 14:08:09 -05:00
joshaber
f64878208f Really don't need this to be its own command. 2016-01-05 14:07:50 -05:00
joshaber
2a29e7d1f4 Revert "Revert "Integration test for new window offset."" 
This reverts commit c8c8bc941e.
 2016-01-05 12:48:34 -05:00
joshaber
b6c3b39dfe Merge branch 'master' into cascade-windows 2016-01-05 12:48:30 -05:00
joshaber
24db4586e4 Merge branch 'master' into dh-async-repo 2016-01-05 12:44:35 -05:00
Josh Abernathy
96eff38707 Merge pull request #10249 from atom/use-project-relative-status 
Use .getStatusForPaths.
 2016-01-05 12:40:28 -05:00
joshaber
6b4a05495e Commas are important. 2016-01-05 12:38:10 -05:00
joshaber
b8b2c88a0a Merge branch 'master' into dh-async-repo 2016-01-05 12:36:34 -05:00
joshaber
c8c8bc941e Revert "Integration test for new window offset." 
This reverts commit 4ddadcc135.
 2016-01-05 12:27:59 -05:00
joshaber
4ddadcc135 Integration test for new window offset. 2016-01-05 12:00:08 -05:00
joshaber
94b77d0998 Separate the offset determination from the dimensions. 2016-01-05 11:59:59 -05:00
Nathan Sobo
2493269f09 Merge pull request #10277 from atom/ns-fix-horizontal-measurement 
Fix measurement of rows that are present in the model but haven't been rendered yet
 2016-01-05 09:43:01 -07:00
Antonio Scandurra
018b12973c Merge pull request #10126 from atom/as-ci-times 
Print steps time during Grunt tasks and script/bootstrap
 2016-01-05 11:27:38 +01:00
Machisté N. Quintana
6d949d31e0 Merge pull request #10280 from atom/mq-bump-apm 
⬆️ apm@1.6.0
 2016-01-04 21:17:21 -05:00
Machisté N. Quintana
38e331691b ⬆️ apm@1.6.0 2016-01-04 20:42:23 -05:00
Nathan Sobo
6669703677 Force a sync render when measuring if we don’t have a DOM node for a row 2016-01-04 16:40:56 -07:00
Nathan Sobo
9f6fbacddd Don’t clip screen positions in yardstick 
By clipping positions only in the TextEditorComponent, we can ensure
that we check for the presence of a rendered line for the clipped row
value.
 2016-01-04 16:32:38 -07:00
joshaber
fb8b25dc16 Merge branch 'master' into cascade-windows 2016-01-04 16:49:07 -05:00
Josh Abernathy
29590d94ac Merge pull request #10233 from atom/fix-new-file 
Fix New File with no open windows
 2016-01-04 16:43:46 -05:00
joshaber
a962bba3a1 ⬆️ git-utils@4.1.0 2016-01-04 16:24:47 -05:00
joshaber
6bf9d7eb7d Added .openNodeGitRepository 2016-01-04 16:17:16 -05:00
joshaber
a63e30362f Documentation for .DestroyedErrorName 2016-01-04 16:16:50 -05:00
joshaber
b234f8481d We don't actually use repo. 2016-01-04 16:12:22 -05:00
joshaber
a2ab84c3e6 Catch errors that are thrown while we're refreshing. 2016-01-04 13:36:13 -05:00
Max Brunsfeld
a3a42e2d6d Merge branch 'stable' into beta 
Conflicts:
	package.json
 2016-01-04 10:30:16 -08:00
joshaber
3752f66160 Use .getRepo everywhere. 2016-01-04 13:27:55 -05:00
joshaber
843442a741 So much depends upon a return statement. 2016-01-04 13:25:59 -05:00
joshaber
60fc0acb71 Relativize these paths too. 2016-01-04 13:25:51 -05:00
joshaber
5a7b4562e1 Use a default parameter. 2016-01-04 13:14:02 -05:00
Max Brunsfeld
ba24364a89 ⬆️ text-buffer 2016-01-04 09:58:29 -08:00
Max Brunsfeld
6ee36b14b1 Prepare 1.3.3 2016-01-04 09:58:19 -08:00