Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								b8f52fa1ec
								
							
						 | 
						
							
							
								
								Separate announcement and news
							
							
							
							
							
						 | 
						
							2012-04-30 06:31:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a46a8898d7
								
							
						 | 
						
							
							
								
								Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
							
							
							
							
							
						 | 
						
							2012-04-30 00:24:11 +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 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a47ef5cfe8
								
							
						 | 
						
							
							
								
								Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb 
							
						 | 
						
							2012-04-24 16:45:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								db46803cda
								
							
						 | 
						
							
							
								
								R4-Billingual
							
							
							
							
							
						 | 
						
							2012-04-24 16:43:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								d0ced39c74
								
							
						 | 
						
							
							
								
								R4-Billingual
							
							
							
							
							
						 | 
						
							2012-04-24 16:06:42 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								a748ccaac7
								
							
						 | 
						
							
							
								
								Patch from ldap for announcement translation
							
							
							
							
							
						 | 
						
							2012-04-24 02:33:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e4c41ab54c
								
							
						 | 
						
							
							
								
								A filter UI for permission select. with Harry's JS
							
							
							
							
							
						 | 
						
							2012-04-12 07:14:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0909156eb4
								
							
						 | 
						
							
							
								
								fix i18n var for fact check pending
							
							
							
							
							
						 | 
						
							2012-04-12 07:14:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1fd38c8135
								
							
						 | 
						
							
							
								
								factcheck status for and
							
							
							
							
							
						 | 
						
							2012-04-12 07:14:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								486845460c
								
							
						 | 
						
							
							
								
								Filter and delete for bulletins
							
							
							
							
							
						 | 
						
							2012-04-12 06:50:36 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								d45725cf3b
								
							
						 | 
						
							
							
								
								fix announcement & add lang tab
							
							
							
							
							
						 | 
						
							2012-04-05 15:23:20 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								a30bc499c7
								
							
						 | 
						
							
							
								
								fix announcement & links
							
							
							
							
							
						 | 
						
							2012-03-27 14:19:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								61698f3f2c
								
							
						 | 
						
							
							
								
								Remove quick_edit on bulletin index load
							
							
							
							
							
						 | 
						
							2012-03-23 17:32:59 +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 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4dd9b7ffa4
								
							
						 | 
						
							
							
								
								Fix announcement pagination in front-end
							
							
							
							
							
						 | 
						
							2012-03-07 18:16:59 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e0accbecaa
								
							
						 | 
						
							
							
								
								Changes into page_part edition.
							
							
							
							
							
							
							
							Can choose between 'text', 'public_r_tag' and 'widget' 
							
						 | 
						
							2012-02-16 13:09:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3e70634add
								
							
						 | 
						
							
							
								
								Announcement modifications and tags
							
							
							
							
							
						 | 
						
							2012-02-15 00:34:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								088bbe1853
								
							
						 | 
						
							
							
								
								Change announcement route
							
							
							
							
							
						 | 
						
							2012-02-13 17:09:37 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								964d7b6054
								
							
						 | 
						
							
							
								
								announcement path error
							
							
							
							
							
						 | 
						
							2012-02-13 17:09:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								8f885e8bb7
								
							
						 | 
						
							
							
								
								Use key not title for module_app in parser.
							
							
							
							
							
							
							
							Modify announcement routes. 
							
						 | 
						
							2012-02-06 16:58:19 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								f097f83f2b
								
							
						 | 
						
							
							
								
								announcement_category edit
							
							
							
							
							
						 | 
						
							2012-02-06 16:20:51 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								4cfae9c107
								
							
						 | 
						
							
							
								
								announcement widget query
							
							
							
							
							
						 | 
						
							2012-01-18 21:34:26 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								ec235bcaa3
								
							
						 | 
						
							
							
								
								merge with master
							
							
							
							
							
						 | 
						
							2012-01-11 20:31:52 +08:00 |