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  
				
					
						
							
							
								 
						
							
								b487740035 
								
							 
						 
						
							
							
								
								Fixed Pagination Errors in member module  
							
							
							
						 
						
							2013-09-18 16:11:17 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								82b6be483a 
								
							 
						 
						
							
							
								
								isotope embedded inside desktop kernel  
							
							
							
						 
						
							2013-08-30 10:58:08 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								ff64fb5230 
								
							 
						 
						
							
							
								
								file title translations fixed  
							
							
							
						 
						
							2013-08-30 10:57:54 +08:00  
				
					
						
							
							
								 
						
							
								b970ea1e0e 
								
							 
						 
						
							
							
								
								Updated Authorization for member, link, tag, archive  
							
							
							
						 
						
							2013-08-27 10:14:39 +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 
							
						 
						
							
								88ad59f55a 
								
							 
						 
						
							
							
								
								title and css fix for file view  
							
							
							
						 
						
							2013-08-19 09:42:50 +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 
							
						 
						
							
								d0ef862f85 
								
							 
						 
						
							
							
								
								language changes and conferences add/edit bug fixed  
							
							
							
						 
						
							2013-08-12 12:28:46 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e3d9966f76 
								
							 
						 
						
							
							
								
								bugs fixed for plugins. .. and also css fixed  
							
							
							
						 
						
							2013-08-06 17:53:04 +08:00  
				
					
						
							
							
								 
						
							
								874819266d 
								
							 
						 
						
							
							
								
								minor update  
							
							
							
						 
						
							2013-07-30 16:42:23 +08:00  
				
					
						
							
							
								 
						
							
								ad68f63a7a 
								
							 
						 
						
							
							
								
								style for checkbox, radio button  
							
							
							
						 
						
							2013-07-30 16:41:58 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								20521dc8b0 
								
							 
						 
						
							
							
								
								removing duplicate code from js file  
							
							
							
						 
						
							2013-07-30 16:41:54 +08:00  
				
					
						
							
							
								 
						
							
								a458a50e97 
								
							 
						 
						
							
							
								
								publication's view update  
							
							
							
						 
						
							2013-07-30 16:41:48 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								ae8033ea1b 
								
							 
						 
						
							
							
								
								duplicate error fixed and css inside widgets fixed, duplicate location fixed  
							
							
							
						 
						
							2013-07-30 16:41:44 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								78d6e33865 
								
							 
						 
						
							
							
								
								devin branch merge plus minor fixes  
							
							
							
						 
						
							2013-07-30 16:41:32 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								b70310c6fe 
								
							 
						 
						
							
							
								
								tiny scrollbar update  
							
							
							
						 
						
							2013-07-30 16:41:25 +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  
				
					
						
							
							
								 
						
							
								127ab3845c 
								
							 
						 
						
							
							
								
								Changes for queries  
							
							
							
						 
						
							2013-05-03 12:12:19 +08:00  
				
					
						
							
							
								 
						
							
								167a71272a 
								
							 
						 
						
							
							
								
								queries need to be rethink  
							
							
							
						 
						
							2013-05-03 12:12:19 +08:00  
				
					
						
							
							
								 
						
							
								64101109dd 
								
							 
						 
						
							
							
								
								disable all sorted_tags  
							
							
							
						 
						
							2013-04-26 18:07:59 +08:00  
				
					
						
							
							
								 
						
							
								d047a3d62a 
								
							 
						 
						
							
							
								
								chris tags update  
							
							
							
						 
						
							2013-04-26 11:26:10 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								38d5a193e0 
								
							 
						 
						
							
							
								
								tiny scrollbar trigger fixed and devin branch merged  
							
							
							
						 
						
							2013-04-17 14:31:09 +08:00  
				
					
						
							
							
								 
						
							
								055d758769 
								
							 
						 
						
							
							
								
								Page Loading Effect  
							
							... 
							
							
							
							tinyscrollbar has problem 
							
						 
						
							2013-04-17 14:27:18 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								d288972035 
								
							 
						 
						
							
							
								
								stupid commit  
							
							
							
						 
						
							2013-04-17 14:19:32 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								bc0477a5ed 
								
							 
						 
						
							
							
								
								widget and gridster fixes  
							
							
							
						 
						
							2013-04-17 14:16:24 +08:00  
				
					
						
							
							
								 
						
							
								e7bffe4c0f 
								
							 
						 
						
							
							
								
								devin's new branch  
							
							
							
						 
						
							2013-04-17 14:14:24 +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  
				
					
						
							
							
								 
						
							
								44fede2b71 
								
							 
						 
						
							
							
								
								fixed co author relation save button  
							
							
							
						 
						
							2013-04-17 14:01:48 +08:00  
				
					
						
							
							
								 
						
							
								27ad25ccca 
								
							 
						 
						
							
							
								
								add pagination for every controller and view in personal plugin  
							
							
							
						 
						
							2013-04-17 14:00:37 +08:00  
				
					
						
							
							
								 
						
							
								df220397b2 
								
							 
						 
						
							
							
								
								make index of list can be hightline list when click cancel button  
							
							
							
						 
						
							2013-04-17 12:22:04 +08:00  
				
					
						
							
							
								 
						
							
								aad4119892 
								
							 
						 
						
							
							
								
								fixed bug  
							
							
							
						 
						
							2013-04-17 12:07:11 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								6db9e70132 
								
							 
						 
						
							
							
								
								Major tinyscrollbar update  
							
							
							
						 
						
							2013-04-17 12:04:22 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								52789fa032 
								
							 
						 
						
							
							
								
								all none fixed  
							
							
							
						 
						
							2013-04-17 11:23:02 +08:00  
				
					
						
							
							
								 
						
							
								dc68f40cb4 
								
							 
						 
						
							
							
								
								correct model method  
							
							
							
						 
						
							2013-04-17 11:13:32 +08:00  
				
					
						
							
							
								 
						
							
								228dd1b767 
								
							 
						 
						
							
							
								
								fixed co author relation save button  
							
							
							
						 
						
							2013-04-17 11:13:32 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								dae3f069ff 
								
							 
						 
						
							
							
								
								app manager changed plus some changes  
							
							
							
						 
						
							2013-04-17 11:09:56 +08:00  
				
					
						
							
							
								 
						
							
								5f2c669568 
								
							 
						 
						
							
							
								
								fixed checkout and start in personal plugin  
							
							
							
						 
						
							2013-04-17 11:08:58 +08:00  
				
					
						
							
							
								 
						
							
								50449b55e8 
								
							 
						 
						
							
							
								
								one abstract one column for personal plugin  
							
							
							
						 
						
							2013-04-17 11:07:20 +08:00  
				
					
						
							
							
								 
						
							
								00db66b8c4 
								
							 
						 
						
							
							
								
								add pagination for every controller and view in personal plugin  
							
							
							
						 
						
							2013-04-17 11:07:20 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								401c75c0de 
								
							 
						 
						
							
							
								
								Major tinyscrollbar update  
							
							
							
						 
						
							2013-04-17 11:06:28 +08:00  
				
					
						
							
							
								 
						
							
								1ebae504dc 
								
							 
						 
						
							
							
								
								modify translation for journal_co_author_relation button  
							
							
							
						 
						
							2013-04-17 11:05:57 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								323fadc210 
								
							 
						 
						
							
							
								
								tinyscrollbar pagination fixed  
							
							
							
						 
						
							2013-04-17 11:05:57 +08:00