Christophe Vilayphiou ad9ac5f3f7 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ...

Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_file.html.erb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/index.html.erb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

2012-05-16 01:31:16 +08:00

..

admin

Remove link from dashboard

2012-05-15 23:01:00 +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

Ray's changes for css files, sort headers in announcement and pagination

2012-04-24 02:37:51 +08:00

layouts

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

2012-05-16 01:31:16 +08:00

.swp

adding files not commited from previous commit

2011-07-12 16:02:41 +08:00