Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								b7cc38c195
								
							
						 | 
						
							
							
								
								Remove comments in migrate task
							
							
							
							
							
						 | 
						
							2012-07-26 06:40:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								b6f2325de6
								
							
						 | 
						
							
							
								
								Fix bugs after removal of i18n_variable
							
							
							
							
							
						 | 
						
							2012-07-26 06:30:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								74c135f42f
								
							
						 | 
						
							
							
								
								Remove i18n_variable for parser
							
							
							
							
							
						 | 
						
							2012-07-26 06:02:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5713df685d
								
							
						 | 
						
							
							
								
								Remove i18n_variable for views
							
							
							
							
							
						 | 
						
							2012-07-26 05:58:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								acb7fe0dea
								
							
						 | 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models
							
							
							
							
							
						 | 
						
							2012-07-26 05:07:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								94337a58d5
								
							
						 | 
						
							
							
								
								Task part for i18n_variable removal for web_resource
							
							
							
							
							
						 | 
						
							2012-07-26 04:37:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a1cf0a3eb6
								
							
						 | 
						
							
							
								
								Remove i18n_variable for web_resource
							
							
							
							
							
						 | 
						
							2012-07-26 04:10:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3466a19362
								
							
						 | 
						
							
							
								
								Fix error in i18n_variable removal for page_content
							
							
							
							
							
						 | 
						
							2012-07-26 04:10:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4a6b9fbe64
								
							
						 | 
						
							
							
								
								Remove i18n_variable for page_content
							
							
							
							
							
						 | 
						
							2012-07-26 03:47:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e33afc0822
								
							
						 | 
						
							
							
								
								Remove i18n_variable for news
							
							
							
							
							
						 | 
						
							2012-07-26 03:37:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								875fad848c
								
							
						 | 
						
							
							
								
								Fix announcement for i18n_variable removal
							
							
							
							
							
						 | 
						
							2012-07-26 03:29:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								b9cf5263f6
								
							
						 | 
						
							
							
								
								Remove i18n_variable for announcement
							
							
							
							
							
						 | 
						
							2012-07-26 02:27:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								033667f99b
								
							
						 | 
						
							
							
								
								fix for missing disable category at frontend and widget
							
							
							
							
							
						 | 
						
							2012-07-17 11:26:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								dcf3150deb
								
							
						 | 
						
							
							
								
								Merge branch 'cache_test'
							
							
							
							
							
						 | 
						
							2012-07-17 10:26:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a7b92ed3e8
								
							
						 | 
						
							
							
								
								fix  rejection for announcement and news.
							
							
							
							
							
						 | 
						
							2012-07-17 10:22:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a4b1681d39
								
							
						 | 
						
							
							
								
								fix  rejection for announcement and news.
							
							
							
							
							
						 | 
						
							2012-07-17 10:21:46 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								85d6bbe1c9
								
							
						 | 
						
							
							
								
								add i18n variable. fix web_links for disable category
							
							
							
							
							
						 | 
						
							2012-07-11 17:56:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ca2c056a07
								
							
						 | 
						
							
							
								
								fix for not displaying bulletin at fronted when it's parent category is disable
							
							
							
							
							
						 | 
						
							2012-07-11 17:17:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								98b274d9dd
								
							
						 | 
						
							
							
								
								add   slave_ok: true to nccu172
							
							
							
							
							
						 | 
						
							2012-07-09 17:03:26 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								9b86e8f24e
								
							
						 | 
						
							
							
								
								fix mid site connection
							
							
							
							
							
						 | 
						
							2012-07-06 18:24:25 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								edef51d58c
								
							
						 | 
						
							
							
								
								DM for archive  bulletin categroy
							
							
							
							
							
						 | 
						
							2012-07-04 17:56:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								32480e10ed
								
							
						 | 
						
							
							
								
								en translation
							
							
							
							
							
						 | 
						
							2012-07-04 17:43:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ae2cbb728e
								
							
						 | 
						
							
							
								
								archive for announcement
							
							
							
							
							
						 | 
						
							2012-07-04 17:36:51 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								d0632b2e4c
								
							
						 | 
						
							
							
								
								change name format
							
							
							
							
							
						 | 
						
							2012-07-03 16:05:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								56ecf9c69b
								
							
						 | 
						
							
							
								
								remove remember for nccu
							
							
							
							
							
						 | 
						
							2012-07-03 15:59:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4fe92b844e
								
							
						 | 
						
							
							
								
								Add sorting order for NCCU request
							
							
							
							
							
						 | 
						
							2012-07-03 15:47:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4014f8ee47
								
							
						 | 
						
							
							
								
								fix over queue at resque
							
							
							
							
							
						 | 
						
							2012-07-03 10:51:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1278581a82
								
							
						 | 
						
							
							
								
								add rescue job . can work with init script
							
							
							
							
							
						 | 
						
							2012-06-29 17:42:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								c0b3798bad
								
							
						 | 
						
							
							
								
								fix for date for qu menu
							
							
							
							
							
						 | 
						
							2012-06-29 11:41:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								f66c3d9c0c
								
							
						 | 
						
							
							
								
								fix bugs.
							
							
							
							
							
						 | 
						
							2012-06-29 11:17:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								6c4c1046bc
								
							
						 | 
						
							
							
								
								fix date select cause error back to the time of Jesus
							
							
							
							
							
						 | 
						
							2012-06-28 15:19:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								58a11ff569
								
							
						 | 
						
							
							
								
								fix javascript for new and anc link removing
							
							
							
							
							
						 | 
						
							2012-06-28 13:50:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								243c9e2946
								
							
						 | 
						
							
							
								
								fix relation between bulletin and category	 (news also)
							
							
							
							
							
						 | 
						
							2012-06-27 15:16:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								04a23db745
								
							
						 | 
						
							
							
								
								fix invalid invalid byte sequence in US-ASCII for js files
							
							
							
							
							
						 | 
						
							2012-06-27 14:27:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								55449efb35
								
							
						 | 
						
							
							
								
								fix 新聞與公告QA
							
							
							
							
							
							
							
							1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
	2.優先處理-編輯中的檔案列表,無法刪除
	3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除 
							
						 | 
						
							2012-06-27 14:21:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4c4929c20a
								
							
						 | 
						
							
							
								
								Fix js for news quick_edit and edit for files
							
							
							
							
							
						 | 
						
							2012-06-27 11:36:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								6a4abc6c43
								
							
						 | 
						
							
							
								
								fix news error
							
							
							
							
							
						 | 
						
							2012-06-27 09:59:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								83a72bdf6e
								
							
						 | 
						
							
							
								
								fix for announcement
							
							
							
							
							
						 | 
						
							2012-06-26 18:23: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
							
						 | 
						
							
							
							
							
							
								
							
							
								df722ba90f
								
							
						 | 
						
							
							
								
								change display of user dept  for showing announcement
							
							
							
							
							
						 | 
						
							2012-06-26 16:21:18 +08:00 |