unknown 9382ef6ae8 Merge branch 'dashboard' of https://github.com/Rulingcom/orbit into dashboard ... Conflicts: vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_form.html.erb		2012-04-05 15:16:33 +08:00
..
.gitkeep	merge with master	2012-01-11 20:31:52 +08:00
announcement_tag.rb	Fix bug widget when no bulletins or web_links, put link in bulletins	2012-02-23 15:50:30 +08:00
bulletin.rb	Fact check program completed,Lin checked	2012-03-27 18:54:03 +08:00
bulletin_category.rb	change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action.	2012-02-29 18:58:33 +08:00
bulletin_file.rb	fix announcement & add lang tab	2012-04-05 14:48:31 +08:00
bulletin_link.rb	fix dashboard & announcement	2012-03-16 14:44:57 +08:00