Matthew K. Fu JuYuan e4cc80248d Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad ... Conflicts: config/mongoid.yml		2012-08-23 16:08:17 +08:00
..
admin	tp	2012-08-20 23:16:54 +08:00
desktop	Page added for desktop	2012-08-20 23:17:31 +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	Fixed bugs for nccu	2012-05-22 20:00:07 +08:00
layouts	Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad	2012-08-23 16:08:17 +08:00
shared	Clean up code , cache other auths. Fix sidebar	2012-05-29 17:17:26 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00
seminar_p.html.erb	Added seminar section	2012-07-04 19:12:02 +08:00