Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ad3ec43a00
								
							
						 | 
						
							
							
								
								Remove comments in migrate task
							
							
							
							
							
						 | 
						
							2012-07-27 19:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								804695749d
								
							
						 | 
						
							
							
								
								Fix bugs after removal of i18n_variable
							
							
							
							
							
						 | 
						
							2012-07-27 19:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								780386d7f1
								
							
						 | 
						
							
							
								
								Remove i18n_variable for parser
							
							
							
							
							
						 | 
						
							2012-07-27 19:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								53cae0a9ee
								
							
						 | 
						
							
							
								
								Remove i18n_variable for views
							
							
							
							
							
						 | 
						
							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
							
						 | 
						
							
							
							
							
							
								
							
							
								327996a7b0
								
							
						 | 
						
							
							
								
								Task part for i18n_variable removal for web_resource
							
							
							
							
							
						 | 
						
							2012-07-27 19:12:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								207b0c5886
								
							
						 | 
						
							
							
								
								Remove i18n_variable for web_resource
							
							
							
							
							
						 | 
						
							2012-07-27 19:12:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								30624c0bd8
								
							
						 | 
						
							
							
								
								Fix error in i18n_variable removal for page_content
							
							
							
							
							
						 | 
						
							2012-07-27 19:12:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								50813eb57d
								
							
						 | 
						
							
							
								
								Remove i18n_variable for page_content
							
							
							
							
							
						 | 
						
							2012-07-27 19:12:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								61c1af7316
								
							
						 | 
						
							
							
								
								Remove i18n_variable for news
							
							
							
							
							
						 | 
						
							2012-07-27 19:12:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								8eec7b4dac
								
							
						 | 
						
							
							
								
								Fix announcement for i18n_variable removal
							
							
							
							
							
						 | 
						
							2012-07-27 19:12:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e2ebd48b22
								
							
						 | 
						
							
							
								
								Remove i18n_variable for announcement
							
							
							
							
							
						 | 
						
							2012-07-27 19:12:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								d589a1b522
								
							
						 | 
						
							
							
								
								fix for 標題後台為「校園新聞」,前台顯示為「新聞」 該頁面為列表,最上方卻出現「搜尋結果」? from Mr.張
							
							
							
							
							
						 | 
						
							2012-07-27 07:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								eed7b78357
								
							
						 | 
						
							
							
								
								fix for loading failed
							
							
							
							
							
						 | 
						
							2012-07-27 05:45:39 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								7c3cc30784
								
							
						 | 
						
							
							
								
								fix for rake encoding
							
							
							
							
							
						 | 
						
							2012-07-26 16:58:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								30cc3431b9
								
							
						 | 
						
							
							
								
								rename sub roles
							
							
							
							
							
						 | 
						
							2012-07-26 14:12:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9846fb9f6f
								
							
						 | 
						
							
							
								
								Merge branch 'redis_search' of github.com:Rulingcom/NCCU into redis_search
							
							
							
							
							
						 | 
						
							2012-07-26 12:13:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								fb1f08327d
								
							
						 | 
						
							
							
								
								fix redis search limit for 10 items
							
							
							
							
							
						 | 
						
							2012-07-26 12:12:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								cc60ff8b4c
								
							
						 | 
						
							
							
								
								fix for redis search limit 10 items
							
							
							
							
							
						 | 
						
							2012-07-26 12:09:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4768da3c7a
								
							
						 | 
						
							
							
								
								fix announcement loading failed caused by impression. disable pinyin search.
							
							
							
							
							
						 | 
						
							2012-07-25 18:26:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								87549d4e1f
								
							
						 | 
						
							
							
								
								fix for nil value
							
							
							
							
							
						 | 
						
							2012-07-25 17:49:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								13ec25ed10
								
							
						 | 
						
							
							
								
								fix for orbit bar broken
							
							
							
							
							
						 | 
						
							2012-07-25 17:44:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								97b4eee798
								
							
						 | 
						
							
							
								
								full site search with google
							
							
							
							
							
						 | 
						
							2012-07-25 17:20:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								25f4e292e6
								
							
						 | 
						
							
							
								
								add not found for no result
							
							
							
							
							
						 | 
						
							2012-07-25 13:58:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								98fd9223a8
								
							
						 | 
						
							
							
								
								open search for news
							
							
							
							
							
						 | 
						
							2012-07-25 10:42:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								397b444390
								
							
						 | 
						
							
							
								
								fix for bugs
							
							
							
							
							
						 | 
						
							2012-07-24 20:58:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								834fcddc52
								
							
						 | 
						
							
							
								
								Add data migration for search widget for news and announcement.
							
							
							
							
							
						 | 
						
							2012-07-20 16:30:43 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 |