Commit Graph

3 Commits

Author SHA1 Message Date
Spen 9d45df1c5a sso for ntu mb all sites
Conflicts:
	app/assets/stylesheets/basic/global.css
	app/views/devise/sessions/new.html.erb
	app/views/layouts/devise.html.erb
2014-01-23 12:01:16 +08:00
chris fe82427baa Ray's changes for css and js 2013-07-22 16:31:44 +08:00
chris 856898016b New UI changes(tags, categories, authorisations, module index…)
To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
2013-07-02 16:46:44 +08:00