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  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								c2285a34f6 
								
							 
						 
						
							
							
								
								stupid fix  
							
							
							
						 
						
							2012-12-06 18:50:24 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								8094ddc967 
								
							 
						 
						
							
							
								
								section fixed and some other fixes  
							
							
							
						 
						
							2012-12-06 17:43:19 +08:00  
				
					
						
							
							
								 
						
							
								7430a05782 
								
							 
						 
						
							
							
								
								try to fix problem  
							
							
							
						 
						
							2012-12-06 16:24:40 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								df4a9a5dff 
								
							 
						 
						
							
							
								
								scroll fixed...  
							
							
							
						 
						
							2012-12-06 15:44:16 +08:00  
				
					
						
							
							
								 
						
							
								6a47fc8d62 
								
							 
						 
						
							
							
								
								view update  
							
							
							
						 
						
							2012-12-06 11:43:40 +08:00  
				
					
						
							
							
								 
						
							
								5d76600154 
								
							 
						 
						
							
							
								
								view update  
							
							
							
						 
						
							2012-12-06 07:59:44 +08:00  
				
					
						
							
							
								 
						
							
								756bfa563b 
								
							 
						 
						
							
							
								
								view update  
							
							
							
						 
						
							2012-12-06 07:59:44 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								3d1fb48489 
								
							 
						 
						
							
							
								
								edit coauthor relation done  
							
							
							
						 
						
							2012-12-06 07:59:44 +08:00  
				
					
						
							
							
								 
						
							
								a0cce2ae0d 
								
							 
						 
						
							
							
								
								view update  
							
							
							
						 
						
							2012-12-06 07:59:43 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								79dc99d431 
								
							 
						 
						
							
							
								
								br fixed  
							
							
							
						 
						
							2012-12-06 07:59:43 +08:00  
				
					
						
							
							
								 
						
							
								d03f5dc1ff 
								
							 
						 
						
							
							
								
								view update  
							
							
							
						 
						
							2012-12-06 07:59:43 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								c6e0b56012 
								
							 
						 
						
							
							
								
								stupid bug fixed  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								49d1ca6997 
								
							 
						 
						
							
							
								
								new type fixed  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								0e6c75e677 
								
							 
						 
						
							
							
								
								form for coauthor - fixed  
							
							
							
						 
						
							2012-12-04 00:31:07 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								a6a50227eb 
								
							 
						 
						
							
							
								
								new type fixed  
							
							
							
						 
						
							2012-12-04 00:31:07 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								f7f55850fe 
								
							 
						 
						
							
							
								
								coauthor edit and destroy fixed  
							
							
							
						 
						
							2012-12-04 00:31:07 +08:00  
				
					
						
							
							
								 
						
							
								5986817e16 
								
							 
						 
						
							
							
								
								add journal_list. now, those pair, (journal_title, journal_levels), is uniq  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								ee830f148e 
								
							 
						 
						
							
							
								
								jumping menus updated..  
							
							
							
						 
						
							2012-12-04 00:30:10 +08:00