chris 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP		2012-11-26 05:02:58 +08:00
..
admin	user roles starts	2012-11-22 21:10:35 +08:00
desktop	add co-author json	2012-11-23 10:44:48 +08:00
desktop_widgets	update for desktop widgets	2012-11-05 11:40:11 +08:00
devise	Fix bug: User cannot connect using the orbit button (Devise configuration)	2012-10-26 17:42:14 +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	Remove news and fix default_url in ImageUploader	2012-11-22 09:30:25 +08:00
shared	user roles starts	2012-11-22 21:10:35 +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