|  Matthew K. Fu JuYuan | 8b42c595b3 | Don't display admin in any premission select. Fix not necessary header for UT data | 2012-05-14 00:49:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | 62e9a772f6 | Fix titles for widgets Add translations | 2012-05-13 23:09:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4ae8299949 | Add custom title to widgets Fix pagination conflict with main_content and widgets | 2012-05-13 22:35:00 +08:00 | 
				
					
						|  Christophe Vilayphiou | 281cfa6518 | Changes for widgets | 2012-05-13 21:55:39 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 07815eee8f | fix display for announcement and remove ut field | 2012-05-10 10:29:18 +08:00 | 
				
					
						|  Christophe Vilayphiou | 13587306bc | Add list widgets for announcement, news and links with categories and tags | 2012-05-10 00:25:30 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | c82d701b55 | Permission setting for announcement for bulletin cate | 2012-05-09 15:28:02 +08:00 | 
				
					
						|  Christophe Vilayphiou | 41424d2829 | Fix error in front-end announcement index | 2012-05-08 17:40:14 +08:00 | 
				
					
						|  Christophe Vilayphiou | 55bfaea43e | Can show announcement and news list by tag's key | 2012-05-08 17:27:42 +08:00 | 
				
					
						|  Christophe Vilayphiou | f190ce18ee | Put sorting in web_link, page_context and design | 2012-05-05 21:20:20 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 119d8ff13a | add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data. | 2012-05-04 15:50:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 453cb21066 | Announcement preivew | 2012-05-04 15:50:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f427c3803f | clean up useless flash msgs. add i18n vars for app auth and object auth | 2012-05-04 15:40:43 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 05ded8de03 | Fix for NCCU 0430 all functions ok with two submanagers but different behavors | 2012-05-04 15:38:18 +08:00 | 
				
					
						|  Christophe Vilayphiou | b8f52fa1ec | Separate announcement and news | 2012-04-30 06:31:46 +08:00 | 
				
					
						|  Christophe Vilayphiou | 32faef0c70 | DRY code for sorting | 2012-04-30 06:30:52 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | c4db7e2157 | Fix approval setting ajax problem | 2012-04-30 00:24:11 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 94d61abf83 | A modal view for approval user | 2012-04-30 00:24:10 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a704a054cc | Remove useless files | 2012-04-25 16:10:11 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | db46803cda | R4-Billingual | 2012-04-24 16:43:45 +08:00 | 
				
					
						|  Christophe Vilayphiou | d247f05d2e | Add missing translations in announcement and change announcement behavior for passed and rejected | 2012-04-24 15:27:46 +08:00 | 
				
					
						|  Christophe Vilayphiou | db1b84e962 | Fix bug where an rejected announcement could still be edited by url | 2012-04-24 00:58:56 +08:00 | 
				
					
						|  Christophe Vilayphiou | b502bedd0f | Fix filter and sort for status in announcement | 2012-04-24 00:46:34 +08:00 | 
				
					
						|  Christophe Vilayphiou | 1ebf460f7e | Fix 'loading fail' in front-end for announcement The show action was returning an array instead of a bulletin | 2012-04-23 14:47:33 +08:00 | 
				
					
						|  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 |