3643555a6c 
								
							 
						 
						
							
							
								
								Commented out Reason for Rejection  
							
							
							
						 
						
							2013-12-11 15:04:32 +08:00  
				
					
						
							
							
								 
						
							
								44cd8854a9 
								
							 
						 
						
							
							
								
								Removed approval from announcements  
							
							
							
						 
						
							2013-12-10 10:31:14 +08:00  
				
					
						
							
							
								 
						
							
								6d5dd4a80f 
								
							 
						 
						
							
							
								
								Changed Site Valid Locales to In Use Locales  
							
							
							
						 
						
							2013-11-27 17:51:48 +08:00  
				
					
						
							
							
								 
						
							
								e0e5dd7a3f 
								
							 
						 
						
							
							
								
								Fix jquery.mu.image.resize include path  
							
							
							
						 
						
							2013-11-22 14:03:46 +08:00  
				
					
						
							
							
								 
						
							
								43dcec76a1 
								
							 
						 
						
							
							
								
								Fix anoucement widget loading missing JS file  
							
							
							
						 
						
							2013-11-20 17:47:44 +08:00  
				
					
						
							
							
								 
						
							
								5e0696890a 
								
							 
						 
						
							
							
								
								Updated Remember me, and Homepage widget more link  
							
							
							
						 
						
							2013-11-11 17:23:03 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								9e432a5a93 
								
							 
						 
						
							
							
								
								fixed announcement rendering..  
							
							
							
						 
						
							2013-11-08 12:58:34 +08:00  
				
					
						
							
							
								 
						
							
								254f926093 
								
							 
						 
						
							
							
								
								fix new ui announcement preview  
							
							
							
						 
						
							2013-10-24 15:03:20 +08:00  
				
					
						
							
							
								 
						
							
								92d2af13f2 
								
							 
						 
						
							
							
								
								changes for ad_banner  
							
							
							
						 
						
							2013-10-19 19:17:04 +08:00  
				
					
						
							
							
								 
						
							
								9cc1e95cb1 
								
							 
						 
						
							
							
								
								announcement add new widget bulletins_and_links  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb 
							
						 
						
							2013-09-14 11:52:19 +08:00  
				
					
						
							
							
								 
						
							
								911cfdc980 
								
							 
						 
						
							
							
								
								Move js into a file for status in form  
							
							
							
						 
						
							2013-09-11 18:38:56 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								897ed49d2e 
								
							 
						 
						
							
							
								
								new ui for faq and announcement status fixed.  
							
							
							
						 
						
							2013-08-20 18:22:11 +08:00  
				
					
						
							
							
								 
						
							
								d434b878a7 
								
							 
						 
						
							
							
								
								Add default delete modal usage:  
							
							... 
							
							
							
							- <%= render 'layouts/delete_modal', delete_options: {title: '', warning: '', cancel: '', submit: '' } %>
 - in default index, just set title, warning, cancel and submit in quick_edit if needed 
							
						 
						
							2013-07-29 14:29:37 +08:00  
				
					
						
							
							
								 
						
							
								b3cdffb59e 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2013-07-27 15:57:14 +08:00  
				
					
						
							
							
								 
						
							
								fd432f30ba 
								
							 
						 
						
							
							
								
								Fix cktext_area and removing of files and links  
							
							
							
						 
						
							2013-07-27 15:50:34 +08:00  
				
					
						
							
							
								 
						
							
								0c208d0020 
								
							 
						 
						
							
							
								
								Remove some css causing errors in precompile  
							
							... 
							
							
							
							Remove the image in announcement index
Set the db to test_site 
							
						 
						
							2013-07-25 13:15:49 +08:00  
				
					
						
							
							
								 
						
							
								1dc7884ec0 
								
							 
						 
						
							
							
								
								Changes for default index:  
							
							... 
							
							
							
							- remove approvable and filterable
 - add display_option
 - change params
Update web link and gallery index 
							
						 
						
							2013-07-25 11:32:25 +08:00  
				
					
						
							
							
								 
						
							
								0d0f85e7ad 
								
							 
						 
						
							
							
								
								Fix tooltip in form  
							
							... 
							
							
							
							Change form_file 
							
						 
						
							2013-07-22 20:54:40 +08:00  
				
					
						
							
							
								 
						
							
								2265b0b404 
								
							 
						 
						
							
							
								
								Fix no file in bulletin form  
							
							
							
						 
						
							2013-07-22 17:41:21 +08:00  
				
					
						
							
							
								 
						
							
								6cf249ccfb 
								
							 
						 
						
							
							
								
								Change ckeditor gem and kaminari in gemfile  
							
							
							
						 
						
							2013-07-22 17:26:32 +08:00  
				
					
						
							
							
								 
						
							
								92faeccdb6 
								
							 
						 
						
							
							
								
								Revert change in main-form and change class name of form_file  
							
							
							
						 
						
							2013-07-22 17:24:58 +08:00  
				
					
						
							
							
								 
						
							
								5284571300 
								
							 
						 
						
							
							
								
								Add tooltip to bulletin form and remove file  
							
							
							
						 
						
							2013-07-22 16:55:02 +08:00  
				
					
						
							
							
								 
						
							
								62288a71ca 
								
							 
						 
						
							
							
								
								Fix category_id in forms  
							
							... 
							
							
							
							Fix statuses list 
							
						 
						
							2013-07-16 11:41:22 +08:00  
				
					
						
							
							
								 
						
							
								1c4b66f1cb 
								
							 
						 
						
							
							
								
								Fix approval in index  
							
							
							
						 
						
							2013-07-10 16:42:25 +08:00  
				
					
						
							
							
								 
						
							
								856898016b 
								
							 
						 
						
							
							
								
								New UI changes(tags, categories, authorisations, module index…)  
							
							... 
							
							
							
							To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) 
							
						 
						
							2013-07-02 16:46:44 +08:00  
				
					
						
							
							
								 
						
							
								7729161123 
								
							 
						 
						
							
							
								
								fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.  
							
							
							
						 
						
							2013-06-06 17:38:17 +08:00  
				
					
						
							
							
								 
						
							
								30824d1620 
								
							 
						 
						
							
							
								
								add search to archive  
							
							
							
						 
						
							2013-06-05 18:03:09 +08:00  
				
					
						
							
							
								 
						
							
								54a35b30be 
								
							 
						 
						
							
							
								
								fix design index bug when start start from blank DB.  
							
							... 
							
							
							
							add delay impressionist.
add several i18n vars 
							
						 
						
							2013-05-23 12:07:43 +08:00  
				
					
						
							
							
								 
						
							
								127ab3845c 
								
							 
						 
						
							
							
								
								Changes for queries  
							
							
							
						 
						
							2013-05-03 12:12:19 +08:00  
				
					
						
							
							
								 
						
							
								caf0426bd4 
								
							 
						 
						
							
							
								
								bulletin search  
							
							
							
						 
						
							2013-05-01 12:16:28 +08:00  
				
					
						
							
							
								 
						
							
								d047a3d62a 
								
							 
						 
						
							
							
								
								chris tags update  
							
							
							
						 
						
							2013-04-26 11:26:10 +08:00  
				
					
						
							
							
								 
						
							
								b864cc0268 
								
							 
						 
						
							
							
								
								Changes in I18n (except personal_conference and personal_journal)  
							
							
							
						 
						
							2013-03-12 18:13:48 +08:00  
				
					
						
							
							
								 
						
							
								979df9ac80 
								
							 
						 
						
							
							
								
								daily commit  
							
							
							
						 
						
							2013-01-23 18:51:18 +08:00  
				
					
						
							
							
								 
						
							
								de39bce4ce 
								
							 
						 
						
							
							
								
								Fix the tooltips  
							
							
							
						 
						
							2013-01-11 12:13:16 +08:00  
				
					
						
							
							
								 
						
							
								b90e8efb1f 
								
							 
						 
						
							
							
								
								Fix filter not collapsing  
							
							... 
							
							
							
							Fix icon size for button 
							
						 
						
							2013-01-11 11:37:11 +08:00  
				
					
						
							
							
								 
						
							
								41dff814fb 
								
							 
						 
						
							
							
								
								Change icons  
							
							
							
						 
						
							2013-01-09 21:17:50 +08:00  
				
					
						
							
							
								 
						
							
								614b6fde71 
								
							 
						 
						
							
							
								
								fix wrong html structure for announcement frontend  
							
							
							
						 
						
							2013-01-09 12:13:55 +08:00  
				
					
						
							
							
								 
						
							
								fac4faad6c 
								
							 
						 
						
							
							
								
								Change date picker  
							
							
							
						 
						
							2013-01-09 05:18:16 +08:00  
				
					
						
							
							
								 
						
							
								f4692182c0 
								
							 
						 
						
							
							
								
								when mouse move to button of announcement file : image => preview pic, file => type  
							
							
							
						 
						
							2013-01-02 16:34:38 +08:00  
				
					
						
							
							
								 
						
							
								9937b4ac9b 
								
							 
						 
						
							
							
								
								Fix deleting links and files in bulletin  
							
							
							
						 
						
							2012-12-31 18:03:13 +08:00  
				
					
						
							
							
								 
						
							
								61b0f94c04 
								
							 
						 
						
							
							
								
								Remove I18n.locale for announcement front-end  
							
							... 
							
							
							
							Fix counter in back-end edit 
							
						 
						
							2012-12-28 15:34:04 +08:00  
				
					
						
							
							
								 
						
							
								e8e7c38221 
								
							 
						 
						
							
							
								
								Changes for announcement widget style 1 and categories  
							
							
							
						 
						
							2012-12-28 14:01:04 +08:00  
				
					
						
							
							
								 
						
							
								455a27437d 
								
							 
						 
						
							
							
								
								Changes for announcement widget style 2  
							
							
							
						 
						
							2012-12-28 13:47:30 +08:00  
				
					
						
							
							
								 
						
							
								751d3b1220 
								
							 
						 
						
							
							
								
								Announcement widget: remove I18n.locale  
							
							... 
							
							
							
							Add part_id in url 
							
						 
						
							2012-12-27 16:52:58 +08:00  
				
					
						
							
							
								 
						
							
								b4633a2ccb 
								
							 
						 
						
							
							
								
								.not_guest_user  
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
				
					
						
							
							
								 
						
							
								fcbba6660b 
								
							 
						 
						
							
							
								
								Only one parser for front end  
							
							... 
							
							
							
							Separate site map for i18n 
							
						 
						
							2012-12-19 17:15:31 +08:00  
				
					
						
							
							
								 
						
							
								4a8878132e 
								
							 
						 
						
							
							
								
								add content for announcement rss  
							
							
							
						 
						
							2012-12-06 07:59:42 +08:00  
				
					
						
							
							
								 
						
							
								dc3be3c9a1 
								
							 
						 
						
							
							
								
								Translation changes  
							
							
							
						 
						
							2012-12-03 23:00:04 +08:00  
				
					
						
							
							
								 
						
							
								390da0e49a 
								
							 
						 
						
							
							
								
								Change icons  
							
							
							
						 
						
							2012-11-29 00:49:53 +08:00  
				
					
						
							
							
								 
						
							
								114ca5493a 
								
							 
						 
						
							
							
								
								replace rss format with json in announcement  
							
							
							
						 
						
							2012-11-28 13:43:48 +08:00