chris
							
						 | 
						
							
							
							
							
							
								
							
							
								65527017ca
								
							
						 | 
						
							
							
								
								Update new UI task to migrate the authorizations.
							
							
							
							
							
							
							
							PS: sold must be running for new_ui.rake 
							
						 | 
						
							2013-07-02 17:26:02 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								856898016b
								
							
						 | 
						
							
							
								
								New UI changes(tags, categories, authorisations, module index…)
							
							
							
							
							
							
							
							To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) 
							
						 | 
						
							2013-07-02 16:46:44 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								ccd760445d
								
							
						 | 
						
							
							
								
								ask module: configure resque redis and namespace by config/initializers/resque.rb
							
							
							
							
							
						 | 
						
							2013-06-07 13:04:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								54a35b30be
								
							
						 | 
						
							
							
								
								fix design index bug when start start from blank DB.
							
							
							
							
							
							
							
							add delay impressionist.
add several i18n vars 
							
						 | 
						
							2013-05-23 12:07:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3d0a1cef56
								
							
						 | 
						
							
							
								
								1.fix for syntax error.
							
							
							
							
							
							
							
							2.Making production console works.
3.Making blank site member no errors. 
							
						 | 
						
							2013-05-22 16:25:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3e6c2b1ec2
								
							
						 | 
						
							
							
								
								fix member error with blank database
							
							
							
							
							
						 | 
						
							2013-05-14 11:48:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								ef2c732d2e
								
							
						 | 
						
							
							
								
								make blank site working better
							
							
							
							
							
						 | 
						
							2013-05-14 11:26:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								1096db79b6
								
							
						 | 
						
							
							
								
								blank site now can be start from rake site:build
							
							
							
							
							
						 | 
						
							2013-05-14 10:32:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								697944a029
								
							
						 | 
						
							
							
								
								user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
							
							
							
							
							
						 | 
						
							2013-04-25 19:59:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7e9fce0c2d
								
							
						 | 
						
							
							
								
								clean Harry's code
							
							
							
							
							
						 | 
						
							2013-04-17 14:31:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								2416030adc
								
							
						 | 
						
							
							
								
								remove useless rake task
							
							
							
							
							
						 | 
						
							2013-04-17 14:31:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								4cbf2fd8b9
								
							
						 | 
						
							
							
								
								complete harrys code
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								c94a86c3a4
								
							
						 | 
						
							
							
								
								web_resource rake web_link_url:web_link_url_i18n
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:04 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e2802d94d0
								
							
						 | 
						
							
							
								
								rake task added
							
							
							
							
							
						 | 
						
							2013-04-17 14:28:13 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								61648d23e1
								
							
						 | 
						
							
							
								
								Change delete_all to destroy_all
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:42 +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 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								77386f0284
								
							
						 | 
						
							
							
								
								disable data transform when switching attribute field type. new member stable
							
							
							
							
							
						 | 
						
							2012-11-22 21:10:35 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								475642d375
								
							
						 | 
						
							
							
								
								Remove news and fix default_url in ImageUploader
							
							
							
							
							
						 | 
						
							2012-11-22 09:30:25 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								192e52b5de
								
							
						 | 
						
							
							
								
								Remove middle site
							
							
							
							
							
						 | 
						
							2012-11-20 10:06:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								eaf465525a
								
							
						 | 
						
							
							
								
								rake update
							
							
							
							
							
						 | 
						
							2012-11-06 12:35:15 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								65ac6980c4
								
							
						 | 
						
							
							
								
								Merge branch 'various_bugs' into nccu_master
							
							
							
							
							
							
							
							Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb 
							
						 | 
						
							2012-10-29 16:10:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								bd0d975014
								
							
						 | 
						
							
							
								
								for user new interface, member  role is working.
							
							
							
							
							
						 | 
						
							2012-10-26 11:27:37 +08:00 |