Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								a0478f2a8f
								
							
						 | 
						
							
							
								
								fix page name repeated error when page creating
							
							
							
							
							
						 | 
						
							2013-04-25 12:19:25 +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 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								f6b600df59
								
							
						 | 
						
							
							
								
								deliver API
							
							
							
							
							
						 | 
						
							2013-04-17 14:09:01 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6af375efa4
								
							
						 | 
						
							
							
								
								Fix bug in setup_app_frontend_and_style
							
							
							
							
							
						 | 
						
							2013-04-17 14:09:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								1709773b0a
								
							
						 | 
						
							
							
								
								style for front end
							
							
							
							
							
						 | 
						
							2013-04-17 14:08:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								6efef253a6
								
							
						 | 
						
							
							
								
								add conditions for making multi cates and tags more stable
							
							
							
							
							
						 | 
						
							2013-04-17 11:08:57 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3e96cfe514
								
							
						 | 
						
							
							
								
								Changes for FAQ to work with not latest but stable code
							
							
							
							
							
						 | 
						
							2013-03-28 15:05:52 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								ff30b3d05e
								
							
						 | 
						
							
							
								
								Fix link not showing for default front end
							
							
							
							
							
						 | 
						
							2013-03-19 18:23:35 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f3c809fd58
								
							
						 | 
						
							
							
								
								Fix link switch not showing for default front end
							
							
							
							
							
						 | 
						
							2013-03-19 17:49:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								147b7b9292
								
							
						 | 
						
							
							
								
								Fix update when no tag or category
							
							
							
							
							
						 | 
						
							2013-03-07 17:30:49 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								9e9620c04a
								
							
						 | 
						
							
							
								
								Fix item looking for widget when no front end
							
							
							
							
							
						 | 
						
							2013-02-19 18:09:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								71d5abae2e
								
							
						 | 
						
							
							
								
								first version of app config and modified inits.
							
							
							
							
							
						 | 
						
							2013-01-29 20:33:40 +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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1d80b39dcb
								
							
						 | 
						
							
							
								
								Fix no responding when trying to access front end page
							
							
							
							
							
						 | 
						
							2013-01-09 11:23:18 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9b1ada0af9
								
							
						 | 
						
							
							
								
								Fix these bugs:
							
							
							
							
							
							
							
							1.結構部份
    a.原選單,點選編輯,無動作反應
    b.新增選單後,左邊灰色架構部份不會更新
  2.檔案室
    a.無法編輯分類
							
						 | 
						
							2012-11-15 15:51:44 +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 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								bdd5a1a047
								
							
						 | 
						
							
							
								
								Changes for i18n yml
							
							
							
							
							
						 | 
						
							2012-09-24 09:02:45 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								0cb573946e
								
							
						 | 
						
							
							
								
								update item page
							
							
							
							
							
						 | 
						
							2012-08-30 15:17:39 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								a1560ebcf5
								
							
						 | 
						
							
							
								
								update archive
							
							
							
							
							
						 | 
						
							2012-08-30 15:17:39 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								d5c55c9697
								
							
						 | 
						
							
							
								
								widget & frontend field
							
							
							
							
							
						 | 
						
							2012-08-09 15:25:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5e9836f371
								
							
						 | 
						
							
							
								
								Changes for structure
							
							
							
							
							
						 | 
						
							2012-05-22 14:45:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								cf8d20dc84
								
							
						 | 
						
							
							
								
								Add category and tag to pages
							
							
							
							
							
						 | 
						
							2012-05-14 00:33:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e40c76bf5f
								
							
						 | 
						
							
							
								
								Fix new page form
							
							
							
							
							
							
							
							Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json 
							
						 | 
						
							2012-05-13 23:48:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								b8f52fa1ec
								
							
						 | 
						
							
							
								
								Separate announcement and news
							
							
							
							
							
						 | 
						
							2012-04-30 06:31:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f13ebc6c46
								
							
						 | 
						
							
							
								
								Fix bugs and changes for nccu
							
							
							
							
							
						 | 
						
							2012-02-27 18:50:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								8f531a6fe5
								
							
						 | 
						
							
							
								
								Fix bus for pages and page content
							
							
							
							
							
						 | 
						
							2012-02-24 15:14:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								63d7810b35
								
							
						 | 
						
							
							
								
								Add isotope, categories for announcement page, sort for announcement
							
							
							
							
							
						 | 
						
							2012-02-23 15:52:58 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								9b001aa6c3
								
							
						 | 
						
							
							
								
								new page_content app
							
							
							
							
							
						 | 
						
							2012-02-21 19:22:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0b71714d44
								
							
						 | 
						
							
							
								
								Improve code in items, pages, links
							
							
							
							
							
						 | 
						
							2012-02-17 14:54:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								cf4a6c0b35
								
							
						 | 
						
							
							
								
								Remove useless destroy methods
							
							
							
							
							
						 | 
						
							2012-02-17 12:26:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								9cd3cbc478
								
							
						 | 
						
							
							
								
								Modifications for design, pages, page_parts…
							
							
							
							
							
							
							
							Move orbit_bar out of kernel.js 
							
						 | 
						
							2012-02-17 02:09:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4906894fb5
								
							
						 | 
						
							
							
								
								Page edit wasn't showing when module_app was nil
							
							
							
							
							
						 | 
						
							2012-01-31 16:35:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								d3ca1647be
								
							
						 | 
						
							
							
								
								fix page form bugs
							
							
							
							
							
						 | 
						
							2011-12-23 13:54:28 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								a09f8e4551
								
							
						 | 
						
							
							
								
								merge with november_presentation
							
							
							
							
							
						 | 
						
							2011-12-20 16:47:17 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								75a3c4d5b1
								
							
						 | 
						
							
							
								
								Modify assets
							
							
							
							
							
							
							
							Each layout has a manifest for css and js 
							
						 | 
						
							2011-12-05 09:54:41 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								151f005815
								
							
						 | 
						
							
							
								
								structure.css -> default.css
							
							
							
							
							
							
							
							Themes are optional, a theme overrides style in default.css 
							
						 | 
						
							2011-09-05 15:18:36 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								32849f1d1b
								
							
						 | 
						
							
							
								
								Set default design to first design
							
							
							
							
							
						 | 
						
							2011-08-25 15:08:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								c427e2af14
								
							
						 | 
						
							
							
								
								Page form with drop down. Modifications for Designs
							
							
							
							
							
						 | 
						
							2011-08-25 08:13:38 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								27d47215e9
								
							
						 | 
						
							
							
								
								Modify edit page. Still need to handle "form" with drop down lists
							
							
							
							
							
						 | 
						
							2011-08-24 02:34:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								1d214bedec
								
							
						 | 
						
							
							
								
								Revert "Revert "Clean code and add 'name' in theme.rb""
							
							
							
							
							
							
							
							This reverts commit 00813c9060. 
							
						 | 
						
							2011-08-24 02:06:27 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								00813c9060
								
							
						 | 
						
							
							
								
								Revert "Clean code and add 'name' in theme.rb"
							
							
							
							
							
							
							
							This reverts commit 608180646b. 
							
						 | 
						
							2011-08-24 02:04:54 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								608180646b
								
							
						 | 
						
							
							
								
								Clean code and add 'name' in theme.rb
							
							
							
							
							
						 | 
						
							2011-08-24 01:39:28 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								247b8ec4dc
								
							
						 | 
						
							
							
								
								HTML code can be modify (paser: update)
							
							
							
							
							
						 | 
						
							2011-06-10 10:31:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								7b5ea870a0
								
							
						 | 
						
							
							
								
								Delete page.
							
							
							
							
							
						 | 
						
							2011-06-01 12:00:41 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								ddc7c74436
								
							
						 | 
						
							
							
								
								Create page.
							
							
							
							
							
						 | 
						
							2011-06-01 10:24:14 +08:00 |