Harry Bomrah 
							
						 
						
							
								9a03e7a6b2 
								
							 
						 
						
							
							
								
								added sync for journal paper books and conference.. and also disabled the icons  
							
							
							
						 
						
							2013-09-26 22:29:21 +08:00  
				
					
						
							
							
								 
						
							
								096aec3406 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/Rulingcom/orbit  into 0917_ntu_mb  
							
							... 
							
							
							
							Bring Development Related Changes to ntu_mb 
							
						 
						
							2013-09-26 20:31:46 +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  
				
					
						
							
							
								 
						
							
								1159375de7 
								
							 
						 
						
							
							
								
								Updated Import to Sync Data for all personal plugins  
							
							
							
						 
						
							2013-09-26 18:51:31 +08:00  
				
					
						
							
							
								 
						
							
								cd8448d447 
								
							 
						 
						
							
							
								
								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
Updated Import method in teachers to make all false positives.
Updated Data import and sync code
Updated Books,Conference, Journal to display properly in the frontend
Journal title being imported correctly now
Fixed Import data to import journal level types, fixed writing journal 
							
						 
						
							2013-09-26 14:45:43 +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  
				
					
						
							
							
								 
						
							
								b487740035 
								
							 
						 
						
							
							
								
								Fixed Pagination Errors in member module  
							
							
							
						 
						
							2013-09-18 16:11:17 +08:00  
				
					
						
							
							
								 
						
							
								7216676c40 
								
							 
						 
						
							
							
								
								Updated Sidebar and Preferences  
							
							
							
						 
						
							2013-09-09 10:18:14 +08:00  
				
					
						
							
							
								 
						
							
								4078d426a6 
								
							 
						 
						
							
							
								
								new ui personal front_end page(member app) & users_new_interface show sub_roles fix  
							
							
							
						 
						
							2013-08-21 14:13:36 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								bbb765c88d 
								
							 
						 
						
							
							
								
								small fix for file link inside edit form for desktop  
							
							
							
						 
						
							2013-08-16 15:49:12 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								6577885761 
								
							 
						 
						
							
							
								
								docx xlsx and pptx file types fixed plus icon provided in edit form for files  
							
							
							
						 
						
							2013-08-16 15:49:04 +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  
				
					
						
							
							
								 
						
							
								6c514770bc 
								
							 
						 
						
							
							
								
								solved conflict for member_new_ui  
							
							
							
						 
						
							2013-08-12 15:40:34 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								9c7558847a 
								
							 
						 
						
							
							
								
								bilingual fixed for all the plugins in desktop  
							
							
							
						 
						
							2013-08-12 12:28:58 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e3d9966f76 
								
							 
						 
						
							
							
								
								bugs fixed for plugins. .. and also css fixed  
							
							
							
						 
						
							2013-08-06 17:53:04 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								7d288b4160 
								
							 
						 
						
							
							
								
								some changes in file selection  
							
							
							
						 
						
							2013-08-06 17:52:50 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								c2f223b82c 
								
							 
						 
						
							
							
								
								new plugins added for desktop  
							
							
							
						 
						
							2013-08-06 17:52:39 +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  
				
					
						
							
							
								 
						
							
								a7bc19768e 
								
							 
						 
						
							
							
								
								member list edit  
							
							
							
						 
						
							2013-02-20 11:12:08 +08:00  
				
					
						
							
							
								 
						
							
								8bf7d0f6f3 
								
							 
						 
						
							
							
								
								member plugin edit  
							
							
							
						 
						
							2013-01-28 16:19:36 +08:00  
				
					
						
							
							
								 
						
							
								de39bce4ce 
								
							 
						 
						
							
							
								
								Fix the tooltips  
							
							
							
						 
						
							2013-01-11 12:13:16 +08:00  
				
					
						
							
							
								 
						
							
								dc3be3c9a1 
								
							 
						 
						
							
							
								
								Translation changes  
							
							
							
						 
						
							2012-12-03 23:00:04 +08:00  
				
					
						
							
							
								 
						
							
								390da0e49a 
								
							 
						 
						
							
							
								
								Change icons  
							
							
							
						 
						
							2012-11-29 00:49:53 +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  
				
					
						
							
							
								 
						
							
								bd17641d18 
								
							 
						 
						
							
							
								
								member plugin list add new  
							
							
							
						 
						
							2012-11-04 20:24:36 +08:00  
				
					
						
							
							
								 
						
							
								63a57682e6 
								
							 
						 
						
							
							
								
								Fix bugs:  
							
							... 
							
							
							
							TinyMCE: the size of the textarea change depending on the language
	Page content edit: no tab selected on first load 
							
						 
						
							2012-10-30 17:09:00 +08:00  
				
					
						
							
							
								 
						
							
								cbfa659928 
								
							 
						 
						
							
							
								
								Changes for side_bar  
							
							
							
						 
						
							2012-10-26 11:19:56 +08:00  
				
					
						
							
							
								 
						
							
								a4c94c4404 
								
							 
						 
						
							
							
								
								demo site plugin  
							
							
							
						 
						
							2012-10-08 16:20:21 +08:00  
				
					
						
							
							
								 
						
							
								975523c8b2 
								
							 
						 
						
							
							
								
								demo site plugin  
							
							
							
						 
						
							2012-09-24 14:10:44 +08:00  
				
					
						
							
							
								 
						
							
								9eed9ec7b6 
								
							 
						 
						
							
							
								
								demo site plugin  
							
							
							
						 
						
							2012-09-17 13:32:52 +08:00  
				
					
						
							
							
								 
						
							
								42d50ae534 
								
							 
						 
						
							
							
								
								Plugins  
							
							
							
						 
						
							2012-09-14 00:05:31 +08:00