Commit Graph

149 Commits

Author SHA1 Message Date
Christophe Vilayphiou 212730fd8a Add missing end tag in bulletin _form 2012-03-27 19:37:47 +08:00
Christophe Vilayphiou b587b7ca6b Remove limit(1) to bulletins index action 2012-03-27 19:22:50 +08:00
Christophe Vilayphiou 50be40f7b3 Ray's changes in announcenment back-end 2012-03-27 19:10:35 +08:00
Matt Fu 1e60acaa11 Fact check program completed,Lin checked 2012-03-27 19:06:28 +08:00
Christophe Vilayphiou cf297fc424 Changed inherited controller in module_apps to OrbitBackendController 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou b134e690e9 Delete new_blog 2012-03-27 18:58:04 +08:00
Christophe Vilayphiou 07ba457dd7 admin now can post without fact check 2012-03-27 18:58:03 +08:00
Christophe Vilayphiou 55d12e50f2 Ray's changes in announcenment back-end 2012-03-27 18:58:03 +08:00
Christophe Vilayphiou 97adf94e15 fix with what ray needs for the fact_check form 2012-03-27 18:56:18 +08:00
Matt Fu 3ba89ecbcf Fact check program completed,Lin checked 2012-03-27 18:54:03 +08:00
Christophe Vilayphiou f9c5ee5d18 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
2012-03-27 18:37:14 +08:00
unknown e8d1352890 fix announcement 2012-03-27 14:29:11 +08:00
Christophe Vilayphiou 33955b4554 Delete files with Chinese characters in name 2012-03-27 14:21:32 +08:00
Christophe Vilayphiou c4299245de Delete files with Chinese characters in name 2012-03-27 14:19:58 +08:00
unknown a30bc499c7 fix announcement & links 2012-03-27 14:19:58 +08:00
Christophe Vilayphiou 7765f0d2e1 Delete files with Chinese characters in name 2012-03-27 14:17:48 +08:00
Christophe Vilayphiou 74636fb16d Delete file with Chinese character in the name 2012-03-27 14:16:04 +08:00
Christophe Vilayphiou f37eb5bf43 Add missing file 2012-03-23 18:27:41 +08:00
unknown 42519d9f78 fix announcement & links 2012-03-23 18:04:11 +08:00
Christophe Vilayphiou 61698f3f2c Remove quick_edit on bulletin index load 2012-03-23 17:32:59 +08:00
Christophe Vilayphiou 0e8f8b3424 Add missing category when redirect to front-end for bulletin back-end index 2012-03-21 12:58:13 +08:00
Christophe Vilayphiou 3aa7c5120d Put tinymce in its own js file.
To use on a text area just add the class "tinymce_textarea".
2012-03-21 12:41:32 +08:00
Christophe Vilayphiou 5d7202af8b Modify bulletin back-end index to show announcement in front-end 2012-03-21 12:37:52 +08:00
Christophe Vilayphiou c4d541d3b9 Remove code from back_end/bulletins/show 2012-03-21 12:36:52 +08:00
Matt Fu 6700114955 after merge 2012-03-19 10:55:58 +08:00
Matt Fu 9c8b0235b0 add new files 2012-03-19 10:55:58 +08:00
unknown a755eb184b fix announcement links & files 2012-03-16 16:49:25 +08:00
unknown 7d553acaec fix announcement link & files 2012-03-16 15:53:57 +08:00
Christophe Vilayphiou f4fda08e86 Replace PrototypeR4 by Orbit.
Move session into mongoid_store.
Reset session when sing_in.
2012-03-16 14:58:32 +08:00
Christophe Vilayphiou 785ead5209 Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard
Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
2012-03-16 14:55:21 +08:00
unknown 6f6e84b015 fix dashboard & announcement 2012-03-16 14:44:57 +08:00
Christophe Vilayphiou b6d49df145 Change Obit to Orbit 2012-03-16 11:54:31 +08:00
Matt Fu 13b6892f87 code for new fact check 2012-03-16 11:09:44 +08:00
unknown 00ab773942 fix dashboard & announcement 2012-03-14 20:05:03 +08:00
Christophe Vilayphiou 79c8b3861b Fix link in widget 2012-03-07 18:16:59 +08:00
Christophe Vilayphiou 4dd9b7ffa4 Fix announcement pagination in front-end 2012-03-07 18:16:59 +08:00
Christophe Vilayphiou 0b1f83c042 Fix extra loaded js: the widgets only need to render layout when they need js. 2012-03-07 18:16:59 +08:00
Christophe Vilayphiou 7c55f6fb88 Merge branch 'announcement_dev_view_and_auth' of github.com:Rulingcom/orbit into announcement_dev_view_and_auth
Conflicts:
	config/environments/development.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/announcements_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/models/bulletin.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletins.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/edit.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/new.html.erb
	vendor/built_in_modules/announcement/config/routes.rb
	vendor/built_in_modules/web_resource/lib/tasks/web_resource_tasks.rake
2012-02-29 19:03:29 +08:00
Matt Fu cceb785a8d 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
Matthew Kaito Juyuan Fu 2e58c63ff7 fix bugs with token 2012-02-29 18:56:42 +08:00
Matthew Kaito Juyuan Fu cc550c5745 First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
Matthew Kaito Juyuan Fu 3bcd7ea349 Exp with object_auth 2012-02-29 18:50:23 +08:00
Christophe Vilayphiou 6b2aeadde6 Changes for nccu 2012-02-29 16:01:50 +08:00
Christophe Vilayphiou 0a23ce7b24 Add missing i18n for announcement 2012-02-29 12:00:16 +08:00
Matt Fu 438dc0ad3d i18n vars for announcement 2012-02-29 11:54:48 +08:00
Matt Fu b83a783a26 Add translation files for Announcement 2012-02-29 11:12:34 +08:00
Christophe Vilayphiou fdf4cfad2d Add category for announcement widget 2012-02-28 14:08:57 +08:00
Christophe Vilayphiou 7f9a7edc98 Changes in bulletins widget and front-end, add categories to link 2012-02-28 04:24:09 +08:00
Christophe Vilayphiou fe4c0986e7 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
	Gemfile.lock
	app/controllers/admin/pages_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
2012-02-27 18:56:15 +08:00
Christophe Vilayphiou 0029ef2b5a Fix bug due to image_filename -> image_identifier 2012-02-27 18:50:56 +08:00