Kevin Sawicki 56a2c79fe1 Merge branch 'collaboration-presence' into shared-buffers ...

Conflicts:
	src/app/edit-session.coffee
	src/app/project.coffee
	src/app/text-buffer.coffee
	src/app/window.coffee
	src/packages/collaboration/lib/bootstrap.coffee
	src/packages/collaboration/lib/session-utils.coffee
	vendor/telepath

2013-07-22 10:12:45 -07:00

..

apm @ 1e03f08ee0

Upgrade apm

2013-07-12 14:07:03 -07:00

bootstrap @ 991a353a26

Add twitter bootstrap submodule and put it on less search path

2013-04-15 20:45:54 -06:00

telepath @ c1b07c5044

Upgrade telepath to fix markers at end of buffer being invalid

2013-07-21 17:49:51 -06:00

themes

moving themes to vendor/themes

2013-01-22 12:39:40 -08:00

ctags

Vendor exuberant ctags

2012-10-26 10:58:10 -07:00

jasmine-console-reporter.js

Format stack traces in console reporter

2013-07-06 15:39:32 -07:00

jasmine-jquery.js

Don't assign window.jQuery in jasmine-jquery.js helper

2013-04-26 15:36:13 -07:00

jasmine.js

Upgrade Jasmine to 1.3.1

2013-02-01 14:13:56 -08:00

jquery.js

WIP: Use rake to start compiling resources (like require.coffee)

2012-08-26 16:29:46 -05:00

slick.js

WIP: Use rake to start compiling resources (like require.coffee)

2012-08-26 16:29:46 -05:00

specificity.js

WIP: Use rake to start compiling resources (like require.coffee)

2012-08-26 16:29:46 -05:00

stringscore.js

Update stringscore.js to 0.1.10 and remove start_of_string_bonus

2012-10-24 15:33:13 -07:00