061225f56c 
								
							 
						 
						
							
							
								
								Override mongoid-tree callback condition for default position  
							
							
							
						 
						
							2013-10-07 18:23:54 +08:00  
				
					
						
							
							
								 
						
							
								f81894af90 
								
							 
						 
						
							
							
								
								User ordering  
							
							... 
							
							
							
							Run the task new_ui:save_users 
							
						 
						
							2013-09-26 19:00:13 +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 
							
						 
						
							
								f920a4f6ba 
								
							 
						 
						
							
							
								
								filemanager and some update for file uploader . added file uploader to kernel  
							
							
							
						 
						
							2013-09-11 14:03:06 +08:00  
				
					
						
							
							
								 
						
							
								06203d27b9 
								
							 
						 
						
							
							
								
								Fix for user and role relationship  
							
							
							
						 
						
							2013-09-11 14:00:41 +08:00  
				
					
						
							
							
								 
						
							
								3123c5de0a 
								
							 
						 
						
							
							
								
								new ui member bug and interface fix  
							
							
							
						 
						
							2013-09-02 11:22:17 +08:00  
				
					
						
							
							
								 
						
							
								c474fa063f 
								
							 
						 
						
							
							
								
								New authorization  
							
							
							
						 
						
							2013-08-21 13:42:29 +08:00  
				
					
						
							
							
								 
						
							
								6c514770bc 
								
							 
						 
						
							
							
								
								solved conflict for member_new_ui  
							
							
							
						 
						
							2013-08-12 15:40:34 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								5f9190db39 
								
							 
						 
						
							
							
								
								few updates with fb integration and some other changes in user and supports data to android  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb 
							
						 
						
							2013-07-30 16:43:11 +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  
				
					
						
							
							
								 
						
							
								2806dd35a9 
								
							 
						 
						
							
							
								
								spen's fix for user  
							
							
							
						 
						
							2013-05-23 14:03:18 +08:00  
				
					
						
							
							
								 
						
							
								37aa950028 
								
							 
						 
						
							
							
								
								user action  
							
							
							
						 
						
							2013-05-23 11:55:57 +08:00  
				
					
						
							
							
								 
						
							
								5b368235e8 
								
							 
						 
						
							
							
								
								ntu dropdown fix list sort  
							
							
							
						 
						
							2013-05-14 14:19:55 +08:00  
				
					
						
							
							
								 
						
							
								b8da40b4ae 
								
							 
						 
						
							
							
								
								ntu_dropdown_fix  
							
							
							
						 
						
							2013-05-14 14:19:55 +08:00  
				
					
						
							
							
								 
						
							
								697944a029 
								
							 
						 
						
							
							
								
								user id set & user fields set & role set & member frontend list & user translation & create new member bug fix  
							
							
							
						 
						
							2013-04-25 19:59:59 +08:00  
				
					
						
							
							
								 
						
							
								504f5027cc 
								
							 
						 
						
							
							
								
								member role edit  
							
							
							
						 
						
							2013-01-14 19:00:08 +08:00  
				
					
						
							
							
								 
						
							
								758cab5ecd 
								
							 
						 
						
							
							
								
								move journal code to persional_journal modulaar  
							
							
							
						 
						
							2013-01-14 17:53:59 +08:00  
				
					
						
							
							
								 
						
							
								84e4a558be 
								
							 
						 
						
							
							
								
								member roles edit  
							
							
							
						 
						
							2013-01-14 17:02:51 +08:00  
				
					
						
							
							
								 
						
							
								35e0011111 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/publication' into desktop  
							
							... 
							
							
							
							* remotes/origin/publication:
  new desktop framework updates 
							
						 
						
							2013-01-07 12:44:30 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								37f8c1637a 
								
							 
						 
						
							
							
								
								new desktop framework updates  
							
							
							
						 
						
							2012-12-27 18:25:54 +08:00  
				
					
						
							
							
								 
						
							
								b4633a2ccb 
								
							 
						 
						
							
							
								
								.not_guest_user  
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
				
					
						
							
							
								 
						
							
								3d39c2c3c3 
								
							 
						 
						
							
							
								
								hidden guest user  
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
				
					
						
							
							
								 
						
							
								ec1fad9729 
								
							 
						 
						
							
							
								
								fixed empty name of member list  
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
				
					
						
							
							
								 
						
							
								7d3c535e01 
								
							 
						 
						
							
							
								
								add info field  
							
							
							
						 
						
							2012-12-06 07:58:39 +08:00  
				
					
						
							
							
								 
						
							
								58e71c29b3 
								
							 
						 
						
							
							
								
								uniq relation  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								 
						
							
								9759a32394 
								
							 
						 
						
							
							
								
								can display relation between author  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								 
						
							
								e143f9a345 
								
							 
						 
						
							
							
								
								can select relection from relation db  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								 
						
							
								7822ffc33d 
								
							 
						 
						
							
							
								
								can add relation between co-author  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								eb97d417bd 
								
							 
						 
						
							
							
								
								if coauthor not in coauthor db then it will be add in db  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								dc3be3c9a1 
								
							 
						 
						
							
							
								
								Translation changes  
							
							
							
						 
						
							2012-12-03 23:00:04 +08:00  
				
					
						
							
							
								 
						
							
								9254b9960d 
								
							 
						 
						
							
							
								
								Add timeout to user  
							
							
							
						 
						
							2012-12-03 21:45:00 +08:00  
				
					
						
							
							
								 
						
							
								77386f0284 
								
							 
						 
						
							
							
								
								disable data transform when switching attribute field type. new member stable  
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
				
					
						
							
							
								 
						
							
								d502f561ef 
								
							 
						 
						
							
							
								
								add co-author db and curd page, but it can't destory it...  
							
							
							
						 
						
							2012-11-21 18:36:32 +08:00  
				
					
						
							
							
								 
						
							
								97ffb5ff18 
								
							 
						 
						
							
							
								
								file view update  
							
							
							
						 
						
							2012-11-21 07:37:42 +08:00  
				
					
						
							
							
								 
						
							
								d61621e198 
								
							 
						 
						
							
							
								
								Remove some pry and add address code  
							
							
							
						 
						
							2012-11-20 10:05:38 +08:00  
				
					
						
							
							
								 
						
							
								2aa9a19deb 
								
							 
						 
						
							
							
								
								complete address field. still have javascript issue for fill back and display address ext fields in modal.  
							
							
							
						 
						
							2012-11-20 09:53:37 +08:00  
				
					
						
							
							
								 
						
							
								17988f2fb2 
								
							 
						 
						
							
							
								
								address field and text field convert  
							
							
							
						 
						
							2012-11-20 09:53:37 +08:00  
				
					
						
							
							
								 
						
							
								a85e5fcc0d 
								
							 
						 
						
							
							
								
								address field. js and style is broken  
							
							
							
						 
						
							2012-11-20 09:53:36 +08:00  
				
					
						
							
							
								 
						
							
								be448d42c9 
								
							 
						 
						
							
							
								
								add_more ok  
							
							
							
						 
						
							2012-11-20 09:52:50 +08:00  
				
					
						
							
							
								 
						
							
								b40d4702d5 
								
							 
						 
						
							
							
								
								Merge branch 'master' into various_bugs  
							
							... 
							
							
							
							Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb 
							
						 
						
							2012-11-06 11:44:00 +08:00  
				
					
						
							
							
								 
						
							
								da5e7f670e 
								
							 
						 
						
							
							
								
								Desktop Widgtes updates..  
							
							
							
						 
						
							2012-11-06 10:36:34 +08:00  
				
					
						
							
							
								 
						
							
								58d4554b0b 
								
							 
						 
						
							
							
								
								Fixing bugs  
							
							
							
						 
						
							2012-11-05 11:30:15 +08:00  
				
					
						
							
							
								 
						
							
								beb843f75b 
								
							 
						 
						
							
							
								
								add new member with role interface. add more not usable.  
							
							... 
							
							
							
							role management new attribute is ok. delete is ok. 
							
						 
						
							2012-11-04 20:42:58 +08:00  
				
					
						
							
							
								 
						
							
								9b5f4e4775 
								
							 
						 
						
							
							
								
								Fix bug: User cannot connect using the orbit button (Devise configuration)  
							
							
							
						 
						
							2012-10-26 17:42:14 +08:00  
				
					
						
							
							
								 
						
							
								bd0d975014 
								
							 
						 
						
							
							
								
								for user new interface, member  role is working.  
							
							
							
						 
						
							2012-10-26 11:27:37 +08:00  
				
					
						
							
							
								 
						
							
								0a1a9d2c2e 
								
							 
						 
						
							
							
								
								member for THU  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								03b608593d 
								
							 
						 
						
							
							
								
								can add member  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								8b9cffd4f2 
								
							 
						 
						
							
							
								
								new code for attribute fields and values for new member interface  
							
							
							
						 
						
							2012-10-26 11:19:55 +08:00  
				
					
						
							
							
								 
						
							
								9f825de288 
								
							 
						 
						
							
							
								
								user new interface 70%  
							
							
							
						 
						
							2012-10-09 06:40:18 +08:00  
				
					
						
							
							
								 
						
							
								1aacf5e2ce 
								
							 
						 
						
							
							
								
								user status method.   Now the sub_role shall be sat with it's status in order to record sub_role status into user object.  
							
							... 
							
							
							
							Sub_role can be removed normally and the method check_status_record  will make sure data is being saved as it should be.
Also unnecessary role will be removed if no sub role exists. 
							
						 
						
							2012-10-09 06:40:18 +08:00