9a0e9ddc82 
								
							 
						 
						
							
							
								
								Revert "Updated Bulletins controller with announcement approval fix"  
							
							... 
							
							
							
							This reverts commit a9431ad17e 
							
						 
						
							2013-10-01 15:03:34 +08:00  
				
					
						
							
							
								 
						
							
								a9431ad17e 
								
							 
						 
						
							
							
								
								Updated Bulletins controller with announcement approval fix  
							
							
							
						 
						
							2013-10-01 10:03:18 +08:00  
				
					
						
							
							
								 
						
							
								ba7ac5d954 
								
							 
						 
						
							
							
								
								Fix [app_name]_category_with_title and change announcement init  
							
							
							
						 
						
							2013-09-14 11:54:35 +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  
				
					
						
							
							
								 
						
							
								ec40591489 
								
							 
						 
						
							
							
								
								Make the filter for authorisation easier for developers  
							
							
							
						 
						
							2013-08-22 12:17:50 +08:00  
				
					
						
							
							
								 
						
							
								c474fa063f 
								
							 
						 
						
							
							
								
								New authorization  
							
							
							
						 
						
							2013-08-21 13:42:29 +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  
				
					
						
							
							
								 
						
							
								253cca06cc 
								
							 
						 
						
							
							
								
								New widget for tag cloud  
							
							
							
						 
						
							2013-06-06 17:17:45 +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  
				
					
						
							
							
								 
						
							
								3d0a1cef56 
								
							 
						 
						
							
							
								
								1.fix for syntax error.  
							
							... 
							
							
							
							2.Making production console works.
3.Making blank site member no errors. 
							
						 
						
							2013-05-22 16:25:12 +08:00  
				
					
						
							
							
								 
						
							
								127ab3845c 
								
							 
						 
						
							
							
								
								Changes for queries  
							
							
							
						 
						
							2013-05-03 12:12:19 +08:00  
				
					
						
							
							
								 
						
							
								167a71272a 
								
							 
						 
						
							
							
								
								queries need to be rethink  
							
							
							
						 
						
							2013-05-03 12:12:19 +08:00  
				
					
						
							
							
								 
						
							
								caf0426bd4 
								
							 
						 
						
							
							
								
								bulletin search  
							
							
							
						 
						
							2013-05-01 12:16:28 +08:00  
				
					
						
							
							
								 
						
							
								64101109dd 
								
							 
						 
						
							
							
								
								disable all sorted_tags  
							
							
							
						 
						
							2013-04-26 18:07:59 +08:00  
				
					
						
							
							
								 
						
							
								d047a3d62a 
								
							 
						 
						
							
							
								
								chris tags update  
							
							
							
						 
						
							2013-04-26 11:26:10 +08:00  
				
					
						
							
							
								 
						
							
								9815950083 
								
							 
						 
						
							
							
								
								now default options can be chosen by developer at init  
							
							
							
						 
						
							2013-04-17 11:07:45 +08:00  
				
					
						
							
							
								 
						
							
								69a49a69aa 
								
							 
						 
						
							
							
								
								style for front end  
							
							
							
						 
						
							2013-04-17 11:05:57 +08:00  
				
					
						
							
							
								 
						
							
								4a08a1992b 
								
							 
						 
						
							
							
								
								1.make module app forbid unearthed access except from admin  
							
							... 
							
							
							
							2.override sidebar link when it's object_auth or app_auth. 
							
						 
						
							2013-04-17 10:56:15 +08:00  
				
					
						
							
							
								 
						
							
								da8a5123c2 
								
							 
						 
						
							
							
								
								Change in announcement init for query  
							
							... 
							
							
							
							Change in default widget query 
							
						 
						
							2013-03-27 16:31:42 +08:00  
				
					
						
							
							
								 
						
							
								04d3e177d5 
								
							 
						 
						
							
							
								
								Fix typo in core lib  
							
							... 
							
							
							
							Change i18n for more link in announcement init 
							
						 
						
							2013-03-20 17:45:08 +08:00  
				
					
						
							
							
								 
						
							
								f3c809fd58 
								
							 
						 
						
							
							
								
								Fix link switch not showing for default front end  
							
							
							
						 
						
							2013-03-19 17:49:46 +08:00  
				
					
						
							
							
								 
						
							
								aacfcf1997 
								
							 
						 
						
							
							
								
								Fix typo in translations  
							
							
							
						 
						
							2013-03-18 21:52:52 +08:00  
				
					
						
							
							
								 
						
							
								b864cc0268 
								
							 
						 
						
							
							
								
								Changes in I18n (except personal_conference and personal_journal)  
							
							
							
						 
						
							2013-03-12 18:13:48 +08:00  
				
					
						
							
							
								 
						
							
								071e8a349c 
								
							 
						 
						
							
							
								
								link to more  
							
							
							
						 
						
							2013-02-27 10:50:50 +08:00  
				
					
						
							
							
								 
						
							
								680d7908b9 
								
							 
						 
						
							
							
								
								member plugin init edit  
							
							
							
						 
						
							2013-02-21 17:53:08 +08:00  
				
					
						
							
							
								 
						
							
								79f0fc1a3b 
								
							 
						 
						
							
							
								
								add announcement header translation file  
							
							
							
						 
						
							2013-02-21 14:10:42 +08:00  
				
					
						
							
							
								 
						
							
								f59da3ce81 
								
							 
						 
						
							
							
								
								member plugin init edit  
							
							
							
						 
						
							2013-02-20 18:05:09 +08:00  
				
					
						
							
							
								 
						
							
								bc44d38948 
								
							 
						 
						
							
							
								
								member plugin edit  
							
							
							
						 
						
							2013-02-20 17:25:20 +08:00  
				
					
						
							
							
								 
						
							
								61648d23e1 
								
							 
						 
						
							
							
								
								Change delete_all to destroy_all  
							
							
							
						 
						
							2013-02-19 17:39:42 +08:00  
				
					
						
							
							
								 
						
							
								3676de8a14 
								
							 
						 
						
							
							
								
								Change validation for url: can include IPs  
							
							
							
						 
						
							2013-02-19 17:39:42 +08:00  
				
					
						
							
							
								 
						
							
								0a115906f1 
								
							 
						 
						
							
							
								
								fix i18n,reload problems  
							
							
							
						 
						
							2013-02-19 14:21:54 +08:00  
				
					
						
							
							
								 
						
							
								b7d797f9dd 
								
							 
						 
						
							
							
								
								fix member sidebar  
							
							... 
							
							
							
							add i18n for modules and default_widgets 
							
						 
						
							2013-02-19 14:21:54 +08:00  
				
					
						
							
							
								 
						
							
								a6f6dc271c 
								
							 
						 
						
							
							
								
								fix i18n,reload problems  
							
							
							
						 
						
							2013-02-18 15:13:31 +08:00  
				
					
						
							
							
								 
						
							
								29bb92f841 
								
							 
						 
						
							
							
								
								fix member sidebar  
							
							... 
							
							
							
							add i18n for modules and default_widgets 
							
						 
						
							2013-02-06 17:44:38 +08:00