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  
				
					
						
							
							
								 
						
							
								c8aa50ee87 
								
							 
						 
						
							
							
								
								Lots of Update  
							
							... 
							
							
							
							1. CSS to SCSS
2. Journal Paper update
Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb 
							
						 
						
							2013-04-17 14:14:23 +08:00  
				
					
						
							
							
								 
						
							
								b864cc0268 
								
							 
						 
						
							
							
								
								Changes in I18n (except personal_conference and personal_journal)  
							
							
							
						 
						
							2013-03-12 18:13:48 +08:00  
				
					
						
							
							
								 
						
							
								d7d480ac12 
								
							 
						 
						
							
							
								
								archive edit & plugins edit  
							
							
							
						 
						
							2013-03-07 21:12:31 +08:00  
				
					
						
							
							
								 
						
							
								a6ca308a5e 
								
							 
						 
						
							
							
								
								using refine tiny scroll bar js for personal plugin  
							
							
							
						 
						
							2013-03-04 16:35:09 +08:00  
				
					
						
							
							
								 
						
							
								8f1d7b55ab 
								
							 
						 
						
							
							
								
								authors auto-complete  
							
							
							
						 
						
							2013-03-04 12:16:46 +08:00  
				
					
						
							
							
								 
						
							
								4ee85a8c09 
								
							 
						 
						
							
							
								
								add coauthor and coauthor relation function  
							
							
							
						 
						
							2013-02-21 13:58:47 +08:00  
				
					
						
							
							
								 
						
							
								13c757e8a9 
								
							 
						 
						
							
							
								
								clean add/edit page and add conference list page  
							
							
							
						 
						
							2013-02-21 13:58:30 +08:00  
				
					
						
							
							
								 
						
							
								16fda25ace 
								
							 
						 
						
							
							
								
								done personal conference add/edit page  
							
							
							
						 
						
							2013-02-21 13:53:50 +08:00  
				
					
						
							
							
								 
						
							
								54b12a193a 
								
							 
						 
						
							
							
								
								add translation configuration  
							
							
							
						 
						
							2013-02-21 13:53:47 +08:00  
				
					
						
							
							
								 
						
							
								158fd8ffff 
								
							 
						 
						
							
							
								
								fixed conference icon and rename _p to _window of conference view  
							
							
							
						 
						
							2013-02-21 13:51:42 +08:00  
				
					
						
							
							
								 
						
							
								0a115906f1 
								
							 
						 
						
							
							
								
								fix i18n,reload problems  
							
							
							
						 
						
							2013-02-19 14:21:54 +08:00  
				
					
						
							
							
								 
						
							
								8f334f6948 
								
							 
						 
						
							
							
								
								modularize conference  
							
							
							
						 
						
							2013-02-04 18:01:42 +08:00  
				
					
						
							
							
								 
						
							
								d4df7c82d3 
								
							 
						 
						
							
							
								
								relpace seminar to conference  
							
							
							
						 
						
							2013-02-04 18:01:38 +08:00