Christophe Vilayphiou e88b09cf72 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit ... Conflicts: app/controllers/pages_controller.rb app/views/layouts/_side_bar.html.erb lib/parsers/parser_common.rb vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendor/built_in_modules/gallery/config/locales/en.yml vendor/built_in_modules/gallery/config/locales/zh_tw.yml		2012-09-12 02:21:18 +08:00
..
admin	update archive	2012-08-30 15:17:39 +08:00
desktop	Page added for desktop	2012-08-20 23:17:31 +08:00
devise	remove remember for nccu	2012-07-03 15:59:25 +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 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit	2012-09-12 02:21:18 +08:00
shared	Fix fb share, redirect with js when the page is not requested by fb but by user	2012-08-08 11:04:19 +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