|  Christophe Vilayphiou | 8eec7b4dac | Fix announcement for i18n_variable removal | 2012-07-27 19:12:58 +08:00 | 
				
					
						|  Christophe Vilayphiou | e2ebd48b22 | Remove i18n_variable for announcement | 2012-07-27 19:12:58 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f9bdb4a327 | New and Announcement search. Disabled impression. | 2012-07-20 15:47:40 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a7b92ed3e8 | fix  rejection for announcement and news. | 2012-07-17 10:22:42 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | ca2c056a07 | fix for not displaying bulletin at fronted when it's parent category is disable | 2012-07-11 17:17:44 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 773371e885 | fix from messy search | 2012-07-09 16:48:23 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 09d46f2f75 | NCCU 上傳版本  0709 Merge branch 'nccu0621'
Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb | 2012-07-09 16:02:59 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | c5fdff764e | orbit disable object for categories | 2012-07-05 16:00:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | ae2cbb728e | archive for announcement | 2012-07-04 17:36:51 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 4fe92b844e | Add sorting order for NCCU request | 2012-07-03 15:47:28 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f66c3d9c0c | fix bugs. | 2012-06-29 11:17:35 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 243c9e2946 | fix relation between bulletin and category	 (news also) | 2012-06-27 15:16:16 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | cb17fe0825 | Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working | 2012-06-20 14:50:51 +08:00 | 
				
					
						|  Christophe Vilayphiou | f1c8bed29d | Merge branch 'design_team' into ldap Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb | 2012-05-22 20:33:07 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4d33c7a56d | Changes for dat and time format Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title | 2012-05-18 19:42:36 +08:00 | 
				
					
						|  Matt | 6a022c90da | Changes on nccu | 2012-05-18 15:20:45 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4467bc5e48 | Change Date to DateTime Fix filename error | 2012-05-17 09:59:49 +08:00 | 
				
					
						|  Christophe Vilayphiou | e54f4409fb | Add impressionist | 2012-05-15 21:26:09 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 9ba4c2cf2f | Change to apply page to had object_auth | 2012-05-14 12:40:50 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0119ab1a74 | New Interface for App Auth and Object Auth | 2012-05-14 00:50:12 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 07815eee8f | fix display for announcement and remove ut field | 2012-05-10 10:29:18 +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 | 
				
					
						|  Christophe Vilayphiou | 32faef0c70 | DRY code for sorting | 2012-04-30 06:30:52 +08:00 | 
				
					
						|  Christophe Vilayphiou | b502bedd0f | Fix filter and sort for status in announcement | 2012-04-24 00:46:34 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | d2e77d6bf8 | Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner | 2012-04-09 12:45:27 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | d1dce81b3e | factcheck status for and | 2012-04-05 18:27:23 +08:00 | 
				
					
						|  unknown | d45725cf3b | fix announcement & add lang tab | 2012-04-05 15:23:20 +08:00 | 
				
					
						|  Matt Fu | 3ba89ecbcf | Fact check program completed,Lin checked | 2012-03-27 18:54:03 +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 | 
				
					
						|  Matt Fu | 9c8b0235b0 | add new files | 2012-03-19 10:55:58 +08:00 | 
				
					
						|  unknown | 6f6e84b015 | fix dashboard & announcement | 2012-03-16 14:44:57 +08:00 | 
				
					
						|  Matt Fu | 13b6892f87 | code for new fact check | 2012-03-16 11:09:44 +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 | dcc64a20d2 | Finish sorting for announcements | 2012-02-24 15:30:49 +08:00 | 
				
					
						|  Christophe Vilayphiou | 48d94d5e15 | Fix bug widget when no bulletins or web_links, put link in bulletins | 2012-02-23 15:50:30 +08:00 | 
				
					
						|  unknown | e82fd405c9 | remove bulletins_list | 2012-02-20 16:23:54 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7d57b50e46 | Widget for announcement and web_link with ajax reload and pagination | 2012-02-20 08:34:36 +08:00 | 
				
					
						|  unknown | 5da75161c4 | announcemenet & web_resource widget | 2012-02-16 17:52:49 +08:00 | 
				
					
						|  unknown | edf236c1c7 | edit tags | 2012-02-15 15:38:27 +08:00 | 
				
					
						|  Christophe Vilayphiou | af3a2547e1 | Change ModuleAppTag into "Module name"Tag. | 2012-02-15 15:18:11 +08:00 | 
				
					
						|  Christophe Vilayphiou | d0c2856a3a | Fix relations error in tags | 2012-02-15 11:42:19 +08:00 | 
				
					
						|  unknown | 778a85ca2b | add tags | 2012-02-15 10:37:07 +08:00 | 
				
					
						|  Christophe Vilayphiou | 3e70634add | Announcement modifications and tags | 2012-02-15 00:34:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | f57e9f19f7 | Changes for multiple i18n_variable in bulletin | 2012-02-15 00:34:22 +08:00 | 
				
					
						|  unknown | 964d7b6054 | announcement path error | 2012-02-13 17:09:37 +08:00 | 
				
					
						|  unknown | f097f83f2b | announcement_category edit | 2012-02-06 16:20:51 +08:00 |