Robin Ward b2d478a6fc Merge branch 'master' of github.com:awesomerobot/discourse into awesomerobot-master ...

Conflicts:
	app/assets/javascripts/discourse/templates/header.hbs

2014-10-08 13:48:26 -04:00

..

admin

FEATURE: trust level 3: likes received must be on min_likes_received/3 different days, and be from min_likes_received/4 different users

2014-10-07 15:52:54 -04:00

defer

FIX: remove invalid hack, correct whitelist to use value returned from callback

2014-07-25 12:16:00 +10:00

discourse

Merge branch 'master' of github.com:awesomerobot/discourse into awesomerobot-master

2014-10-08 13:48:26 -04:00

docs

Ember Upgrade: 1.0

2013-10-01 11:16:27 -04:00

locales

return true when invoke verbose_localization_session

2014-09-14 10:10:48 +08:00

admin.js.erb

allow apps to give custom admin javascripts

2014-03-17 13:19:08 +01:00

application.js.erb

FEATURE: allow plugins to overwrite handlebars templates

2013-12-31 16:43:29 +01:00

discourse.js

Refactor some deprecations for newer versions of Ember. Also set up

2014-09-11 16:16:21 -04:00

ember_include.js.erb

fix build?

2013-12-23 17:53:33 +11:00

env.js

Use query params for sortable table headings

2014-04-17 10:52:57 -04:00

jquery_include.js.erb

Bump hashes on various files

2014-05-15 15:52:09 +10:00

main_include_admin.js

FEATURE: Admin interface for adding custom fields for users

2014-09-25 16:17:51 -04:00

main_include.js

FEATURE: hide emails behind a button for staff members

2014-09-29 22:31:05 +02:00

pagedown_custom.js

Enable JSHINT's unused option. It caught a bunch of suspicious stuff which is fixed in this commit.

2013-12-30 13:30:22 -05:00

preload_store.js

Remove deprecated Ember.Deferred

2014-09-24 14:17:29 -04:00

vendor.js

FEATURE: Admin interface for adding custom fields for users

2014-09-25 16:17:51 -04:00