Orbit/app/views
Matthew K. Fu JuYuan a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb
2012-05-16 12:13:07 +08:00
..
admin Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 2012-05-16 12:13:07 +08:00
devise Change for the notice msg at login page 2012-04-30 00:24:10 +08:00
js Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
kaminari Ray's changes for css files, sort headers in announcement and pagination 2012-04-24 02:37:51 +08:00
layouts Fix sidebar and hide some links by roles 2012-05-16 12:10:16 +08:00
.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00