31b55a0635 
								
							 
						 
						
							
							
								
								Revert "Updated Orbit js to latest version"  
							
							... 
							
							
							
							This reverts commit b18e61a6c0 
							
						 
						
							2013-10-02 12:32:45 +08:00  
				
					
						
							
							
								 
						
							
								433c8d5da6 
								
							 
						 
						
							
							
								
								Fix link in category for authorization, fix update of auth users  
							
							
							
						 
						
							2013-10-02 12:18:20 +08:00  
				
					
						
							
							
								 
						
							
								b18e61a6c0 
								
							 
						 
						
							
							
								
								Updated Orbit js to latest version  
							
							
							
						 
						
							2013-10-02 12:09:44 +08:00  
				
					
						
							
							
								 
						
							
								4fe2e31f0e 
								
							 
						 
						
							
							
								
								Updated Global css to fix the line height  
							
							
							
						 
						
							2013-10-01 17:51:07 +08:00  
				
					
						
							
							
								 
						
							
								31e4fb9f39 
								
							 
						 
						
							
							
								
								Updated sidebar line height  
							
							
							
						 
						
							2013-10-01 17:47:58 +08:00  
				
					
						
							
							
								 
						
							
								9bdb633157 
								
							 
						 
						
							
							
								
								Updated with UI Changes  
							
							
							
						 
						
							2013-10-01 17:39:21 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								caca264b50 
								
							 
						 
						
							
							
								
								isotope fixed for all plugins for list and form.  
							
							
							
						 
						
							2013-10-01 15:06:49 +08:00  
				
					
						
							
							
								 
						
							
								9a0e9ddc82 
								
							 
						 
						
							
							
								
								Revert "Updated Bulletins controller with announcement approval fix"  
							
							... 
							
							
							
							This reverts commit a9431ad17e 
							
						 
						
							2013-10-01 15:03:34 +08:00  
				
					
						
							
							
								 
						
							
								9f490c87d2 
								
							 
						 
						
							
							
								
								Fixed issue with member plugin delete label  
							
							
							
						 
						
							2013-10-01 10:43:37 +08:00  
				
					
						
							
							
								 
						
							
								a9431ad17e 
								
							 
						 
						
							
							
								
								Updated Bulletins controller with announcement approval fix  
							
							
							
						 
						
							2013-10-01 10:03:18 +08:00  
				
					
						
							
							
								 
						
							
								d9ac24470f 
								
							 
						 
						
							
							
								
								Updated Member plugin names to remove spaces and generate correct links  
							
							
							
						 
						
							2013-09-30 18:25:18 +08:00  
				
					
						
							
							
								
									
								
								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 
							
						 
						
							
								74ca99a581 
								
							 
						 
						
							
							
								
								delete and sequencing fixed for survey questions  
							
							
							
						 
						
							2013-09-30 16:49:27 +08:00  
				
					
						
							
							
								 
						
							
								dfec6f7642 
								
							 
						 
						
							
							
								
								Fix for user order  
							
							
							
						 
						
							2013-09-27 12:46:19 +08:00  
				
					
						
							
							
								 
						
							
								9186978551 
								
							 
						 
						
							
							
								
								new ui member plugin sort fix and user show avatar fix  
							
							
							
						 
						
							2013-09-27 11:04:52 +08:00  
				
					
						
							
							
								 
						
							
								622534e5db 
								
							 
						 
						
							
							
								
								Fix user order:  
							
							... 
							
							
							
							- gender color
 - add cancel button for input 
							
						 
						
							2013-09-26 20:18:34 +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  
				
					
						
							
							
								 
						
							
								028c689739 
								
							 
						 
						
							
							
								
								Change User.all to User.not_guest_user  
							
							
							
						 
						
							2013-09-26 19:46:14 +08:00  
				
					
						
							
							
								 
						
							
								f81894af90 
								
							 
						 
						
							
							
								
								User ordering  
							
							... 
							
							
							
							Run the task new_ui:save_users 
							
						 
						
							2013-09-26 19:00:13 +08:00  
				
					
						
							
							
								 
						
							
								dc3593c162 
								
							 
						 
						
							
							
								
								zh-tw for new ui  
							
							
							
						 
						
							2013-09-26 17:13:17 +08:00  
				
					
						
							
							
								 
						
							
								16c26e3273 
								
							 
						 
						
							
							
								
								Fix path of jquery.cycle.all.latest.js  
							
							
							
						 
						
							2013-09-26 16:11:08 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								5332162646 
								
							 
						 
						
							
							
								
								small add question fix for survey module.  
							
							
							
						 
						
							2013-09-26 09:31:52 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								1d0ea6718f 
								
							 
						 
						
							
							
								
								brief added to desktop for all plugins  
							
							
							
						 
						
							2013-09-25 18:23:44 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								04ff345b94 
								
							 
						 
						
							
							
								
								survey edit completed  
							
							
							
						 
						
							2013-09-25 17:29:38 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								58fb2d1c73 
								
							 
						 
						
							
							
								
								external links and link widget fixed for development  
							
							
							
						 
						
							2013-09-24 15:37:40 +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  
				
					
						
							
							
								 
						
							
								b487740035 
								
							 
						 
						
							
							
								
								Fixed Pagination Errors in member module  
							
							
							
						 
						
							2013-09-18 16:11:17 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								1e3cffee0a 
								
							 
						 
						
							
							
								
								add page completed with attributes and reordering  
							
							
							
						 
						
							2013-09-17 15:34:34 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e4a16eab3a 
								
							 
						 
						
							
							
								
								commit for survey questions  
							
							
							
						 
						
							2013-09-17 15:34:23 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e45b7e09a0 
								
							 
						 
						
							
							
								
								half survey module form changed to new ui plus one calendar fix  
							
							
							
						 
						
							2013-09-16 12:25:58 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								bd3462df7f 
								
							 
						 
						
							
							
								
								small change left in last commit. commiting for gallery widget  
							
							
							
						 
						
							2013-09-16 11:19:24 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								f5f1822f0a 
								
							 
						 
						
							
							
								
								no data file added  
							
							
							
						 
						
							2013-09-16 11:19:18 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								d532ded8e4 
								
							 
						 
						
							
							
								
								widget code for gallery rewritten for new_ui  
							
							
							
						 
						
							2013-09-16 11:19:11 +08:00  
				
					
						
							
							
								 
						
							
								8456a91968 
								
							 
						 
						
							
							
								
								Fix structure edit  
							
							
							
						 
						
							2013-09-14 17:26:16 +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  
				
					
						
							
							
								 
						
							
								c1cbfddf4b 
								
							 
						 
						
							
							
								
								Fix for user and role relationship (from role and sub-role side)  
							
							
							
						 
						
							2013-09-13 17:39:01 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								3595c59810 
								
							 
						 
						
							
							
								
								some unmerged code i pushd 3 months back not update by chris  
							
							
							
						 
						
							2013-09-13 15:58:42 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								789e02e313 
								
							 
						 
						
							
							
								
								ad_banner banner load fixed for test site  
							
							
							
						 
						
							2013-09-13 14:23:44 +08:00  
				
					
						
							
							
								 
						
							
								bb8bc9a529 
								
							 
						 
						
							
							
								
								Added missing translation for gallery  
							
							
							
						 
						
							2013-09-12 10:10:37 +08:00  
				
					
						
							
							
								 
						
							
								6430e60577 
								
							 
						 
						
							
							
								
								Added the missing translations in config/locales/en.yml and zh_tw.yml  
							
							... 
							
							
							
							Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml 
							
						 
						
							2013-09-12 09:30:07 +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 
							
						 
						
							
								9e10a3c944 
								
							 
						 
						
							
							
								
								editing for the assets are done with replacable files and description  
							
							
							
						 
						
							2013-09-11 14:03:13 +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  
				
					
						
							
							
								 
						
							
								06203d27b9 
								
							 
						 
						
							
							
								
								Fix for user and role relationship  
							
							
							
						 
						
							2013-09-11 14:00:41 +08:00