This repository has been archived on 2023-03-18. You can view files and clone it, but cannot push or open issues or pull requests.
osr-discourse-src/app/assets/javascripts/discourse
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
..
components fix non localized said: in quotes 2013-07-16 17:22:54 +10:00
controllers FIX: FAQ wasn't loading sometimes 2013-07-16 12:11:30 -04:00
helpers FIX: Bugs on Admin User approval interface 2013-07-15 11:28:41 -04:00
mixins Removed modelReady hack now that the async router exists 2013-07-16 13:24:59 -04:00
models Remove EvilTrout's stupid mistake. 2013-07-16 13:51:00 -04:00
routes Removed modelReady hack now that the async router exists 2013-07-16 13:24:59 -04:00
templates Merge branch 'master' into fixed_modals 2013-07-16 18:58:49 +00:00
views fix mucked up styling, glyph should be inside the hyperlink so it gets color 2013-07-16 18:01:34 +10:00