github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-27 07:47:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
36,177 Commits 140 Branches 571 Tags
44bd6eae59d6cd41c0616d927f030d14a62f07f9
Commit Graph

36177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winston Liu
44bd6eae59 Merge pull request #19002 from atom/wl-update-tree-view 
Update tree-view
 2019-03-17 17:55:15 -04:00
Winston Liu
ada0fcc9c1 ⬆️ tree-view@0.225.0 2019-03-17 16:00:34 -04:00
Allison (Sheren) McMillan
859286b85c Merge pull request #18982 from atom/remove-focus-folder 
Clean up documentation folders
 2019-03-14 09:32:52 -04:00
Ash Wilson
1cb2ccdc5a Merge pull request #18984 from atom/aw/respect-test-packages 
Ensure APM_TEST_PACKAGES may be activated in Jasmine specs
 2019-03-13 21:22:22 -04:00
Ash Wilson
e88e06e572 Whitespace I guess 2019-03-13 15:19:07 -04:00
Ash Wilson
2ced6c8d63 Symlink or copy packages from the user's real ATOM_HOME 2019-03-13 15:18:58 -04:00
Allison McMillan
29efe9c8d6 removes focus folder since regular iteration issues are a better representation of what is being worked on. 2019-03-13 13:17:51 -04:00
Robert Sese
b6bf3a5c5d Merge pull request #18944 from himankpathak/updated-license-year 
Updated license year
 2019-03-12 11:18:46 -07:00
Jason Rudolph
c1d270dd2a Merge pull request #18962 from atom/electron-2.0.18 
⬆️ electron@2.0.18
 2019-03-08 14:22:27 -05:00
Jason Rudolph
5f10cdd904 Merge pull request #18961 from atom/settings-view-0.260.1 
⬆️ settings-view@0.260.1
 2019-03-08 13:41:31 -05:00
Jason Rudolph
e9c77234c8 ⬆️ :electron: 2.0.18 2019-03-08 12:57:43 -05:00
Jason Rudolph
7bb73e19d3 ⬆️ settings-view@0.260.1 2019-03-08 11:28:57 -05:00
Vanessa Yuen
e52b9161ff Merge pull request #18953 from atom/vy/github-up 
⬆️ github to v.0.27.0
 2019-03-07 15:42:22 +01:00
Vanessa Yuen
6a661147bd github ⬆️ 2019-03-07 14:42:36 +01:00
Ash Wilson
401a5a7d0a Merge pull request #18946 from atom/aw/electron-version-in-build-env 
Set Electron version within the build process environment
 2019-03-06 11:53:46 -05:00
Ash Wilson
c513d1c024 Set ELECTRON_VERSION to the current Electron version. 2019-03-06 10:39:33 -05:00
Robert Sese
cd3d2ab82e Merge pull request #18712 from SConaway/patch-1 
Update README.md
1.35.0 		2019-03-05 13:25:57 -08:00
Himank Pathak
a08e03c988 Updated license year 2019-03-05 22:30:36 +05:30
Rafael Oleza
70f771af53 Merge pull request #18932 from rafeca/add-linting-to-specs 
Stop using jasmine test functions from async-spec-helpers.js
 2019-03-01 19:26:22 +01:00
Rafael Oleza
ec705399e6 Remove uneeded methods from async-spec-helpers modules 2019-03-01 12:05:21 +01:00
Rafael Oleza
67afbe6097 Stop using promisifySome 2019-03-01 12:05:21 +01:00
simurai
25ff63c3e6 Merge pull request #18866 from atom/sm-settings-view 
Update settings-view@0.260.0
 2019-03-01 10:47:52 +09:00
simurai
6c88a7d303 Merge branch 'master' into sm-settings-view 2019-03-01 09:22:56 +09:00
Rafael Oleza
aad8bd6836 Merge pull request #18896 from rafeca/add-linting-to-specs 
Add linter to spec/ folder
 2019-02-28 20:39:33 +01:00
Rafael Oleza
a93808d1a8 Always use global it, beforeEach and afterEach methods 2019-02-28 20:39:21 +01:00
Rafael Oleza
2dd2c299b3 Keep unneeded block in TextEditor spec as it's a common pattern 2019-02-28 19:30:03 +01:00
Landon Abney
55cdc398f6 Use includes instead of indexOf 
Co-Authored-By: rafeca <rafeca@gmail.com>
 2019-02-28 19:30:03 +01:00
Rafael Oleza
ccfd761a06 Fix linting issue after rebase 2019-02-28 19:30:03 +01:00
Rafael Oleza
8daaf3834e Enable linter on spec/ folder 2019-02-28 19:30:03 +01:00
Rafael Oleza
6c46cf9243 Fix remaining linter issues 2019-02-28 19:30:03 +01:00
Rafael Oleza
cd302135f0 Fix undefined variables from specs 2019-02-28 19:30:03 +01:00
Rafael Oleza
d7d6d0838f Remove unused vars from specs 2019-02-28 19:30:03 +01:00
Rafael Oleza
c35ec012b4 Run prettier on spec/ folder 2019-02-28 19:30:03 +01:00
Rafael Oleza
c4aa086024 Merge pull request #18917 from rafeca/rewrite-jasmine-globals 
Override global jasmine spec functions
 2019-02-28 16:35:57 +01:00
Rafael Oleza
7876e04e97 Override global jasmine spec functions 
Currently, if a spec uses the global `it` function on an async test,
that test will always pass (since the jasmine version checked in Atom
does not natively support tests that return promises). This can be
confusing since the test behaviour is different between the
async-test-helpers methods and the global ones.

By overriding the global functions, we'll also be able to remove all the
imports from async-test-helpers since they won't be needed anymore.

More info: https://github.com/atom/atom/pull/18896#discussion_r260396102
 2019-02-28 15:15:08 +01:00
Rafael Oleza
f4685ac7ff Merge pull request #18924 from rafeca/finish-update-packages 
Update versions of fuzzy-finder and snippets
 2019-02-28 13:37:32 +01:00
Rafael Oleza
96b29fe3ce Update versions of fuzzy-finder and snippets 
I forgot to update the second place on the `package.json` where its version is
specified
 2019-02-28 12:13:16 +01:00
simurai
fa0f103c3c ⬆️ settings-view@v0.260.0 2019-02-28 19:55:09 +09:00
simurai
a5a5097a45 Merge pull request #18921 from atom/sm-update-welcome-2 
Update welcome@v0.36.8 II
 2019-02-28 19:39:16 +09:00
Rafael Oleza
e26f561543 Merge pull request #18923 from rafeca/update-snippets 
⬆️ snippets@1.4.1
 2019-02-28 10:55:07 +01:00
Rafael Oleza
c643d96fca ⬆️ snippets@1.4.1 2019-02-28 10:49:48 +01:00
simurai
e7ce8c3166 ⬆️ welcome@v0.36.8 2019-02-28 17:27:28 +09:00
Rafael Oleza
af591495ce Merge pull request #18919 from rafeca/update-fuzzy-finder 
⬆️ fuzzy-finder@1.9.2
 2019-02-27 21:39:51 +01:00
Rafael Oleza
bd6a0fc37c ⬆️ fuzzy-finder@1.9.2 2019-02-27 20:35:12 +01:00
Jason Rudolph
2712b1f505 Merge #18908: Revert to Electron 2 until we can overcome crashes on Electron 3 2019-02-26 13:25:05 -05:00
Jason Rudolph
3b195122c4 Tell VSTS to build electron-* branches 2019-02-25 15:17:09 -05:00
Jason Rudolph
9ff5160b45 Update package-lock.json and script/package-lock.json 2019-02-25 15:14:53 -05:00
Jason Rudolph
c9e6d04e8c Revert "Merge #18603 from atom/electron-3-0" 
This reverts commit b92ae2ad04, reversing
changes made to d4fe5ccfeb.
 2019-02-25 13:41:59 -05:00
Jason Rudolph
46fa62ac59 Revert "Merge #18815 from atom/electron-3.1.3" 
This reverts commit e81f71318a, reversing
changes made to bded0c102a.
 2019-02-25 13:37:35 -05:00
Rafael Oleza
042fb45a43 Merge pull request #18906 from rafeca/fix-git-diff-test 
Fix git-diff package test
 2019-02-25 16:30:28 +01:00