chris dcdd730a01 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ...

Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	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
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb

2012-08-31 14:31:54 +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 'dashboard' of github.com:Rulingcom/orbit into dashboard

2012-08-31 14:31:54 +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