|  Matthew K. Fu JuYuan | a657a7d615 | remove cache | 2012-07-27 19:14:24 +08:00 | 
				
					
						|  Christophe Vilayphiou | a8cc581279 | Sitemap done for backend and fronted | 2012-07-27 19:13:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | 934b515914 | Sitemap with main | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | 38804bd118 | Add disable for main title | 2012-07-27 19:13:39 +08:00 | 
				
					
						|  Christophe Vilayphiou | db9c4c0e10 | Partial sitemap | 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 | e2ebd48b22 | Remove i18n_variable for announcement | 2012-07-27 19:12:58 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | de831f1f96 | disable homepage cache for english page | 2012-07-27 05:08:24 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f9bdb4a327 | New and Announcement search. Disabled impression. | 2012-07-20 15:47:40 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 2ae6b54a45 | fix for not working cache | 2012-07-13 18:32:17 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 4daf36908c | working cache | 2012-07-13 15:36:10 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0e65e379b0 | cache first commit | 2012-07-12 11:47:24 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 773371e885 | fix from messy search | 2012-07-09 16:48:23 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 09d46f2f75 | NCCU 上傳版本  0709 Merge branch 'nccu0621'
Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb | 2012-07-09 16:02:59 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 49862e70f9 | hide category at front end | 2012-07-09 12:05:21 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 56caf4b34e | category disable for backend | 2012-07-06 18:11:55 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | c5fdff764e | orbit disable object for categories | 2012-07-05 16:00:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f7107936d0 | fix for checking @rulingcom.com | 2012-07-03 18:21:48 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 9607b5bbfd | rulingcom帳號不透過LDAP認證 | 2012-07-03 18:12:44 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 818c58c1ee | fix for 新聞與公告QA 1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位 | 2012-06-26 17:46:02 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | cb17fe0825 | Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working | 2012-06-20 14:50:51 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 4f484599b7 | Clean up code , cache other auths.  Fix sidebar | 2012-05-29 15:23:50 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 6f0cf0e92e | cache privilege user list. | 2012-05-29 15:23:50 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 3480fa2545 | Fix login and label.  Check sync jobs and update info function. | 2012-05-24 17:01:00 +08:00 | 
				
					
						|  Christophe Vilayphiou | c062b43069 | Merge branch 'design_team' into ldap | 2012-05-23 12:11:38 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7c44e94285 | Order list by created_at desc Add best image size in news new | 2012-05-23 11:46:19 +08:00 | 
				
					
						|  Christophe Vilayphiou | f1c8bed29d | Merge branch 'design_team' into ldap Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb | 2012-05-22 20:33:07 +08:00 | 
				
					
						|  Christophe Vilayphiou | d6b92fc604 | Fixed bugs for nccu | 2012-05-22 20:00:07 +08:00 | 
				
					
						|  Christophe Vilayphiou | 11a371cbb9 | Fix destroy in structure Fix sorting | 2012-05-22 17:55:45 +08:00 | 
				
					
						|  Christophe Vilayphiou | 5e9836f371 | Changes for structure | 2012-05-22 14:45:49 +08:00 | 
				
					
						|  Christophe Vilayphiou | c4d7079059 | Fix's Matt code for not showing bulletins in index | 2012-05-21 18:10:03 +08:00 | 
				
					
						|  Christophe Vilayphiou | 815e6a8361 | Fix matt's code and add it to filters | 2012-05-19 03:19:55 +08:00 | 
				
					
						|  Matt | 6a022c90da | Changes on nccu | 2012-05-18 15:20:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 5f6696a358 | fix view for different_user for ad_banner. add field 'best size' for ad_banner within form | 2012-05-18 14:19:13 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7c6b807170 | Change impression count to exclude when :referrer is nil | 2012-05-18 14:13:11 +08:00 | 
				
					
						|  Christophe Vilayphiou | a4afd5c1d3 | Merge branch 'design_team' into ldap | 2012-05-18 10:36:32 +08:00 | 
				
					
						|  Christophe Vilayphiou | 8ad7f70822 | Proof i18n_variable for categories | 2012-05-18 10:28:28 +08:00 | 
				
					
						|  Christophe Vilayphiou | 17b6a70506 | Merge branch 'design_team' into ldap | 2012-05-17 23:36:24 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 16ada34585 | fix ad_banner.    new ad_image with best size from ad_banner. content editable at tab | 2012-05-17 23:35:46 +08:00 | 
				
					
						|  Christophe Vilayphiou | 79f484300e | Merge branch 'design_team' into ldap | 2012-05-17 18:32:06 +08:00 | 
				
					
						|  Christophe Vilayphiou | c9cbec4239 | Asset changes, add description | 2012-05-17 18:31:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | eba4671733 | Merge branch 'design_team' into ldap | 2012-05-17 06:46:29 +08:00 | 
				
					
						|  Christophe Vilayphiou | cd1640482a | Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509 Conflicts:
	app/views/layouts/_side_bar.html.erb | 2012-05-17 06:45:30 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0f354b8ccc | fix ad_image size hints.   fix orbit backend controller error when changing language. | 2012-05-17 06:44:14 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a3acd865d7 | AdBanner reopen new banner and delete.   Rename title with content editable tag. | 2012-05-17 06:44:14 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 7f2564a81e | Fix sidebar and hide some links by roles | 2012-05-17 06:43:39 +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 | 
				
					
						|  Christophe Vilayphiou | 6b9c8eb15d | Merge branch 'design_team' into ldap | 2012-05-17 06:31:57 +08:00 | 
				
					
						|  Christophe Vilayphiou | 26292f0dcc | Asset upload | 2012-05-17 06:28:29 +08:00 |