saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								6d5dd4a80f
								
							
						 | 
						
							
							
								
								Changed Site Valid Locales to In Use Locales
							
							
							
							
							
						 | 
						
							2013-11-27 17:51:48 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a14d69211b
								
							
						 | 
						
							
							
								
								PagePart widgets for "system widget"
							
							
							
							
							
							
							
							Delete useless code 
							
						 | 
						
							2013-10-28 16:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								218cb03641
								
							
						 | 
						
							
							
								
								PagePart widgets except "system widget"
							
							
							
							
							
						 | 
						
							2013-10-28 16:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								92d2af13f2
								
							
						 | 
						
							
							
								
								changes for ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:17:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f694134150
								
							
						 | 
						
							
							
								
								Remove useless code
							
							
							
							
							
							
							
							Add data-title 
							
						 | 
						
							2013-10-19 19:14:07 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								f920a4f6ba
								
							
						 | 
						
							
							
								
								filemanager and some update for file uploader . added file uploader to kernel
							
							
							
							
							
						 | 
						
							2013-09-11 14:03:06 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								bec0bd76e4
								
							
						 | 
						
							
							
								
								Replace get_categories by categories
							
							
							
							
							
						 | 
						
							2013-07-04 12:33:28 +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 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								64101109dd
								
							
						 | 
						
							
							
								
								disable all sorted_tags
							
							
							
							
							
						 | 
						
							2013-04-26 18:07:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								425a320c02
								
							
						 | 
						
							
							
								
								fix widget and fronted setting interface. checked with Spen
							
							
							
							
							
						 | 
						
							2013-04-17 14:16:24 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								0781779ac0
								
							
						 | 
						
							
							
								
								solved conflicts
							
							
							
							
							
						 | 
						
							2013-04-17 14:14:24 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								f3c809fd58
								
							
						 | 
						
							
							
								
								Fix link switch not showing for default front end
							
							
							
							
							
						 | 
						
							2013-03-19 17:49:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								8a8bfcb8fb
								
							
						 | 
						
							
							
								
								fix default widget link
							
							
							
							
							
						 | 
						
							2013-02-27 10:50:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								99e67c8719
								
							
						 | 
						
							
							
								
								first version of multi categories and tags
							
							
							
							
							
						 | 
						
							2013-02-27 10:49:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								96455f31e1
								
							
						 | 
						
							
							
								
								deliver app config. fix wrong value cause error for default widget
							
							
							
							
							
						 | 
						
							2013-02-18 19:04:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								a6f6dc271c
								
							
						 | 
						
							
							
								
								fix i18n,reload problems
							
							
							
							
							
						 | 
						
							2013-02-18 15:13:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								71d5abae2e
								
							
						 | 
						
							
							
								
								first version of app config and modified inits.
							
							
							
							
							
						 | 
						
							2013-01-29 20:33:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								fea1726f6d
								
							
						 | 
						
							
							
								
								fix ajax error when edit new page
							
							
							
							
							
						 | 
						
							2013-01-24 13:39:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								979df9ac80
								
							
						 | 
						
							
							
								
								daily commit
							
							
							
							
							
						 | 
						
							2013-01-23 18:51:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								0cc616f988
								
							
						 | 
						
							
							
								
								page can use default widget
							
							
							
							
							
						 | 
						
							2013-01-21 16:56:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								46b1d55ff6
								
							
						 | 
						
							
							
								
								Complete new interface
							
							
							
							
							
						 | 
						
							2013-01-14 18:49:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								ca51ebc08c
								
							
						 | 
						
							
							
								
								apply view
							
							
							
							
							
						 | 
						
							2013-01-10 18:00:58 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								41dff814fb
								
							
						 | 
						
							
							
								
								Change icons
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1d80b39dcb
								
							
						 | 
						
							
							
								
								Fix no responding when trying to access front end page
							
							
							
							
							
						 | 
						
							2013-01-09 11:23:18 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								a7cf6dd694
								
							
						 | 
						
							
							
								
								reverse structure order
							
							
							
							
							
						 | 
						
							2012-12-27 17:54:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								9e07794cbc
								
							
						 | 
						
							
							
								
								soft structure order
							
							
							
							
							
						 | 
						
							2012-12-27 14:37:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								81b0e3c38f
								
							
						 | 
						
							
							
								
								change ActiveSupport::SecureRandom to SecureRandom in orbit core
							
							
							
							
							
						 | 
						
							2012-12-27 12:19:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								dc3be3c9a1
								
							
						 | 
						
							
							
								
								Translation changes
							
							
							
							
							
						 | 
						
							2012-12-03 23:00:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9c6c622a49
								
							
						 | 
						
							
							
								
								Add missing icons and css for icons in layout
							
							
							
							
							
						 | 
						
							2012-12-03 22:31:00 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								475642d375
								
							
						 | 
						
							
							
								
								Remove news and fix default_url in ImageUploader
							
							
							
							
							
						 | 
						
							2012-11-22 09:30:25 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b40d4702d5
								
							
						 | 
						
							
							
								
								Merge branch 'master' into various_bugs
							
							
							
							
							
							
							
							Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb 
							
						 | 
						
							2012-11-06 11:44:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								beb843f75b
								
							
						 | 
						
							
							
								
								add new member with role interface. add more not usable.
							
							
							
							
							
							
							
							role management new attribute is ok. delete is ok. 
							
						 | 
						
							2012-11-04 20:42:58 +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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								cbfa659928
								
							
						 | 
						
							
							
								
								Changes for side_bar
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								189fa553c5
								
							
						 | 
						
							
							
								
								Changes for helpers, not including all by default
							
							
							
							
							
						 | 
						
							2012-10-09 14:47:16 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								975523c8b2
								
							
						 | 
						
							
							
								
								demo site plugin
							
							
							
							
							
						 | 
						
							2012-09-24 14:10:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4fb35b00f2
								
							
						 | 
						
							
							
								
								Add missing translations
							
							
							
							
							
						 | 
						
							2012-09-24 09:02:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								bdd5a1a047
								
							
						 | 
						
							
							
								
								Changes for i18n yml
							
							
							
							
							
						 | 
						
							2012-09-24 09:02:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								6044857fea
								
							
						 | 
						
							
							
								
								complete preview for both new and announcement
							
							
							
							
							
						 | 
						
							2012-09-07 17:55:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								39b63a970c
								
							
						 | 
						
							
							
								
								Fix .class to .class.to_s
							
							
							
							
							
						 | 
						
							2012-07-30 18:34:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								7440727acd
								
							
						 | 
						
							
							
								
								Fix: "._type" to ".class"
							
							
							
							
							
						 | 
						
							2012-07-30 17:21:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								49dd3a1770
								
							
						 | 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models
							
							
							
							
							
						 | 
						
							2012-07-27 19:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								56b1bd9eaa
								
							
						 | 
						
							
							
								
								add translation
							
							
							
							
							
						 | 
						
							2012-06-26 10:57:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5e9836f371
								
							
						 | 
						
							
							
								
								Changes for structure
							
							
							
							
							
						 | 
						
							2012-05-22 14:45:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2f7d561310
								
							
						 | 
						
							
							
								
								Put back I18n for file_upload
							
							
							
							
							
						 | 
						
							2012-05-17 19:40:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								82d78acbad
								
							
						 | 
						
							
							
								
								First version of app and object auth for web_resource module. Basic fund is ok.  backend need to be secued
							
							
							
							
							
						 | 
						
							2012-05-17 06:43:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								03387d3c07
								
							
						 | 
						
							
							
								
								Object auth for ad_banner
							
							
							
							
							
						 | 
						
							2012-05-17 06:42:33 +08:00 |