github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,852 Commits 140 Branches 571 Tags
e2a18e34871bb8cb894b7c84c491aaaedc8f33db
Commit Graph

101 Commits

Author SHA1 Message Date
Cheng Zhao
0dd823aa38 Merge branch 'master' into atom-shell 2013-05-24 19:12:47 +08:00
Kevin Sawicki
213524e893 Show upgrade as default action when newer version exists 2013-05-22 15:29:34 -07:00
Garen Torikian
d2e5c55bbf Bump nak, for better gitignoring 2013-05-22 09:29:34 -07:00
Cheng Zhao
61f8878e05 Merge branch 'master' into atom-shell 
Conflicts:
	package.json
	script/bootstrap
	spec/app/window-spec.coffee
	src/app/window.coffee
 2013-05-22 20:52:42 +08:00
Garen Torikian
d401f7cd19 Bump roaster 2013-05-21 11:30:24 -07:00
Garen Torikian
ecc65ff233 Bump roaster 2013-05-21 10:52:36 -07:00
Kevin Sawicki
a4455d2c5f Use released version of space-pen 2013-05-16 16:42:12 -07:00
Kevin Sawicki
a965cb684c Add some commas to the paths loaded badge 2013-05-16 16:22:53 -07:00
Kevin Sawicki
c98e7cab4b Upgrade to keytar 0.4 2013-05-16 12:17:41 -07:00
Kevin Sawicki
efb388ded4 Add initial sign in screen 
Signing in generates an OAuth2 token and saves
it to the keychain.
 2013-05-16 12:17:40 -07:00
Kevin Sawicki
08e9f19644 Add repository field 2013-05-16 12:16:48 -07:00
probablycorey
d397bd5c4f Add optimist npm (an option parser) 2013-05-15 11:22:40 -07:00
Kevin Sawicki
2f54cb4c22 Use season module internally 2013-05-14 11:58:34 -07:00
Kevin Sawicki
81f7354fb5 Use season for compiling cson to json 2013-05-14 11:08:32 -07:00
Kevin Sawicki
5507febe09 Upgrade to git-utils 0.17 
This release handles relativizing paths to a symlinked repository.

Close #549
 2013-05-13 17:35:51 -07:00
Cheng Zhao
30b635527c Show the static/index.html on startup. 2013-05-13 16:47:16 +08:00
Garen Torikian
4b6e0916c9 Swap out Markdown render logic 2013-05-02 18:33:20 -07:00
Garen Torikian
52139dc24e Bump biscotto 2013-05-01 16:58:43 -07:00
Garen Torikian
64fea21a38 Bump biscotto 2013-05-01 16:58:05 -07:00
Nathan Sobo
360a3076a8 Fix jqueryui-browser npm version 2013-04-26 15:36:12 -07:00
Nathan Sobo
0620d19f26 Require jquery-ui-sortable and -draggable in the general config panel. 
This commit has a hack to make window.jQuery available during the
duration of the requiring of jquery-ui. Once we're done requiring
jQuery, the global is removed from window once again.

Issue #494 has an alternative idea of enhancing require to allow the
requiring script to specify the value of global variables in the script
being required.
 2013-04-26 15:36:12 -07:00
Kevin Sawicki
20073c9d34 Upgrade to git-utils 0.15 2013-04-25 15:39:22 -07:00
Kevin Sawicki
927e9c3de8 Upgrade to oniguruma 0.11 2013-04-23 08:39:25 -07:00
Garen Torikian
d52631bab5 Update package.json 
Bump for excessive dir creation
 2013-04-19 18:28:42 -07:00
Garen Torikian
df528f954b Bump biscotto one last time 2013-04-18 18:51:23 -07:00
Garen Torikian
5d7b4ec04b Bump biscotto again 2013-04-18 15:24:19 -07:00
Garen Torikian
3303f5a741 Bump biscotto 2013-04-18 13:05:46 -07:00
Garen Torikian
4d2b78b1f8 Bump biscotto version 2013-04-18 11:22:39 -07:00
Garen Torikian
130baf2235 Merge branch 'master' into api/docs 2013-04-17 16:08:18 -07:00
Nathan Sobo
2f008aa886 Use less NPM module instead of vendored less 
We're currently using nathansobo's fork, which doesn't depend on
`window` being undefined to operate in Node mode.
 2013-04-15 20:45:54 -06:00
Garen Torikian
4c56e8bb57 Merge branch 'master' into api/docs 2013-04-14 09:43:06 -07:00
Garen Torikian
c4e713f121 Update biscotto 2013-04-14 01:44:59 -07:00
Kevin Sawicki
26638980bf Upgrade to git-utils 0.14 2013-04-12 11:09:58 -07:00
Kevin Sawicki
99e573006e Upgrade to pathwatcher 0.3 2013-04-10 21:54:54 -07:00
Garen Torikian
1963cb66fd Merge branch 'master' into api/docs 2013-04-10 17:23:05 -05:00
Kevin Sawicki
9597d4ea52 Upgrade to pathwatcher 0.1.5 
This version is the last known good one pre-0.2
 2013-04-10 15:17:12 -07:00
Kevin Sawicki
57d9a7b22e Downgrade to pathwatcher 0.1 
Closes #491
 2013-04-10 15:11:06 -07:00
Garen Torikian
9432f9703e Merge master 2013-04-10 15:05:21 -05:00
Kevin Sawicki
8182bd59f9 Upgrade to pathwatcher 0.2 
This appears to work now after doing a clean and reinstall
of all modules.
 2013-04-10 12:56:12 -07:00
Kevin Sawicki
5bbc70e6de Back out pathwatcher upgrade 
The v0.2.0 version does not appear to load within atom.
 2013-04-10 12:40:36 -07:00
Kevin Sawicki
b74f2a3e9e Upgrade to git-utils 0.13 2013-04-10 12:17:01 -07:00
Cheng Zhao
badcc6c2bf Update node-pathwatcher to 0.2.0, node-spellchecker to 0.3.0. 2013-04-10 13:22:06 +08:00
Garen Torikian
bf76083939 Merge master 2013-04-09 14:54:17 -05:00
Garen Torikian
5dc1ddd5b5 Remove invalid biscotto for now 2013-04-09 14:49:51 -05:00
Kevin Sawicki
c9e1f89b60 Upgrade to git-utils 0.12 2013-04-09 12:04:31 -07:00
Garen Torikian
a16428c5b6 Merge master 2013-04-09 01:37:46 -05:00
Cheng Zhao
314324562e Update node-pathwatcher to v0.1.5. 2013-04-08 12:00:52 +08:00
Cheng Zhao
e0865e8c38 Use node-pathwatcher. 2013-04-07 16:35:35 +08:00
Kevin Sawicki
1730444db8 Use released version of nak 2013-04-04 08:39:09 -07:00
Kevin Sawicki
a3ef9c204b Use repository URL for nak dependency 
This is temporary until https://github.com/gjtorikian/nak/pull/17/files
is merged and released.
 2013-04-03 13:47:03 -07:00