Commit Graph

53 Commits

Author SHA1 Message Date
Christophe Vilayphiou 486845460c Filter and delete for bulletins 2012-04-12 06:50:36 +08:00
Christophe Vilayphiou 963a0cb604 Change filter to js with history for bulletins 2012-04-07 00:20:52 +08:00
Christophe Vilayphiou 4da03026a4 Fix pagination bug in bulletins 2012-04-05 15:28:43 +08:00
unknown d45725cf3b fix announcement & add lang tab 2012-04-05 15:23:20 +08:00
Christophe Vilayphiou 9c1c70b598 Fix sorting in annoucement 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou 6c50aa5243 Add pagination to bulletin index and remove ajax to make it simple 2012-04-02 02:55:36 +08:00
Christophe Vilayphiou 172d3d7847 Remove bad references to NewBlog 2012-03-27 19:42:07 +08:00
Christophe Vilayphiou b587b7ca6b Remove limit(1) to bulletins index action 2012-03-27 19:22:50 +08:00
Christophe Vilayphiou cf297fc424 Changed inherited controller in module_apps to OrbitBackendController 2012-03-27 18:58:04 +08:00
Matt Fu 3ba89ecbcf Fact check program completed,Lin checked 2012-03-27 18:54:03 +08:00
unknown a30bc499c7 fix announcement & links 2012-03-27 14:19:58 +08:00
Christophe Vilayphiou 74636fb16d Delete file with Chinese character in the name 2012-03-27 14:16:04 +08:00
Christophe Vilayphiou 61698f3f2c Remove quick_edit on bulletin index load 2012-03-23 17:32:59 +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 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 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 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 fdf4cfad2d Add category for announcement widget 2012-02-28 14:08:57 +08:00
Christophe Vilayphiou 0029ef2b5a Fix bug due to image_filename -> image_identifier 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou f13ebc6c46 Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
Christophe Vilayphiou dcc64a20d2 Finish sorting for announcements 2012-02-24 15:30:49 +08:00
Christophe Vilayphiou 63d7810b35 Add isotope, categories for announcement page, sort for announcement 2012-02-23 15:52:58 +08:00
Christophe Vilayphiou 53ed4b0404 Initial changes in announcement for sorting and filtering 2012-02-23 15:51:33 +08:00
Christophe Vilayphiou ba4d71a026 Changes in orbit_bar and js in announcements 2012-02-23 15:51:33 +08:00
Christophe Vilayphiou ad27537cf7 Change pagination in bulletins 2012-02-23 15:50:30 +08:00
unknown b0834c0c62 Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev
Conflicts:
	app/views/layouts/module_widget.html.erb
2012-02-20 16:25:29 +08:00
unknown e82fd405c9 remove bulletins_list 2012-02-20 16:23:54 +08:00
Christophe Vilayphiou 1146506063 Fix bug when no bulletins or web_links 2012-02-20 15:56:17 +08:00
Christophe Vilayphiou 7d57b50e46 Widget for announcement and web_link with ajax reload and pagination 2012-02-20 08:34:36 +08:00
Matt Fu 26cd6951db 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-17 17:50:23 +08:00
unknown 5da75161c4 announcemenet & web_resource widget 2012-02-16 17:52:49 +08:00
Matthew Kaito Juyuan Fu 5640e07733 First version for App and Object auth.Taking Announcement as experiment 2012-02-15 18:20:44 +08:00
Christophe Vilayphiou 3e70634add Announcement modifications and tags 2012-02-15 00:34:22 +08:00
Christophe Vilayphiou 55ae7de01c Orbit-bar in front-end and back-end, side-bar and drop-down menu 2012-02-15 00:34:22 +08:00
Matthew Kaito Juyuan Fu 17caa7cb1b Exp with object_auth 2012-02-13 17:33:48 +08:00
unknown 964d7b6054 announcement path error 2012-02-13 17:09:37 +08:00
unknown 338d18e909 announcement path error 2012-02-09 14:58:59 +08:00
unknown f097f83f2b announcement_category edit 2012-02-06 16:20:51 +08:00
unknown 2c8940e350 announcement widget page 2012-01-20 14:04:52 +08:00
unknown 4cfae9c107 announcement widget query 2012-01-18 21:34:26 +08:00