Commit Graph

146 Commits

Author SHA1 Message Date
Kevin Sawicki
2bd95a2b57 Merge branch 'master' into atom-shell
Conflicts:
	.gitmodules
2013-05-28 10:47:46 -07:00
Kevin Sawicki
617af68aeb Upgrade apm 2013-05-28 09:25:28 -07:00
Kevin Sawicki
6690598024 Use TextMate packages instead of vendoring bundles 2013-05-28 09:25:22 -07:00
Kevin Sawicki
61b5160d81 Move apm to github org. 2013-05-21 18:24:55 -07:00
Kevin Sawicki
5859ae6ba7 Upgrade apm 2013-05-17 15:37:21 -07:00
Kevin Sawicki
74c889062b Upgrade apm 2013-05-14 13:14:55 -07:00
Kevin Sawicki
851febd495 Use apm to install modules 2013-05-14 12:30:35 -07:00
probablycorey
2e61201f86 Update ruby TextMate bundle
Closes #541
2013-05-13 16:51:30 -07:00
Nathan Sobo
b70ff1b164 Don't assign window.jQuery in jasmine-jquery.js helper
I wrap it in a function wrapper to ensure that the assignment
`var jQuery` doesn't end up assigning a window global.
2013-04-26 15:36:13 -07:00
Kevin Sawicki
a720919dd8 Add hyperlink helper TextMate bundle 2013-04-23 08:39:25 -07:00
Nathan Sobo
9204836d70 Update grammars when grammars they include are added/removed
If the Ruby on Rails grammar depends on HTML, but it isn't loaded, its
syntax highlighting won't include HTMl tokens. If we later load HTML,
we should update any buffer with the Rails grammar to reflect the
change. This commit changes grammars to memoize their initial rule and
repository. If an included grammar is added or removed, we clear the
memoized rules and emit a 'grammar-updated' event. Any tokenized
buffer that points to this grammar can then retokenize to reflect the
newly available/unavailable included grammar.
2013-04-22 11:33:59 -06:00
Kevin Sawicki
faca7f091a Include PEG js bundle 2013-04-19 10:58:35 -07:00
Kevin Sawicki
ed9f46b39f Upgrade TextMate PHP bundle to current master 2013-04-19 10:58:33 -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
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
b298f63e4c Merge master 2013-03-27 19:47:14 -07:00
Nathan Sobo
38924f5bb8 Upgrade to latest space pen, as an NPM 2013-03-27 11:06:49 -04:00
Garen Torikian
280e527f5a Remove unneeded vendor binarys 2013-03-26 15:03:10 -07: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
Kevin Sawicki
77b7e71920 Move jasmine-helper from vendor/ to spec/ 2013-03-20 18:38:19 -07:00
Kevin Sawicki
8668998b1a Move jasmine-focused to spec folder
This JS file was previously loaded in the vendor folder
even though it was internally written.

It has also been converted to CoffeeScript.
2013-03-20 18:36:55 -07:00
Kevin Sawicki & Nathan Sobo
501dc9b76c Merge remote-tracking branch 'origin/master' into cefode
Conflicts:
	native/v8_extensions/native.mm
	spec/app/config-spec.coffee
	spec/app/window-spec.coffee
	spec/spec-helper.coffee
	spec/stdlib/fs-utils-spec.coffee
	src/app/atom-package.coffee
	src/app/config.coffee
	src/app/window.coffee
	src/packages/fuzzy-finder/lib/load-paths-handler.coffee
	src/packages/markdown-preview/lib/markdown-preview-view.coffee
	src/packages/tree-view/spec/tree-view-spec.coffee
	src/stdlib/require.coffee
2013-03-20 10:46:50 -06:00
Nathan Sobo
4a203a9eb6 Use plist NPM instead of vendor/plist.js. Use new synch parsing api.
This also adds a `readObject` method to `fs-utils`, which loads the
file as cson if it ends with json/cson, and otherwise tries to load
it as a plist.

For now, we're using my fork which is tolerant to a node environment
with a `window` global and suppresses some logging of non-fatal
errors. If the upstream author accepts my pull requests we can switch
back.
2013-03-19 11:32:23 -06:00
Kevin Sawicki
2b35eaa414 Update python bundle to 70dd4be
Adds .gypi to file types
2013-03-13 08:42:23 -07:00
Kevin Sawicki
3a3f4e2ce6 Use pegjs node module 2013-03-12 17:41:18 -07:00
Kevin Sawicki
96a949983c Use fs.resolveOnLoadPath() instead of require.resolve() 2013-03-12 13:33:25 -07:00
Kevin Sawicki
2a78183a15 Use node's crypto API for pasteboard md5s 2013-03-11 19:07:08 -07:00
Kevin Sawicki
9139df5779 Remove unused vendor assert.js 2013-03-11 17:36:48 -07:00
Kevin Sawicki
5d8a40d240 Use d3 npm 2013-03-11 15:48:29 -07:00
Kevin Sawicki
03b32ec29c Use coffee-script node module
This required upgrading underscore which to fix issues
with _.isEqual working across objects created from different
documents.

The upgrade required adding a custom _.isEqual extension that
added back support for object's having an isEqual method that
was removed in underscore 1.4.0.
2013-03-11 13:39:17 -07:00
Kevin Sawicki
2212222c47 Use underscore node module 2013-03-11 11:22:36 -07:00
probablycorey
0b674978db Require will parse .less files into css 2013-03-11 10:02:18 -07:00
Nathan Sobo
8898f81fc3 Add $.fn.views method to space pane, which returns an array of views 2013-03-07 09:30:24 -08: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
Will Farrington
584c07b590 Add clojure tmbundle 2013-02-26 21:58:12 +11:00
Kevin Sawicki
9e1547afab Update python bundle to df88cd66d0 2013-02-20 20:53:01 -08:00
Corey Johnson
f7bc1186c5 Console spec reporter allows focused specs 2013-02-20 16:28:49 -08:00
Kevin Sawicki
e21fddc5e3 Upgrade CoffeeScript bundle to 32d285247
Includes commit to not include whitespace before function name
in function scope.
2013-02-15 10:32:32 -08:00
Corey Johnson
98cd5b46d1 Spec runner cleanup 2013-02-11 18:00:56 -08:00
Nathan Sobo
3e040f3f40 Upgrade vendored SpacePen to d9b6b4a2fe3fdeca07bb82e14e412718540f89f3 2013-02-06 16:40:19 -07:00
Nathan Sobo
6561d89e1c Upgrade vendored SpacePen to f6ef4ba2ffdc27b6c9a057560f1f527b1e0f3e8b 2013-02-06 11:40:46 -07:00
Corey Johnson
4e60bf6501 Fix focused spec bug 2013-02-01 14:54:26 -08:00
Corey Johnson
ab8537f317 Upgrade Jasmine to 1.3.1 2013-02-01 14:13:56 -08:00