e1e003af6e 
								
							 
						 
						
							
							
								
								Complete new interface  
							
							
							
						 
						
							2013-01-14 19:18:25 +08:00  
				
					
						
							
							
								 
						
							
								504f5027cc 
								
							 
						 
						
							
							
								
								member role edit  
							
							
							
						 
						
							2013-01-14 19:00:08 +08:00  
				
					
						
							
							
								 
						
							
								758cab5ecd 
								
							 
						 
						
							
							
								
								move journal code to persional_journal modulaar  
							
							
							
						 
						
							2013-01-14 17:53:59 +08:00  
				
					
						
							
							
								 
						
							
								84e4a558be 
								
							 
						 
						
							
							
								
								member roles edit  
							
							
							
						 
						
							2013-01-14 17:02:51 +08:00  
				
					
						
							
							
								 
						
							
								e24f7a7880 
								
							 
						 
						
							
							
								
								Put back some field so ad_image can work  
							
							
							
						 
						
							2013-01-10 11:08:57 +08:00  
				
					
						
							
							
								 
						
							
								1c1839fc00 
								
							 
						 
						
							
							
								
								Remove useless code in de_image.rb  
							
							
							
						 
						
							2013-01-09 21:17:50 +08:00  
				
					
						
							
							
								 
						
							
								e3d34263e3 
								
							 
						 
						
							
							
								
								Schedule job for tag_cloud  
							
							
							
						 
						
							2013-01-08 12:36:50 +08:00  
				
					
						
							
							
								 
						
							
								5793f0fe5d 
								
							 
						 
						
							
							
								
								default widget link.  
							
							... 
							
							
							
							make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app 
							
						 
						
							2013-01-07 17:20:37 +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  
				
					
						
							
							
								 
						
							
								6c6bda988d 
								
							 
						 
						
							
							
								
								Add mobile version in site settings  
							
							
							
						 
						
							2013-01-07 03:57:36 +08:00  
				
					
						
							
							
								 
						
							
								c6111460f5 
								
							 
						 
						
							
							
								
								Fix album widget options  
							
							
							
						 
						
							2013-01-07 00:40:43 +08:00  
				
					
						
							
							
								 
						
							
								49e289e0fd 
								
							 
						 
						
							
							
								
								fixing default widget error when needs image  
							
							
							
						 
						
							2013-01-03 20:07:05 +08:00  
				
					
						
							
							
								 
						
							
								39f715319b 
								
							 
						 
						
							
							
								
								Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu  
							
							... 
							
							
							
							Conflicts:
	lib/tasks/migrate.rake 
							
						 
						
							2013-01-03 19:41:52 +08:00  
				
					
						
							
							
								 
						
							
								a70110f787 
								
							 
						 
						
							
							
								
								make default widget works without init  
							
							
							
						 
						
							2013-01-03 19:38:14 +08:00  
				
					
						
							
							
								 
						
							
								fa83dbf791 
								
							 
						 
						
							
							
								
								Fix order in structure  
							
							
							
						 
						
							2013-01-03 19:15:08 +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  
				
					
						
							
							
								 
						
							
								37309a452d 
								
							 
						 
						
							
							
								
								Fix site map and menu order  
							
							
							
						 
						
							2012-12-28 11:37:37 +08:00  
				
					
						
							
							
								 
						
							
								bab8328029 
								
							 
						 
						
							
							
								
								Put back old tags (don't use the class ProtoTag)  
							
							
							
						 
						
							2012-12-28 10:43:48 +08:00  
				
					
						
							
							
								
									
								
								Harry Bomrah 
							
						 
						
							
								37f8c1637a 
								
							 
						 
						
							
							
								
								new desktop framework updates  
							
							
							
						 
						
							2012-12-27 18:25:54 +08:00  
				
					
						
							
							
								 
						
							
								269e5b033f 
								
							 
						 
						
							
							
								
								Fix for page_part and widget back-end  
							
							
							
						 
						
							2012-12-27 16:20:40 +08:00  
				
					
						
							
							
								 
						
							
								2d6b70b97f 
								
							 
						 
						
							
							
								
								regenerate pageparts  
							
							
							
						 
						
							2012-12-27 15:50:05 +08:00  
				
					
						
							
							
								 
						
							
								2dd0f9a9d2 
								
							 
						 
						
							
							
								
								fix disappear widget inter block  
							
							
							
						 
						
							2012-12-27 15:06:01 +08:00  
				
					
						
							
							
								 
						
							
								b4633a2ccb 
								
							 
						 
						
							
							
								
								.not_guest_user  
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
				
					
						
							
							
								 
						
							
								3d39c2c3c3 
								
							 
						 
						
							
							
								
								hidden guest user  
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
				
					
						
							
							
								 
						
							
								ec1fad9729 
								
							 
						 
						
							
							
								
								fixed empty name of member list  
							
							
							
						 
						
							2012-12-19 19:48:13 +08:00  
				
					
						
							
							
								 
						
							
								fcbba6660b 
								
							 
						 
						
							
							
								
								Only one parser for front end  
							
							... 
							
							
							
							Separate site map for i18n 
							
						 
						
							2012-12-19 17:15:31 +08:00  
				
					
						
							
							
								 
						
							
								ff435a4af4 
								
							 
						 
						
							
							
								
								Change the design for the whole site form designs index  
							
							
							
						 
						
							2012-12-07 12:14:31 +08:00  
				
					
						
							
							
								 
						
							
								6f1748d2b3 
								
							 
						 
						
							
							
								
								- template list/show is loaded from central server  
							
							... 
							
							
							
							- buy a template downloads and creates it in DB
- changes in designs index 
							
						 
						
							2012-12-06 23:20:27 +08:00  
				
					
						
							
							
								 
						
							
								e0e1c30f68 
								
							 
						 
						
							
							
								
								delete onside widget in db  
							
							
							
						 
						
							2012-12-06 07:59:42 +08:00  
				
					
						
							
							
								 
						
							
								7d3c535e01 
								
							 
						 
						
							
							
								
								add info field  
							
							
							
						 
						
							2012-12-06 07:58:39 +08:00  
				
					
						
							
							
								 
						
							
								58e71c29b3 
								
							 
						 
						
							
							
								
								uniq relation  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								 
						
							
								9759a32394 
								
							 
						 
						
							
							
								
								can display relation between author  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								 
						
							
								e143f9a345 
								
							 
						 
						
							
							
								
								can select relection from relation db  
							
							
							
						 
						
							2012-12-04 00:31:46 +08:00  
				
					
						
							
							
								 
						
							
								7822ffc33d 
								
							 
						 
						
							
							
								
								can add relation between co-author  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								eb97d417bd 
								
							 
						 
						
							
							
								
								if coauthor not in coauthor db then it will be add in db  
							
							
							
						 
						
							2012-12-04 00:31:06 +08:00  
				
					
						
							
							
								 
						
							
								dc3be3c9a1 
								
							 
						 
						
							
							
								
								Translation changes  
							
							
							
						 
						
							2012-12-03 23:00:04 +08:00  
				
					
						
							
							
								 
						
							
								9254b9960d 
								
							 
						 
						
							
							
								
								Add timeout to user  
							
							
							
						 
						
							2012-12-03 21:45:00 +08:00  
				
					
						
							
							
								 
						
							
								4f9aa63045 
								
							 
						 
						
							
							
								
								Remove extra end  
							
							
							
						 
						
							2012-12-03 18:45:32 +08:00  
				
					
						
							
							
								 
						
							
								5c7f1aa164 
								
							 
						 
						
							
							
								
								Fix saving of page_part after layout change  
							
							
							
						 
						
							2012-12-03 18:42:50 +08:00  
				
					
						
							
							
								 
						
							
								2757044c32 
								
							 
						 
						
							
							
								
								Forgot to save the page_parts  
							
							
							
						 
						
							2012-12-03 17:49:26 +08:00  
				
					
						
							
							
								 
						
							
								bdcfb46294 
								
							 
						 
						
							
							
								
								Fix previous commit  
							
							
							
						 
						
							2012-12-03 17:38:55 +08:00  
				
					
						
							
							
								 
						
							
								6543491a53 
								
							 
						 
						
							
							
								
								Save pages to generate page_parts when a layout is updated  
							
							
							
						 
						
							2012-12-03 17:25:27 +08:00  
				
					
						
							
							
								 
						
							
								77386f0284 
								
							 
						 
						
							
							
								
								disable data transform when switching attribute field type. new member stable  
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
				
					
						
							
							
								 
						
							
								d502f561ef 
								
							 
						 
						
							
							
								
								add co-author db and curd page, but it can't destory it...  
							
							
							
						 
						
							2012-11-21 18:36:32 +08:00  
				
					
						
							
							
								 
						
							
								97ffb5ff18 
								
							 
						 
						
							
							
								
								file view update  
							
							
							
						 
						
							2012-11-21 07:37:42 +08:00  
				
					
						
							
							
								 
						
							
								5643b0a528 
								
							 
						 
						
							
							
								
								delete demo db of journal and paper  
							
							
							
						 
						
							2012-11-21 07:37:41 +08:00  
				
					
						
							
							
								 
						
							
								c8bbb28d42 
								
							 
						 
						
							
							
								
								Fix wrong alias in design.rb for themes  
							
							
							
						 
						
							2012-11-20 12:46:50 +08:00  
				
					
						
							
							
								 
						
							
								84c284fa71 
								
							 
						 
						
							
							
								
								Fix wrong naming in theme.rb  
							
							
							
						 
						
							2012-11-20 12:42:53 +08:00