Harry Bomrah 
							
						 
						
							
								e69679d3fe 
								
							 
						 
						
							
							
								
								tinyscrollbar_bug fixed  
							
							
							
						 
						
							2013-03-04 12:37:29 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								2ead541733 
								
							 
						 
						
							
							
								
								url handling modified.. tinyscrollbar modified… star checkbox fixed..  
							
							
							
						 
						
							2013-03-04 12:37:29 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								23c8c28b52 
								
							 
						 
						
							
							
								
								tinyscrollbar fixed  
							
							
							
						 
						
							2013-03-04 12:37:29 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								0f12314213 
								
							 
						 
						
							
							
								
								some changes for gridster  
							
							
							
						 
						
							2013-03-04 12:37:29 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								b8ee748723 
								
							 
						 
						
							
							
								
								Lot of changes in gridster  
							
							
							
						 
						
							2013-03-04 12:37:29 +08:00  
				
					
						
							
							
								 
						
							
								ee4b94ace0 
								
							 
						 
						
							
							
								
								Merge branch 'desktop' of  https://github.com/Rulingcom/orbit  into desktop  
							
							... 
							
							
							
							* 'desktop' of https://github.com/Rulingcom/orbit :
  fix widget field reload
  link to more
  fix default widget link
  fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags
  fix widget field reload
  link to more
  fix default widget link
  fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags 
							
						 
						
							2013-03-04 12:17:14 +08:00  
				
					
						
							
							
								 
						
							
								8f1d7b55ab 
								
							 
						 
						
							
							
								
								authors auto-complete  
							
							
							
						 
						
							2013-03-04 12:16:46 +08:00  
				
					
						
							
							
								 
						
							
								e99fef9404 
								
							 
						 
						
							
							
								
								fixed paper title and journal title bug  
							
							
							
						 
						
							2013-03-04 11:45:39 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								c1cb5e5ffb 
								
							 
						 
						
							
							
								
								tinyscrollbar_bug fixed  
							
							
							
						 
						
							2013-03-01 17:49:58 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								9b8ab2a2c1 
								
							 
						 
						
							
							
								
								url handling modified.. tinyscrollbar modified… star checkbox fixed..  
							
							
							
						 
						
							2013-03-01 14:45:20 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								c82e9a646d 
								
							 
						 
						
							
							
								
								tinyscrollbar fixed  
							
							
							
						 
						
							2013-02-27 18:55:26 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								7ef02d3108 
								
							 
						 
						
							
							
								
								Merge branch 'desktop' into desktop_work  
							
							
							
						 
						
							2013-02-27 11:51:56 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								912080482b 
								
							 
						 
						
							
							
								
								some changes for gridster  
							
							
							
						 
						
							2013-02-27 11:47:41 +08:00  
				
					
						
							
							
								 
						
							
								ca946fc881 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:Rulingcom/orbit into development  
							
							... 
							
							
							
							Conflicts:
	lib/tasks/migrate.rake 
							
						 
						
							2013-02-27 11:03:52 +08:00  
				
					
						
							
							
								 
						
							
								0dabd5b95f 
								
							 
						 
						
							
							
								
								fix widget field reload  
							
							
							
						 
						
							2013-02-27 10:51:41 +08:00  
				
					
						
							
							
								 
						
							
								071e8a349c 
								
							 
						 
						
							
							
								
								link to more  
							
							
							
						 
						
							2013-02-27 10:50:50 +08:00  
				
					
						
							
							
								 
						
							
								8a8bfcb8fb 
								
							 
						 
						
							
							
								
								fix default widget link  
							
							
							
						 
						
							2013-02-27 10:50:47 +08:00  
				
					
						
							
							
								 
						
							
								d7699e1a46 
								
							 
						 
						
							
							
								
								fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init  
							
							
							
						 
						
							2013-02-27 10:49:51 +08:00  
				
					
						
							
							
								 
						
							
								0e6599e9b9 
								
							 
						 
						
							
							
								
								fix javascript disable checkbox failed after cate and tags being reloaded.  
							
							
							
						 
						
							2013-02-27 10:49:51 +08:00  
				
					
						
							
							
								 
						
							
								99e67c8719 
								
							 
						 
						
							
							
								
								first version of multi categories and tags  
							
							
							
						 
						
							2013-02-27 10:49:48 +08:00  
				
					
						
							
							
								 
						
							
								4bc3a57862 
								
							 
						 
						
							
							
								
								give back and cancel button a link for personal conference  
							
							
							
						 
						
							2013-02-26 18:37:58 +08:00  
				
					
						
							
							
								 
						
							
								f431ab9ab5 
								
							 
						 
						
							
							
								
								give back and cancel button a link for personal journal  
							
							
							
						 
						
							2013-02-26 18:37:33 +08:00  
				
					
						
							
							
								 
						
							
								fb931b0a4a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/desktop' into desktop  
							
							... 
							
							
							
							* origin/desktop:
  Remove Gemfile.lock
  sort conference and type
  add conferene list order function
  css minor changes.
  gridster, url code fixed, views removed.
  Fix selection of sub_menu for widget (the value wasn't set)
  Fix bug in widget selection
  css minor changes.
  Fix public_r_tag selection
  gridster, url code fixed, views removed. 
							
						 
						
							2013-02-26 17:02:01 +08:00  
				
					
						
							
							
								 
						
							
								6c9e2a7249 
								
							 
						 
						
							
							
								
								fixed journal co author bug  
							
							
							
						 
						
							2013-02-26 16:57:08 +08:00  
				
					
						
							
							
								 
						
							
								d0b54a4d6c 
								
							 
						 
						
							
							
								
								done conferece seeds  
							
							
							
						 
						
							2013-02-26 15:52:42 +08:00  
				
					
						
							
							
								 
						
							
								81725ed942 
								
							 
						 
						
							
							
								
								split db/seeds.rb file to local plugin and done journal  
							
							
							
						 
						
							2013-02-26 15:52:20 +08:00  
				
					
						
							
							
								 
						
							
								c55f64f3c6 
								
							 
						 
						
							
							
								
								correct view permission of conference  
							
							
							
						 
						
							2013-02-26 15:17:09 +08:00  
				
					
						
							
							
								 
						
							
								4ac0f19011 
								
							 
						 
						
							
							
								
								generate journal page by rails side and fixed model name bug  
							
							
							
						 
						
							2013-02-26 15:15:09 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e9c0f443b7 
								
							 
						 
						
							
							
								
								Lot of changes in gridster  
							
							
							
						 
						
							2013-02-26 11:47:39 +08:00  
				
					
						
							
							
								 
						
							
								5f832a17d4 
								
							 
						 
						
							
							
								
								fix widget field reload  
							
							
							
						 
						
							2013-02-25 12:49:06 +08:00  
				
					
						
							
							
								 
						
							
								dbf93ea9a8 
								
							 
						 
						
							
							
								
								Remove Gemfile.lock  
							
							
							
						 
						
							2013-02-25 12:06:23 +08:00  
				
					
						
							
							
								 
						
							
								fbf3f9fd2f 
								
							 
						 
						
							
							
								
								Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop  
							
							
							
						 
						
							2013-02-25 12:02:10 +08:00  
				
					
						
							
							
								 
						
							
								6f599bb95d 
								
							 
						 
						
							
							
								
								sort conference and type  
							
							
							
						 
						
							2013-02-25 12:01:59 +08:00  
				
					
						
							
							
								 
						
							
								522e0481e1 
								
							 
						 
						
							
							
								
								add conferene list order function  
							
							
							
						 
						
							2013-02-25 12:01:59 +08:00  
				
					
						
							
							
								 
						
							
								1f58ed5cda 
								
							 
						 
						
							
							
								
								Merge branch 'desktop_work' of github.com:Rulingcom/orbit into desktop_work  
							
							
							
						 
						
							2013-02-25 12:01:37 +08:00  
				
					
						
							
							
								 
						
							
								8b0ffe747c 
								
							 
						 
						
							
							
								
								sort conference and type  
							
							
							
						 
						
							2013-02-25 11:46:20 +08:00  
				
					
						
							
							
								 
						
							
								6929d30b5d 
								
							 
						 
						
							
							
								
								add conferene list order function  
							
							
							
						 
						
							2013-02-25 11:46:11 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								edd2c1f522 
								
							 
						 
						
							
							
								
								css minor changes.  
							
							
							
						 
						
							2013-02-25 11:08:57 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								9f362d9ae6 
								
							 
						 
						
							
							
								
								gridster, url code fixed, views removed.  
							
							
							
						 
						
							2013-02-25 11:08:56 +08:00  
				
					
						
							
							
								 
						
							
								3572856486 
								
							 
						 
						
							
							
								
								Fix selection of sub_menu for widget (the value wasn't set)  
							
							
							
						 
						
							2013-02-25 10:35:59 +08:00  
				
					
						
							
							
								 
						
							
								0be1c45c81 
								
							 
						 
						
							
							
								
								link to more  
							
							
							
						 
						
							2013-02-23 18:29:50 +08:00  
				
					
						
							
							
								 
						
							
								5b0b8e6c79 
								
							 
						 
						
							
							
								
								Fix bug in widget selection  
							
							
							
						 
						
							2013-02-23 17:25:07 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								a0b22761c7 
								
							 
						 
						
							
							
								
								css minor changes.  
							
							
							
						 
						
							2013-02-23 17:12:02 +08:00  
				
					
						
							
							
								 
						
							
								caac9191ce 
								
							 
						 
						
							
							
								
								Fix public_r_tag selection  
							
							
							
						 
						
							2013-02-23 16:52:37 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								5f9dd984b1 
								
							 
						 
						
							
							
								
								gridster, url code fixed, views removed.  
							
							
							
						 
						
							2013-02-23 15:23:24 +08:00  
				
					
						
							
							
								 
						
							
								73bca03b33 
								
							 
						 
						
							
							
								
								fix default widget link  
							
							
							
						 
						
							2013-02-23 15:19:51 +08:00  
				
					
						
							
							
								 
						
							
								8592015b1b 
								
							 
						 
						
							
							
								
								fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init  
							
							
							
						 
						
							2013-02-23 15:19:04 +08:00  
				
					
						
							
							
								 
						
							
								ad9b91f792 
								
							 
						 
						
							
							
								
								Fix url with id in default widget  
							
							
							
						 
						
							2013-02-23 12:20:45 +08:00  
				
					
						
							
							
								 
						
							
								d6dd38744b 
								
							 
						 
						
							
							
								
								fix javascript disable checkbox failed after cate and tags being reloaded.  
							
							
							
						 
						
							2013-02-23 11:34:47 +08:00  
				
					
						
							
							
								 
						
							
								cd98f9c889 
								
							 
						 
						
							
							
								
								member plugin init add frontend  
							
							
							
						 
						
							2013-02-22 18:21:11 +08:00