Harry Bomrah 
							
						 
						
							
								2f673b20ad 
								
							 
						 
						
							
							
								
								disabling changes in desktop, missed out in last one  
							
							
							
						 
						
							2013-09-30 17:25:02 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								0a9fd6a4b5 
								
							 
						 
						
							
							
								
								some needed changes in api for desktop  
							
							
							
						 
						
							2013-09-30 16:59:50 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								52c896d8c5 
								
							 
						 
						
							
							
								
								some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules.  
							
							
							
						 
						
							2013-09-26 20:11:45 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								1d0ea6718f 
								
							 
						 
						
							
							
								
								brief added to desktop for all plugins  
							
							
							
						 
						
							2013-09-25 18:23:44 +08:00  
				
					
						
							
							
								 
						
							
								a067bcd304 
								
							 
						 
						
							
							
								
								Add Brief intro. for all personal plugins  
							
							... 
							
							
							
							Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix 
							
						 
						
							2013-09-18 18:55:40 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e4a16eab3a 
								
							 
						 
						
							
							
								
								commit for survey questions  
							
							
							
						 
						
							2013-09-17 15:34:23 +08:00  
				
					
						
							
							
								 
						
							
								8456a91968 
								
							 
						 
						
							
							
								
								Fix structure edit  
							
							
							
						 
						
							2013-09-14 17:26:16 +08:00  
				
					
						
							
							
								 
						
							
								17d7912e07 
								
							 
						 
						
							
							
								
								Ray's js code for status in form  
							
							
							
						 
						
							2013-09-11 19:24:58 +08:00  
				
					
						
							
							
								 
						
							
								911cfdc980 
								
							 
						 
						
							
							
								
								Move js into a file for status in form  
							
							
							
						 
						
							2013-09-11 18:38:56 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								579bc3c245 
								
							 
						 
						
							
							
								
								some very small fix for image alternative text and browse files manager  
							
							
							
						 
						
							2013-09-11 14:03:25 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								8c98645a69 
								
							 
						 
						
							
							
								
								small bug fix for inserting and delete button.  
							
							
							
						 
						
							2013-09-11 14:03:19 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								f920a4f6ba 
								
							 
						 
						
							
							
								
								filemanager and some update for file uploader . added file uploader to kernel  
							
							
							
						 
						
							2013-09-11 14:03:06 +08:00  
				
					
						
							
							
								 
						
							
								3328a41b55 
								
							 
						 
						
							
							
								
								Put back js that was deleted by mistake  
							
							
							
						 
						
							2013-09-11 14:01:06 +08:00  
				
					
						
							
							
								 
						
							
								81a89d2d7c 
								
							 
						 
						
							
							
								
								new ui member image js fix  
							
							
							
						 
						
							2013-09-02 14:37:35 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								4209356e9d 
								
							 
						 
						
							
							
								
								new features in gallery image view.. and also tags for gallery completed.  
							
							
							
						 
						
							2013-09-02 11:23:01 +08:00  
				
					
						
							
							
								 
						
							
								3123c5de0a 
								
							 
						 
						
							
							
								
								new ui member bug and interface fix  
							
							
							
						 
						
							2013-09-02 11:22:17 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								82b6be483a 
								
							 
						 
						
							
							
								
								isotope embedded inside desktop kernel  
							
							
							
						 
						
							2013-08-30 10:58:08 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								b004121187 
								
							 
						 
						
							
							
								
								minimize bar updated to new style and more flexible.  
							
							
							
						 
						
							2013-08-19 12:59:57 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								a04155963d 
								
							 
						 
						
							
							
								
								all file things are fixed. delete and view and also names  
							
							
							
						 
						
							2013-08-14 09:30:48 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								6d54dbd5f8 
								
							 
						 
						
							
							
								
								bilingual for files fixed and description added and also filename display after selecting filenames  
							
							... 
							
							
							
							Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js 
							
						 
						
							2013-08-13 17:22:09 +08:00  
				
					
						
							
							
								 
						
							
								cb070cc537 
								
							 
						 
						
							
							
								
								Updated Desktop with fix for forms for all users  
							
							
							
						 
						
							2013-08-13 11:51:59 +08:00  
				
					
						
							
							
								 
						
							
								6c514770bc 
								
							 
						 
						
							
							
								
								solved conflict for member_new_ui  
							
							
							
						 
						
							2013-08-12 15:40:34 +08:00  
				
					
						
							
							
								 
						
							
								a2e9aa2e0b 
								
							 
						 
						
							
							
								
								Updated ADBanner with fixes on index page, ADImage with fixes  
							
							... 
							
							
							
							Conflicts:
	app/views/admin/ad_banners/index.html.erb
	app/views/admin/ad_images/_form.html.erb
	vendor/built_in_modules/ad_banner/init.rb 
							
						 
						
							2013-08-09 15:21:51 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e3d9966f76 
								
							 
						 
						
							
							
								
								bugs fixed for plugins. .. and also css fixed  
							
							
							
						 
						
							2013-08-06 17:53:04 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								42615f02ea 
								
							 
						 
						
							
							
								
								new feature in desktop for uploading wallpapers or putting url link  
							
							
							
						 
						
							2013-08-02 19:32:41 +08:00  
				
					
						
							
							
								 
						
							
								0f3a8414be 
								
							 
						 
						
							
							
								
								Delete duplicate js and css  
							
							... 
							
							
							
							Close the form in search in orbit bar 
							
						 
						
							2013-07-31 17:30:53 +08:00  
				
					
						
							
							
								 
						
							
								d9079d9d7c 
								
							 
						 
						
							
							
								
								Updated with icons, latest js and css for desktop  
							
							
							
						 
						
							2013-07-30 16:43:47 +08:00  
				
					
						
							
							
								 
						
							
								55d9aea664 
								
							 
						 
						
							
							
								
								Merged Desktop with New UI  
							
							
							
						 
						
							2013-07-30 16:43:38 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								79c7f8e90f 
								
							 
						 
						
							
							
								
								new orbit bar fixed..  
							
							... 
							
							
							
							Conflicts:
	app/assets/javascripts/orbit_js_1.0.1-front-end.js
	app/assets/stylesheets/basic/orbit_bar.css.erb
	app/assets/stylesheets/orbit_bar_bootstrap.css
	app/views/layouts/_left_menu.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_right_menu.html.erb
	app/views/layouts/desktop.html.erb 
							
						 
						
							2013-07-30 16:43:35 +08:00  
				
					
						
							
							
								 
						
							
								fe10cc62d9 
								
							 
						 
						
							
							
								
								Fix structure title (page slide)  
							
							
							
						 
						
							2013-07-29 14:59:02 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								57a64dc378 
								
							 
						 
						
							
							
								
								mini colors in new ui fixed  
							
							
							
						 
						
							2013-07-23 12:12:46 +08:00  
				
					
						
							
							
								 
						
							
								0d0f85e7ad 
								
							 
						 
						
							
							
								
								Fix tooltip in form  
							
							... 
							
							
							
							Change form_file 
							
						 
						
							2013-07-22 20:54:40 +08:00  
				
					
						
							
							
								 
						
							
								5d3bc07488 
								
							 
						 
						
							
							
								
								archive and web_resouce for new ui  
							
							... 
							
							
							
							Conflicts:
	app/assets/stylesheets/lib/main-forms.css 
							
						 
						
							2013-07-22 18:14:33 +08:00  
				
					
						
							
							
								 
						
							
								6cf249ccfb 
								
							 
						 
						
							
							
								
								Change ckeditor gem and kaminari in gemfile  
							
							
							
						 
						
							2013-07-22 17:26:32 +08:00  
				
					
						
							
							
								 
						
							
								fe82427baa 
								
							 
						 
						
							
							
								
								Ray's changes for css and js  
							
							
							
						 
						
							2013-07-22 16:31:44 +08:00  
				
					
						
							
							
								 
						
							
								408bebaa4b 
								
							 
						 
						
							
							
								
								Ray's changes in structure  
							
							
							
						 
						
							2013-07-22 14:06:58 +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  
				
					
						
							
							
								 
						
							
								51640423a7 
								
							 
						 
						
							
							
								
								survey module initial  
							
							
							
						 
						
							2013-06-06 18:26:41 +08:00  
				
					
						
							
							
								 
						
							
								3e0b7d81ae 
								
							 
						 
						
							
							
								
								clean 403 404 500  
							
							
							
						 
						
							2013-05-27 16:46:49 +08:00  
				
					
						
							
							
								 
						
							
								7e9fce0c2d 
								
							 
						 
						
							
							
								
								clean Harry's code  
							
							
							
						 
						
							2013-04-17 14:31:10 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								38d5a193e0 
								
							 
						 
						
							
							
								
								tiny scrollbar trigger fixed and devin branch merged  
							
							
							
						 
						
							2013-04-17 14:31:09 +08:00  
				
					
						
							
							
								 
						
							
								989e5aa974 
								
							 
						 
						
							
							
								
								minor update  
							
							
							
						 
						
							2013-04-17 14:29:56 +08:00  
				
					
						
							
							
								 
						
							
								e3782c9cf7 
								
							 
						 
						
							
							
								
								minor update  
							
							
							
						 
						
							2013-04-17 14:29:04 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e2802d94d0 
								
							 
						 
						
							
							
								
								rake task added  
							
							
							
						 
						
							2013-04-17 14:28:13 +08:00  
				
					
						
							
							
								 
						
							
								055d758769 
								
							 
						 
						
							
							
								
								Page Loading Effect  
							
							... 
							
							
							
							tinyscrollbar has problem 
							
						 
						
							2013-04-17 14:27:18 +08:00  
				
					
						
							
							
								 
						
							
								a4ebe31ada 
								
							 
						 
						
							
							
								
								fix for widget edit  js missing  
							
							
							
						 
						
							2013-04-17 14:19:32 +08:00  
				
					
						
							
							
								 
						
							
								3de4591413 
								
							 
						 
						
							
							
								
								fix frontend ajax respond 404 due to javascript overwritten after assets precompile  
							
							
							
						 
						
							2013-04-17 14:19:32 +08:00