|  Harry Bomrah | 16b695200a | gallery_album to album | 2013-11-19 09:31:49 +08:00 | 
				
					
						|  chris | c1cbfddf4b | Fix for user and role relationship (from role and sub-role side) | 2013-09-13 17:39:01 +08:00 | 
				
					
						|  chris | 06203d27b9 | Fix for user and role relationship | 2013-09-11 14:00:41 +08:00 | 
				
					
						|  Matt K. Fu | 7e9fce0c2d | clean Harry's code | 2013-04-17 14:31:10 +08:00 | 
				
					
						|  Matt K. Fu | 0f6f5aafce | fix for both part and page part settings Conflicts:
	app/helpers/admin/page_parts_helper.rb
	app/views/admin/pages/reload_front_end_setting.js.erb
	app/views/admin/pages/reload_frontend_pages.js.erb | 2013-04-17 14:12:52 +08:00 | 
				
					
						|  chris | ee8a78621a | Add task to flatten category and tag for page and page_part | 2013-03-21 14:15:58 +08:00 | 
				
					
						|  chris | b864cc0268 | Changes in I18n (except personal_conference and personal_journal) | 2013-03-12 18:13:48 +08:00 | 
				
					
						|  Fu Matthew | 0dabd5b95f | fix widget field reload | 2013-02-27 10:51:41 +08:00 | 
				
					
						|  Fu Matthew | 99e67c8719 | first version of multi categories and tags | 2013-02-27 10:49:48 +08:00 | 
				
					
						|  chris | 9a63adedde | Remove seminar from conference init | 2013-02-22 11:57:10 +08:00 | 
				
					
						|  chris | d2f837f342 | Add task to save pages | 2013-02-19 17:50:46 +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 | 17ac564fbb | Fix sitemap nil Fix namespace of role in subrole | 2013-02-19 17:39:43 +08:00 | 
				
					
						|  chris | 7105f103e1 | Task to delete settings for old version of default widget | 2013-02-19 17:34:39 +08:00 | 
				
					
						|  Fu Matthew | 0b88f7d1f8 | deliver app config. fix wrong value cause error for default widget | 2013-02-19 14:21:54 +08:00 | 
				
					
						|  Fu Matthew | 0a115906f1 | fix i18n,reload problems | 2013-02-19 14:21:54 +08:00 | 
				
					
						|  chris | 9771d42587 | migrate for app config. fix panel style intro misplace | 2013-02-04 18:10:39 +08:00 | 
				
					
						|  Fu Matthew | bbd30759f5 | fix web resource frontend page | 2013-02-04 18:01:42 +08:00 | 
				
					
						|  Fu Matthew | fc702a6210 | add front-end page for web_resource | 2013-01-24 13:54:14 +08:00 | 
				
					
						|  Fu Matthew | 979df9ac80 | daily commit | 2013-01-23 18:51:18 +08:00 | 
				
					
						|  Fu Matthew | 46b1d55ff6 | Complete new interface | 2013-01-14 18:49:23 +08:00 | 
				
					
						|  Fu Matthew | 5ab4bbd367 | add ad_banner inner page,pic title. | 2013-01-09 16:54:33 +08:00 | 
				
					
						|  Fu Matthew | b71ebb3982 | clean default widget | 2013-01-07 17:20:37 +08:00 | 
				
					
						|  Fu Matthew | 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 | 
				
					
						|  Fu Matthew | 39f715319b | Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu Conflicts:
	lib/tasks/migrate.rake | 2013-01-03 19:41:52 +08:00 | 
				
					
						|  Fu Matthew | a70110f787 | make default widget works without init | 2013-01-03 19:38:14 +08:00 | 
				
					
						|  chris | fa83dbf791 | Fix order in structure | 2013-01-03 19:15:08 +08:00 | 
				
					
						|  Fu Matthew | 5d6279a9ea | fix calendar broken | 2013-01-03 10:58:52 +08:00 | 
				
					
						|  Fu Matthew | 641b5310b0 | fix NTU album module_app data | 2013-01-02 16:04:11 +08:00 | 
				
					
						|  Fu Matthew | 32c6f17613 | fix object auth. show error message if user try to do object auth in a wrong way. | 2013-01-02 14:34:34 +08:00 | 
				
					
						|  Fu Matthew | baf1240b76 | gallery options | 2012-12-28 15:30:46 +08:00 | 
				
					
						|  Fu Matthew | 2d6b70b97f | regenerate pageparts | 2012-12-27 15:50:05 +08:00 | 
				
					
						|  chris | fcbba6660b | Only one parser for front end Separate site map for i18n | 2012-12-19 17:15:31 +08:00 | 
				
					
						|  chris | 475642d375 | Remove news and fix default_url in ImageUploader | 2012-11-22 09:30:25 +08:00 | 
				
					
						|  Christophe Vilayphiou | 0a3a140b18 | Fix migration bug | 2012-09-11 16:32:20 +08:00 | 
				
					
						|  Christophe Vilayphiou | 73e48aebc6 | Change news subtitle to textarea, no tinymce | 2012-09-11 15:40:27 +08:00 | 
				
					
						|  Christophe Vilayphiou | ad3ec43a00 | Remove comments in migrate task | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 804695749d | Fix bugs after removal of i18n_variable | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 49dd3a1770 | Remove i18n_variable for controllers, helpers and models | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 327996a7b0 | Task part for i18n_variable removal for web_resource | 2012-07-27 19:12:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | 207b0c5886 | Remove i18n_variable for web_resource | 2012-07-27 19:12:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | 50813eb57d | Remove i18n_variable for page_content | 2012-07-27 19:12:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | 61c1af7316 | Remove i18n_variable for news | 2012-07-27 19:12:58 +08:00 | 
				
					
						|  Christophe Vilayphiou | e2ebd48b22 | Remove i18n_variable for announcement | 2012-07-27 19:12:58 +08:00 |