Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								b5abbc9ef0 
								
							 
						 
						
							
							
								
								highlighting fixed…  
							
							 
							
							
							
						 
						
							2013-03-04 17:57:32 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								874648eacf 
								
							 
						 
						
							
							
								
								add Devin's css file for gallery  
							
							 
							
							
							
						 
						
							2013-03-04 17:27:36 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								a6ca308a5e 
								
							 
						 
						
							
							
								
								using refine tiny scroll bar js for personal plugin  
							
							 
							
							
							
						 
						
							2013-03-04 16:35:09 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								8ade2c5949 
								
							 
						 
						
							
							
								
								fixed adding.  
							
							 
							
							
							
						 
						
							2013-03-04 16:31:37 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								0c659e5a9b 
								
							 
						 
						
							
							
								
								layout fix  
							
							 
							
							
							
						 
						
							2013-03-04 16:31:37 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								6ae4e4d0ef 
								
							 
						 
						
							
							
								
								layout fix  
							
							 
							
							
							
						 
						
							2013-03-04 15:48:24 +08:00  
						
					 
				
					
						
							
							
								
									
								
								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  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								8f1d7b55ab 
								
							 
						 
						
							
							
								
								authors auto-complete  
							
							 
							
							
							
						 
						
							2013-03-04 12:16:46 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								e99fef9404 
								
							 
						 
						
							
							
								
								fixed paper title and journal title bug  
							
							 
							
							
							
						 
						
							2013-03-04 11:45:39 +08:00  
						
					 
				
					
						
							
							
								 
								Fu Matthew
							
						 
						
							 
							
							
							
							
								
							
							
								071e8a349c 
								
							 
						 
						
							
							
								
								link to more  
							
							 
							
							
							
						 
						
							2013-02-27 10:50:50 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								4bc3a57862 
								
							 
						 
						
							
							
								
								give back and cancel button a link for personal conference  
							
							 
							
							
							
						 
						
							2013-02-26 18:37:58 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								f431ab9ab5 
								
							 
						 
						
							
							
								
								give back and cancel button a link for personal journal  
							
							 
							
							
							
						 
						
							2013-02-26 18:37:33 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								6c9e2a7249 
								
							 
						 
						
							
							
								
								fixed journal co author bug  
							
							 
							
							
							
						 
						
							2013-02-26 16:57:08 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								d0b54a4d6c 
								
							 
						 
						
							
							
								
								done conferece seeds  
							
							 
							
							
							
						 
						
							2013-02-26 15:52:42 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								81725ed942 
								
							 
						 
						
							
							
								
								split db/seeds.rb file to local plugin and done journal  
							
							 
							
							
							
						 
						
							2013-02-26 15:52:20 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								c55f64f3c6 
								
							 
						 
						
							
							
								
								correct view permission of conference  
							
							 
							
							
							
						 
						
							2013-02-26 15:17:09 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								4ac0f19011 
								
							 
						 
						
							
							
								
								generate journal page by rails side and fixed model name bug  
							
							 
							
							
							
						 
						
							2013-02-26 15:15:09 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								6f599bb95d 
								
							 
						 
						
							
							
								
								sort conference and type  
							
							 
							
							
							
						 
						
							2013-02-25 12:01:59 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								522e0481e1 
								
							 
						 
						
							
							
								
								add conferene list order function  
							
							 
							
							
							
						 
						
							2013-02-25 12:01:59 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								8b0ffe747c 
								
							 
						 
						
							
							
								
								sort conference and type  
							
							 
							
							
							
						 
						
							2013-02-25 11:46:20 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								6929d30b5d 
								
							 
						 
						
							
							
								
								add conferene list order function  
							
							 
							
							
							
						 
						
							2013-02-25 11:46:11 +08:00  
						
					 
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							 
							
							
							
							
								
							
							
								9f362d9ae6 
								
							 
						 
						
							
							
								
								gridster, url code fixed, views removed.  
							
							 
							
							
							
						 
						
							2013-02-25 11:08:56 +08:00  
						
					 
				
					
						
							
							
								 
								spen
							
						 
						
							 
							
							
							
							
								
							
							
								cd98f9c889 
								
							 
						 
						
							
							
								
								member plugin init add frontend  
							
							 
							
							
							
						 
						
							2013-02-22 18:21:11 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								8704fb30d5 
								
							 
						 
						
							
							
								
								Fix init name/key  
							
							 
							
							
							
						 
						
							2013-02-22 14:46:22 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								9a63adedde 
								
							 
						 
						
							
							
								
								Remove seminar from conference init  
							
							 
							
							
							
						 
						
							2013-02-22 11:57:10 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								680d7908b9 
								
							 
						 
						
							
							
								
								member plugin init edit  
							
							 
							
							
							
						 
						
							2013-02-21 17:53:08 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								d46abd7caf 
								
							 
						 
						
							
							
								
								member list edit  
							
							 
							
							
							
						 
						
							2013-02-21 14:13:46 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								79f0fc1a3b 
								
							 
						 
						
							
							
								
								add announcement header translation file  
							
							 
							
							
							
						 
						
							2013-02-21 14:10:42 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								4ee85a8c09 
								
							 
						 
						
							
							
								
								add coauthor and coauthor relation function  
							
							 
							
							
							
						 
						
							2013-02-21 13:58:47 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								13c757e8a9 
								
							 
						 
						
							
							
								
								clean add/edit page and add conference list page  
							
							 
							
							
							
						 
						
							2013-02-21 13:58:30 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								16fda25ace 
								
							 
						 
						
							
							
								
								done personal conference add/edit page  
							
							 
							
							
							
						 
						
							2013-02-21 13:53:50 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								6d65af0312 
								
							 
						 
						
							
							
								
								done personal conference list page, but it need to js.  
							
							 
							
							
							
						 
						
							2013-02-21 13:53:50 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								2afbae7c08 
								
							 
						 
						
							
							
								
								make a fake data for personal conference plugin  
							
							 
							
							
							
						 
						
							2013-02-21 13:53:50 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								1c4b696052 
								
							 
						 
						
							
							
								
								add add/edit form page and controller  
							
							 
							
							
							
						 
						
							2013-02-21 13:53:50 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								54b12a193a 
								
							 
						 
						
							
							
								
								add translation configuration  
							
							 
							
							
							
						 
						
							2013-02-21 13:53:47 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								158fd8ffff 
								
							 
						 
						
							
							
								
								fixed conference icon and rename _p to _window of conference view  
							
							 
							
							
							
						 
						
							2013-02-21 13:51:42 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								f1db7be14e 
								
							 
						 
						
							
							
								
								remove test and change for personal journal  
							
							 
							
							
							
						 
						
							2013-02-21 13:51:37 +08:00  
						
					 
				
					
						
							
							
								 
								Rueshyna
							
						 
						
							 
							
							
							
							
								
							
							
								a61ec183c9 
								
							 
						 
						
							
							
								
								change add/edit url of personal_conference  
							
							 
							
							
							
						 
						
							2013-02-21 13:50:12 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								f59da3ce81 
								
							 
						 
						
							
							
								
								member plugin init edit  
							
							 
							
							
							
						 
						
							2013-02-20 18:05:09 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								bc44d38948 
								
							 
						 
						
							
							
								
								member plugin edit  
							
							 
							
							
							
						 
						
							2013-02-20 17:25:20 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								a7bc19768e 
								
							 
						 
						
							
							
								
								member list edit  
							
							 
							
							
							
						 
						
							2013-02-20 11:12:08 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								bc21840262 
								
							 
						 
						
							
							
								
								Comment out delete link for archive category  
							
							 
							
							... 
							
							
							
							Modify the import:
	- hot_news to announcement
	- iso_zone of 20000 to 21100 
							
						 
						
							2013-02-19 17:49:20 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								c7cf587581 
								
							 
						 
						
							
							
								
								Fix web links html and index query  
							
							 
							
							
							
						 
						
							2013-02-19 17:39:43 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								236f68ba84 
								
							 
						 
						
							
							
								
								Fix archive module back end pagination and front end html  
							
							 
							
							
							
						 
						
							2013-02-19 17:39:43 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								61648d23e1 
								
							 
						 
						
							
							
								
								Change delete_all to destroy_all  
							
							 
							
							
							
						 
						
							2013-02-19 17:39:42 +08:00  
						
					 
				
					
						
							
							
								 
								chris
							
						 
						
							 
							
							
							
							
								
							
							
								3676de8a14 
								
							 
						 
						
							
							
								
								Change validation for url: can include IPs  
							
							 
							
							
							
						 
						
							2013-02-19 17:39:42 +08:00