Harry Bomrah 
							
						 
						
							
								ee5fd18b64 
								
							 
						 
						
							
							
								
								highlighting fixed…  
							
							
							
						 
						
							2013-03-04 17:44:55 +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  
				
					
						
							
							
								 
						
							
								0dabd5b95f 
								
							 
						 
						
							
							
								
								fix widget field reload  
							
							
							
						 
						
							2013-02-27 10:51:41 +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  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								e9c0f443b7 
								
							 
						 
						
							
							
								
								Lot of changes in gridster  
							
							
							
						 
						
							2013-02-26 11:47:39 +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  
				
					
						
							
							
								 
						
							
								caac9191ce 
								
							 
						 
						
							
							
								
								Fix public_r_tag selection  
							
							
							
						 
						
							2013-02-23 16:52:37 +08:00  
				
					
						
							
							
								 
						
							
								a6f6dc271c 
								
							 
						 
						
							
							
								
								fix i18n,reload problems  
							
							
							
						 
						
							2013-02-18 15:13:31 +08:00  
				
					
						
							
							
								 
						
							
								6eb5061237 
								
							 
						 
						
							
							
								
								Changes for mobile map  
							
							
							
						 
						
							2013-02-04 18:02:11 +08:00  
				
					
						
							
							
								 
						
							
								b1a11b4dad 
								
							 
						 
						
							
							
								
								Remove isotope  
							
							
							
						 
						
							2013-02-04 18:01:42 +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  
				
					
						
							
							
								 
						
							
								b2bc62dadd 
								
							 
						 
						
							
							
								
								fixed orbit bar that like nccu bar now, and add rails version in Gemfile  
							
							
							
						 
						
							2013-02-04 18:01:03 +08:00  
				
					
						
							
							
								 
						
							
								18a51f070e 
								
							 
						 
						
							
							
								
								member roles edit  
							
							
							
						 
						
							2013-02-04 18:01:03 +08:00  
				
					
						
							
							
								 
						
							
								0cc616f988 
								
							 
						 
						
							
							
								
								page can use default widget  
							
							
							
						 
						
							2013-01-21 16:56:37 +08:00  
				
					
						
							
							
								 
						
							
								1b6bfdb80f 
								
							 
						 
						
							
							
								
								modularize personal journal and pull relational setting in desktop/index.rb  
							
							
							
						 
						
							2013-01-14 17:54:52 +08:00  
				
					
						
							
							
								 
						
							
								68e14a7898 
								
							 
						 
						
							
							
								
								move js file to relational module but have js require problem  
							
							
							
						 
						
							2013-01-14 17:54:52 +08:00  
				
					
						
							
							
								 
						
							
								919f951981 
								
							 
						 
						
							
							
								
								restore js,journal_pages.js,  
							
							
							
						 
						
							2013-01-14 17:54:52 +08:00  
				
					
						
							
							
								 
						
							
								a183ac6041 
								
							 
						 
						
							
							
								
								fixed journal type page  
							
							
							
						 
						
							2013-01-14 17:54:52 +08:00  
				
					
						
							
							
								 
						
							
								758cab5ecd 
								
							 
						 
						
							
							
								
								move journal code to persional_journal modulaar  
							
							
							
						 
						
							2013-01-14 17:53:59 +08:00  
				
					
						
							
							
								 
						
							
								141eb7e723 
								
							 
						 
						
							
							
								
								Add mobile but remove news in it  
							
							
							
						 
						
							2013-01-14 17:38:44 +08:00  
				
					
						
							
							
								 
						
							
								91d1487a04 
								
							 
						 
						
							
							
								
								Fix mobile banner, icons, announcement css  
							
							
							
						 
						
							2013-01-11 18:34:20 +08:00  
				
					
						
							
							
								 
						
							
								48ce2278d0 
								
							 
						 
						
							
							
								
								Update disable time when separated picker new or reset date  
							
							
							
						 
						
							2013-01-09 21:17:50 +08:00  
				
					
						
							
							
								 
						
							
								b49251afee 
								
							 
						 
						
							
							
								
								Date picker separated: reset time when reset date  
							
							
							
						 
						
							2013-01-09 21:17:50 +08:00  
				
					
						
							
							
								 
						
							
								fac4faad6c 
								
							 
						 
						
							
							
								
								Change date picker  
							
							
							
						 
						
							2013-01-09 05:18:16 +08:00  
				
					
						
							
							
								 
						
							
								423e2ac54e 
								
							 
						 
						
							
							
								
								Update bootstrap version 2.2.2  
							
							
							
						 
						
							2013-01-07 17:25:32 +08:00  
				
					
						
							
							
								 
						
							
								a34da20e48 
								
							 
						 
						
							
							
								
								Merge branch 'master' into desktop  
							
							... 
							
							
							
							* master: (57 commits)
  Add translations
  Add mobile version in site settings
  Add mobile but remove news in it
  Remove mysql
  Fix album widget options
  Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
  Add link to default widget (temporary)
  Ika's fix for width
  Ika's fix for width
  Gallery i18n
  Ika's changes for css default widgets
  Ika's changes for css default widgets
  change bulletin object to bulletin title
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
  correct pic file format
  complete page error handler logic
  change sub_menu to header in site setting
  ... 
							
						 
						
							2013-01-07 16:44:05 +08:00  
				
					
						
							
							
								 
						
							
								35e0011111 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/publication' into desktop  
							
							... 
							
							
							
							* remotes/origin/publication:
  new desktop framework updates 
							
						 
						
							2013-01-07 12:44:30 +08:00  
				
					
						
							
							
								 
						
							
								37740adb24 
								
							 
						 
						
							
							
								
								Add mobile but remove news in it  
							
							
							
						 
						
							2013-01-07 03:03:38 +08:00  
				
					
						
							
							
								 
						
							
								2c632551e5 
								
							 
						 
						
							
							
								
								fix preview filed after ad_banner created.  
							
							
							
						 
						
							2013-01-02 17:51:53 +08:00  
				
					
						
							
							
								 
						
							
								5587e83419 
								
							 
						 
						
							
							
								
								Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu  
							
							
							
						 
						
							2012-12-28 15:31:32 +08:00  
				
					
						
							
							
								 
						
							
								baf1240b76 
								
							 
						 
						
							
							
								
								gallery options  
							
							
							
						 
						
							2012-12-28 15:30:46 +08:00  
				
					
						
							
							
								 
						
							
								4d965d754b 
								
							 
						 
						
							
							
								
								Fix urls in tinymce source editor  
							
							
							
						 
						
							2012-12-28 15:03:02 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								37f8c1637a 
								
							 
						 
						
							
							
								
								new desktop framework updates  
							
							
							
						 
						
							2012-12-27 18:25:54 +08:00  
				
					
						
							
							
								 
						
							
								acaf707900 
								
							 
						 
						
							
							
								
								Merge branch 'publication' of github.com:Rulingcom/orbit into publication  
							
							
							
						 
						
							2012-12-07 11:22:06 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								ad8273d638 
								
							 
						 
						
							
							
								
								fixed fileview in english mode  
							
							
							
						 
						
							2012-12-07 11:19:40 +08:00  
				
					
						
							
							
								 
						
							
								4d07b0753c 
								
							 
						 
						
							
							
								
								Merge branch 'publication' of github.com:Rulingcom/orbit into publication  
							
							
							
						 
						
							2012-12-07 10:13:41 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								08b99011d0 
								
							 
						 
						
							
							
								
								all sections and sections megerd  
							
							
							
						 
						
							2012-12-07 10:10:38 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								59c4080f0c 
								
							 
						 
						
							
							
								
								stupid fix  
							
							
							
						 
						
							2012-12-07 04:21:26 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								da3f0b58f5 
								
							 
						 
						
							
							
								
								section fixed and some other fixes  
							
							
							
						 
						
							2012-12-07 04:21:26 +08:00  
				
					
						
							
							
								 
						
							
								e87526d7bb 
								
							 
						 
						
							
							
								
								try to fix problem  
							
							
							
						 
						
							2012-12-07 04:21:26 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								3d382fec6b 
								
							 
						 
						
							
							
								
								scroll fixed...  
							
							
							
						 
						
							2012-12-07 04:21:26 +08:00  
				
					
						
							
							
								 
						
							
								89e25fe7a2 
								
							 
						 
						
							
							
								
								view update  
							
							
							
						 
						
							2012-12-07 04:21:26 +08:00  
				
					
						
							
							
								 
						
							
								b1f2749000 
								
							 
						 
						
							
							
								
								Devin's changes to integrate the store  
							
							
							
						 
						
							2012-12-06 23:11:23 +08:00