Commit Graph

36206 Commits

Author SHA1 Message Date
Ash Wilson
53c02025ff Merge pull request #19028 from atom/aw/revert-launch-scenario-change
Revert launch scenario changes
2019-03-27 10:02:05 -04:00
Ash Wilson
04685d13fe Port changes to atom.cmd to show conflicting option error on win32 2019-03-27 08:35:31 -04:00
Rafael Oleza
382838723f Merge pull request #19054 from rafeca/fix-scoped-settings
Do not delete global scope setting when resetting user settings
2019-03-27 09:47:57 +01:00
Winston Liu
128e6b059f Merge pull request #19047 from atom/wl-upgrade-language-toml
Update language-toml
2019-03-26 21:14:10 -04:00
Winston Liu
f7d123ca8c Update package-lock.json 2019-03-26 14:44:08 -04:00
Rafael Oleza
4fd800328a Do not delete global scope setting when resetting user settings 2019-03-26 19:19:59 +01:00
Rafael Oleza
e4e1f5540e Merge pull request #19053 from rafeca/upgrade-metrics
⬆️ metrics@1.7.2
2019-03-26 16:00:22 +01:00
Rafael Oleza
5f22376607 ⬆️ metrics@1.7.2 2019-03-26 11:20:10 +01:00
Rafael Oleza
3f67989b3b Merge pull request #19045 from rafeca/upgrade-welcome
⬆️ welcome@0.36.9
2019-03-25 21:40:34 +01:00
Rafael Oleza
564f5b4220 Merge pull request #19046 from rafeca/upgrade-fuzzy-finder
⬆️ fuzzy-finder@1.10.2
2019-03-25 21:40:18 +01:00
Winston Liu
04509adfca ⬆️ language-toml@0.20.0 2019-03-25 11:00:20 -04:00
Rafael Oleza
2931616153 ⬆️ fuzzy-finder@1.10.2 2019-03-25 15:04:35 +01:00
Rafael Oleza
3f7f57a402 ⬆️ welcome@0.36.9 2019-03-25 15:00:21 +01:00
Rafael Oleza
30d94ee897 Merge pull request #19030 from rafeca/fix-build
Update package-lock.json file
2019-03-22 17:25:00 +01:00
Ash Wilson
2526e69e28 Exit with 1 and a message when -a and -n are both provided 2019-03-22 11:29:21 -04:00
Rafael Oleza
09774dfb1e Update package-lock.json file 2019-03-22 13:29:32 +01:00
Rafael Oleza
0624172e0c Merge pull request #19029 from rafeca/upgrade-metrics
⬆️ metrics@1.7.0
2019-03-22 12:03:11 +01:00
Rafael Oleza
3d598cd95e ⬆️ metrics@1.7.0 2019-03-22 09:55:51 +01:00
Rafael Oleza
2067048989 Merge pull request #19021 from rafeca/upgrade-git-utils
⬆️ git-utils@5.5.0
2019-03-22 09:47:13 +01:00
Ash Wilson
372652915e 👕 Add missing newWindow parameter 2019-03-21 19:53:06 -04:00
Ash Wilson
2546170c0b Revert changes to help text 2019-03-21 19:09:19 -04:00
Ash Wilson
18847f79d1 Restore the newWindow option to force a path to open in a new window 2019-03-21 19:09:02 -04:00
Ash Wilson
4af379ae8e Re-use an existing window if one is available that contains all paths 2019-03-21 18:15:38 -04:00
Rafael Oleza
1f00090e20 ⬆️ git-utils@5.5.0
This new version contains libgit2/libgit2@9084712
2019-03-21 10:27:46 +01:00
Rafael Oleza
aca476c48a Merge pull request #19013 from rafeca/add-github-token
Add GITHUB_TOKEN env var to the npm install step (take 2)
2019-03-20 17:10:38 +01:00
Rafael Oleza
874016b785 Add GITHUB_TOKEN env var to the npm install step (take 2)
This will prevent issues when installing the `vscode-ripgrep` package
2019-03-20 14:41:22 +01:00
David Wilson
ccc7233e51 Add GITHUB_TOKEN env var to the npm install step
This will prevent issues when installing the `vscode-ripgrep` package
2019-03-19 11:50:26 -07:00
Rafael Oleza
a7ec932353 Merge pull request #19010 from rafeca/update-fuzzy-finder
⬆️ fuzzy-finder@1.10.1
2019-03-19 16:24:55 +01:00
Rafael Oleza
9d7467f7b2 ⬆️ fuzzy-finder@1.10.1 2019-03-19 12:45:42 +01:00
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