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
..
announcement	announcement edit to view file	2012-08-30 14:25:51 +08:00
archive	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-08-31 14:31:54 +08:00
gallery	updates for tagging and language fix	2012-08-20 22:00:57 +08:00
news	Fix can_display	2012-08-16 18:55:34 +08:00
page_content	Move delete checkboxes to js	2012-08-14 00:59:01 +08:00
web_resource	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-08-31 14:31:54 +08:00