Commit Graph

39 Commits

Author SHA1 Message Date
Kevin Sawicki
0797a89088 Add bootstrap to package.json
Removes the need to have it as a submodule by just using it directly
from the package.json using a Git URL bound to v3.0.0
2013-09-17 15:09:43 -07:00
Kevin Sawicki
64e47aeea8 Migrate telepath to package dependency 2013-08-28 20:24:36 -07:00
Kevin Sawicki
3bd04f8da8 Remove atom-collaboration-server from .gitmodules
This is now reference in the collaboration package repository
2013-08-19 20:33:03 -07:00
Kevin Sawicki
d08aa4b9d9 Update telepath submodule URL for new location in atom org. 2013-08-19 20:32:37 -07:00
Kevin Sawicki
38a3adae89 Update apm submodule URL for new location in atom org. 2013-08-19 20:30:32 -07:00
Kevin Sawicki
c6d1409151 Merge branch 'master' into summit
Conflicts:
	.pairs
	package.json
	spec/app/tokenized-buffer-spec.coffee
	src/app/edit-session.coffee
	src/app/project.coffee
	src/app/window.coffee
	src/atom-application.coffee
	static/root-view.less
2013-08-14 14:05:35 -07:00
Kevin Sawicki
30f72c1519 Update bootstrap URL in .gitmodules 2013-07-30 16:39:23 -07:00
Kevin Sawicki & Nathan Sobo
b9e23b96eb Use atom-collaboration-server directly in specs 2013-07-25 10:38:54 -06:00
Kevin Sawicki
b439e6239d Add telepath as submodule 2013-06-28 04:39:28 -06:00
Kevin Sawicki
2bd95a2b57 Merge branch 'master' into atom-shell
Conflicts:
	.gitmodules
2013-05-28 10:47:46 -07:00
Kevin Sawicki
6690598024 Use TextMate packages instead of vendoring bundles 2013-05-28 09:25:22 -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
Kevin Sawicki
61b5160d81 Move apm to github org. 2013-05-21 18:24:55 -07:00
Kevin Sawicki
851febd495 Use apm to install modules 2013-05-14 12:30:35 -07:00
Cheng Zhao
0f528c4811 Remove prebuilt-cef submodule. 2013-05-12 19:18:06 +08:00
Kevin Sawicki
a720919dd8 Add hyperlink helper TextMate bundle 2013-04-23 08:39:25 -07:00
Nathan Sobo
b856ab16cf Add SQL textmate bundle 2013-04-22 11:34:03 -06:00
Kevin Sawicki
faca7f091a Include PEG js bundle 2013-04-19 10:58:35 -07:00
Kevin Sawicki
b4ab10403d Use lower case submodule paths
Lowercase the Go and Mustache bundle paths to be
consistent with all others.
2013-04-18 21:34:31 -07:00
Nathan Sobo
738fc31f56 Add twitter bootstrap submodule and put it on less search path 2013-04-15 20:45:54 -06:00
Kevin Sawicki
00fd7fc00f Add Go Textmate bundle as submodule 2013-03-26 17:11:26 -04:00
Kevin Sawicki
6e472064dd Add Mustache bundle as a submodule
Closes #398
2013-03-21 11:13:07 -07:00
Adam Roben
b76ab87a96 Use HTTPS for prebuilt-cef
Fixes #361.
2013-03-06 08:30:50 -05:00
Adam Roben
492a5d2ff0 Merge branch 'dev' of https://github.com/github/atom into ci-testing
Conflicts:
	.gitmodules
2013-02-28 08:34:19 -05:00
Garen Torikian
6c389629b7 Add less tmbundle 2013-02-27 15:40:38 -08:00
Garen Torikian
18e089571c Add SASS TMBundle 2013-02-27 15:39:10 -08:00
Garen Torikian
318e86b821 Add Perl TMBundle 2013-02-27 15:38:22 -08:00
Garen Torikian
392b34e675 Add PHP TMBundle 2013-02-27 15:37:49 -08:00
Garen Torikian
f21318c3c7 Add Java TMBundle 2013-02-27 15:36:53 -08:00
Garen Torikian
519340a67c Add yaml submodule 2013-02-27 14:56:34 -08:00
Corey Johnson
28a2958262 re-add prebuild-cef submodule using ssh url 2013-02-27 12:19:01 -08:00
Corey Johnson
35b3e8ff58 remove prebuilt-cef submodule 2013-02-27 12:18:54 -08:00
Will Farrington
584c07b590 Add clojure tmbundle 2013-02-26 21:58:12 +11:00
Adam Roben
668921d336 Remove CEF from the repo and download it as needed
We now use github/prebuilt-cef to download CEF from S3, then build
against that. This means we no longer need to have CEF committed to the
repo.

Fixes #280.
2013-02-17 11:59:06 -05:00
Kevin Sawicki
7a186b1ab6 Add python bundle as submodule 2013-01-29 18:21:38 -08:00
Kevin Sawicki
14efcefad9 Add property list bundle
Also adds the xml bundle which is a requirement of
the property list bundle.
2013-01-08 16:22:38 -08:00
Kevin Sawicki
afa08c43b7 Vendor shell script bundle 2013-01-06 10:50:04 -08:00
Kevin Sawicki
59dced23a0 Update URL of git.tmbundle
Contains fix to colorize .gitmodules files
as config files.
2013-01-04 08:18:52 -08:00
Kevin Sawicki
4078046ac6 Vendor textmate bundles as submodules 2013-01-04 08:18:52 -08:00