Christophe Vilayphiou bebb8a1c1e Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: app/views/layouts/_side_bar.html.erb vendor/built_in_modules/archive/app/models/archive_file.rb vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb		2012-08-10 15:30:33 +08:00
..
admin	widget & frontend field	2012-08-09 15:25:30 +08:00
desktop	publication adjustment	2012-07-09 10:44:01 +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 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-08-10 15:30:33 +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