Brentley Jones 5e08427dd3 Merge branch 'master' into fixed_modals ...

Conflicts:
	app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
	app/assets/stylesheets/application/modal.css.scss

2013-07-16 18:58:49 +00:00

..

admin

Removed modelReady hack now that the async router exists

2013-07-16 13:24:59 -04:00

defer

show diff in post history view

2013-04-29 03:20:51 +02:00

discourse

Merge branch 'master' into fixed_modals

2013-07-16 18:58:49 +00:00

docs

Cleaned up admin JS, added YUIDoc headers to all admin classes.

2013-02-21 14:12:09 -05:00

external

Ember RC6 update

2013-07-16 10:35:18 -04:00

external_development

Ember RC6 update

2013-07-16 10:35:18 -04:00

external_production

Ember RC6 update

2013-07-16 10:35:18 -04:00

locales

Don't create globals in i18n.js

2013-06-20 12:47:50 -04:00

admin.js

Initial release of Discourse

2013-02-05 14:16:51 -05:00

application.js.erb

Ember RC6 update

2013-07-16 10:35:18 -04:00

discourse.js

FIX: FAQ wasn't loading sometimes

2013-07-16 12:11:30 -04:00

env.js

Some javascript refactoring: Move markdown functions into their own classs, remove extraneous window. calls.

2013-03-05 14:53:55 -05:00

jquery.js.erb

jquery 1.9.1 upgrade ... remove jquery rails

2013-06-07 09:12:46 +10:00

main_include.js

Fixed ContainerView code to build views correctly

2013-06-06 16:45:25 -04:00

pagedown_custom.js

wrapped I18n.lookup to inject the "js" namespace

2013-07-09 02:10:55 +02:00

preload_store.js

Ember RC6 update

2013-07-16 10:35:18 -04:00