github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-15 00:55:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
31,553 Commits 140 Branches 571 Tags
2d3b7e82bd0bc2a3dcb7d05d217cfd3ffc5fc99e
Commit Graph

31553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Guard
7fa77bc011 Revert Crash Reporter URL endpoint back to correct one 2016-07-20 16:26:56 -07:00
Damien Guard
0648e4fce1 Run Crash Reporter on both UI & non-UI threads 2016-07-20 16:25:14 -07:00
Wliu
54279132cd ⬆️ whitespace@0.33.0 2016-07-20 12:38:22 -04:00
Antonio Scandurra
92483d7369 Remove the higher timeout 2016-07-20 18:00:13 +02:00
Antonio Scandurra
3664c8c2d7 Don't cache electron 2016-07-20 16:04:07 +02:00
Antonio Scandurra
8d33778900 Use npm 3.10.5 in build/package.json too 2016-07-20 13:02:43 +02:00
Antonio Scandurra
be134ce3c9 Revert "Disable specs (again) to allow caching" 
This reverts commit b3d3b52d3d.
 2016-07-20 13:01:00 +02:00
Antonio Scandurra
d2cb36e3a0 ⬆️ apm 1.12.1 2016-07-20 12:26:02 +02:00
Antonio Scandurra
b3d3b52d3d Disable specs (again) to allow caching 2016-07-20 10:50:32 +02:00
Damien Guard
177c48dd11 Merge pull request #12123 from atom/windows-system-settings 
Windows shell integration system settings
 2016-07-19 17:23:02 -07:00
Damien Guard
2fb0d68be8 Blank lines and for x in y syntax from review 2016-07-19 16:33:29 -07:00
Antonio Scandurra
9b4f46cab1 Add back testing to Gruntfile 2016-07-19 16:56:26 +02:00
Antonio Scandurra
207131836d Cache also .atom/.node-gyp/.atom 2016-07-19 16:04:07 +02:00
Antonio Scandurra
25e8d3b1cf Add electron to the cache 2016-07-19 14:58:58 +02:00
Antonio Scandurra
5c1a433e2a Put back node_modules in the cache 2016-07-19 14:56:27 +02:00
Antonio Scandurra
26f4800192 Try not caching node_modules 2016-07-19 14:29:03 +02:00
Damien Guard
23dfa392c9 Fix up Squirrel specs 2016-07-18 22:56:02 -07:00
Antonio Scandurra
3b372e270c Install npm 3 on Travis 2016-07-18 17:48:45 +02:00
Antonio Scandurra
7a22c50403 Run tests 2016-07-18 16:51:09 +02:00
Antonio Scandurra
eb7d695e60 Don't run specs to avoid timing out the build 
...this needs to be re-enabled on the next commit.
 2016-07-18 16:02:27 +02:00
Damien Guard
1610bcedb1 Ensure install & upgrade fix up previous shell paths 2016-07-17 22:42:08 -07:00
Wliu
35bdaf34a1 ⬆️ timecop@0.33.2 2016-07-16 20:42:04 -04:00
Antonio Scandurra
59a8c0544b Set a higher timeout for Travis caching phase 2016-07-16 20:40:07 +02:00
Antonio Scandurra
e9623b30b8 Include apm version in the fingerprint 2016-07-16 20:26:58 +02:00
Antonio Scandurra
7a6b7fea06 ⬆️ apm 1.12.0-beta0 2016-07-16 20:01:54 +02:00
Max Brunsfeld
4eb2f6631a 👕 Fix lint errors 2016-07-15 13:32:23 -07:00
Max Brunsfeld
4ad801b216 Merge branch 'master' into ns-mb-detangle-editor 2016-07-15 09:39:32 -07:00
Antonio Scandurra
204cbc7caa Merge branch 'master' into as-ns-use-apm-with-npm3-and-node-4 2016-07-15 16:26:52 +02:00
Max Brunsfeld
07081407c7 Merge pull request #12167 from atom/mb-remove-nodegit 
Stop using nodegit for now
 2016-07-14 13:43:14 -07:00
Max Brunsfeld
680594d52d Merge pull request #12172 from atom/mb-debug-build 
Clear out apm folder in cibuild
 2016-07-14 13:29:55 -07:00
Max Brunsfeld
f83ebf337c Clear out apm folder in cibuild 2016-07-14 13:27:35 -07:00
Max Brunsfeld
15cf9fb0d0 Upgrade to minor releases of packages 2016-07-14 11:03:45 -07:00
Antonio Scandurra
b674169bec Remove previously installed nvm 2016-07-14 18:07:28 +02:00
Antonio Scandurra
14b74937e1 Use 4.2.6 2016-07-14 17:50:59 +02:00
Antonio Scandurra
4092ff1aea Use another docker image for rpm 2016-07-14 17:47:45 +02:00
Antonio Scandurra
e160c725fd Use curl for rpm 2016-07-14 17:29:42 +02:00
Antonio Scandurra
e3743db892 Use node 4 and npm 3 on rpm 2016-07-14 17:25:58 +02:00
Antonio Scandurra
35aee0b8e4 Use nvm on Linux 2016-07-14 17:01:26 +02:00
Antonio Scandurra
ab2ede30da Merge branch 'mb-remove-nodegit' into as-ns-use-apm-with-npm3-and-node-4 
# Conflicts:
#	package.json
 2016-07-14 16:49:05 +02:00
Max Brunsfeld
678d5b4c24 Remove usage of repository.async in Workspace 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-13 15:41:10 -07:00
Max Brunsfeld
47df8c5d77 Upgrade packages to use sync git repository again 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-13 14:37:37 -07:00
Max Brunsfeld
a973e1ae9e Put back GitRepository::isDestroyed() method 2016-07-13 14:04:58 -07:00
Max Brunsfeld
58e7892492 Remove GitRepositoryAsync 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-13 14:03:29 -07:00
Max Brunsfeld
7b11c31e07 Remove synchronous GitRepository's dependency on GitRepositoryAsync 
Signed-off-by: Nathan Sobo <nathan@github.com>
 2016-07-13 14:02:05 -07:00
Lee Dohm
a4b9e94d7b ⬆️ settings-view@0.240.1 2016-07-13 08:56:42 -07:00
Philipp Brumm
76357473ad call setSheetOffset on onDidChangeActiveThemes 2016-07-13 14:59:37 +02:00
simurai
cb023016cc ⬆️ atom-ui@0.4.1 
Allow themes to opt-out of custom control styling
 2016-07-13 12:23:47 +09:00
simurai
d27ee408f5 Merge pull request #12150 from atom/sm-native-controls 
Introduce @use-custom-controls variable
 2016-07-13 11:44:30 +09:00
Damien Guard
5a8ced324e Fixup Squirrel installer spec tests 2016-07-12 18:11:59 -07:00
Lee Dohm
d922d182f3 Merge pull request #12158 from atom/update-12086 
Improve incompatible native module error message
 2016-07-12 17:18:23 -07:00