c4722d0d2f 
								
							 
						 
						
							
							
								
								remove cache  
							
							
							
						 
						
							2012-07-26 15:44:53 +08:00  
				
					
						
							
							
								 
						
							
								b5dc7515f7 
								
							 
						 
						
							
							
								
								Fix bugs after i18n_variable removal  
							
							
							
						 
						
							2012-07-26 13:27:27 +08:00  
				
					
						
							
							
								 
						
							
								b6f2325de6 
								
							 
						 
						
							
							
								
								Fix bugs after removal of i18n_variable  
							
							
							
						 
						
							2012-07-26 06:30:26 +08:00  
				
					
						
							
							
								 
						
							
								5713df685d 
								
							 
						 
						
							
							
								
								Remove i18n_variable for views  
							
							
							
						 
						
							2012-07-26 05:58:09 +08:00  
				
					
						
							
							
								 
						
							
								acb7fe0dea 
								
							 
						 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models  
							
							
							
						 
						
							2012-07-26 05:07:32 +08:00  
				
					
						
							
							
								 
						
							
								b9cf5263f6 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							
							
						 
						
							2012-07-26 02:27:43 +08:00  
				
					
						
							
							
								 
						
							
								2ae6b54a45 
								
							 
						 
						
							
							
								
								fix for not working cache  
							
							
							
						 
						
							2012-07-13 18:32:17 +08:00  
				
					
						
							
							
								 
						
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							
							
						 
						
							2012-07-13 15:36:10 +08:00  
				
					
						
							
							
								 
						
							
								0e65e379b0 
								
							 
						 
						
							
							
								
								cache first commit  
							
							
							
						 
						
							2012-07-12 11:47:24 +08:00  
				
					
						
							
							
								 
						
							
								773371e885 
								
							 
						 
						
							
							
								
								fix from messy search  
							
							
							
						 
						
							2012-07-09 16:48:23 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								49862e70f9 
								
							 
						 
						
							
							
								
								hide category at front end  
							
							
							
						 
						
							2012-07-09 12:05:21 +08:00  
				
					
						
							
							
								 
						
							
								56caf4b34e 
								
							 
						 
						
							
							
								
								category disable for backend  
							
							
							
						 
						
							2012-07-06 18:11:55 +08:00  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
				
					
						
							
							
								 
						
							
								ae2cbb728e 
								
							 
						 
						
							
							
								
								archive for announcement  
							
							
							
						 
						
							2012-07-04 17:36:51 +08:00  
				
					
						
							
							
								 
						
							
								f7107936d0 
								
							 
						 
						
							
							
								
								fix for checking @rulingcom.com  
							
							
							
						 
						
							2012-07-03 18:21:48 +08:00  
				
					
						
							
							
								 
						
							
								9607b5bbfd 
								
							 
						 
						
							
							
								
								rulingcom帳號不透過LDAP認證  
							
							
							
						 
						
							2012-07-03 18:12:44 +08:00  
				
					
						
							
							
								 
						
							
								d0632b2e4c 
								
							 
						 
						
							
							
								
								change name format  
							
							
							
						 
						
							2012-07-03 16:05:19 +08:00  
				
					
						
							
							
								 
						
							
								56ecf9c69b 
								
							 
						 
						
							
							
								
								remove remember for nccu  
							
							
							
						 
						
							2012-07-03 15:59:25 +08:00  
				
					
						
							
							
								 
						
							
								4014f8ee47 
								
							 
						 
						
							
							
								
								fix over queue at resque  
							
							
							
						 
						
							2012-07-03 10:51:26 +08:00  
				
					
						
							
							
								 
						
							
								04a23db745 
								
							 
						 
						
							
							
								
								fix invalid invalid byte sequence in US-ASCII for js files  
							
							
							
						 
						
							2012-06-27 14:27:27 +08:00  
				
					
						
							
							
								 
						
							
								55449efb35 
								
							 
						 
						
							
							
								
								fix 新聞與公告QA  
							
							... 
							
							
							
							1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
	2.優先處理-編輯中的檔案列表,無法刪除
	3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除 
							
						 
						
							2012-06-27 14:21:06 +08:00  
				
					
						
							
							
								 
						
							
								4c4929c20a 
								
							 
						 
						
							
							
								
								Fix js for news quick_edit and edit for files  
							
							
							
						 
						
							2012-06-27 11:36:18 +08:00  
				
					
						
							
							
								 
						
							
								6a4abc6c43 
								
							 
						 
						
							
							
								
								fix news error  
							
							
							
						 
						
							2012-06-27 09:59:32 +08:00  
				
					
						
							
							
								 
						
							
								818c58c1ee 
								
							 
						 
						
							
							
								
								fix for 新聞與公告QA  
							
							... 
							
							
							
							1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位 
							
						 
						
							2012-06-26 17:46:02 +08:00  
				
					
						
							
							
								 
						
							
								56b1bd9eaa 
								
							 
						 
						
							
							
								
								add translation  
							
							
							
						 
						
							2012-06-26 10:57:51 +08:00  
				
					
						
							
							
								 
						
							
								ffd95ee1fd 
								
							 
						 
						
							
							
								
								fix  
							
							... 
							
							
							
							新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion.   may need to run:
 AppManager.all.collect{|am|  am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB. 
							
						 
						
							2012-06-25 16:23:16 +08:00  
				
					
						
							
							
								 
						
							
								a36f73bafc 
								
							 
						 
						
							
							
								
								fix 0621 Trello:"171 頁面管理不能使用"  
							
							
							
						 
						
							2012-06-22 18:19:40 +08:00  
				
					
						
							
							
								 
						
							
								3f95fe4f13 
								
							 
						 
						
							
							
								
								tmp commit for search.  start nccu0621 first  
							
							
							
						 
						
							2012-06-22 11:34:10 +08:00  
				
					
						
							
							
								 
						
							
								cb17fe0825 
								
							 
						 
						
							
							
								
								Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working  
							
							
							
						 
						
							2012-06-20 14:50:51 +08:00  
				
					
						
							
							
								 
						
							
								8dd1ab32c1 
								
							 
						 
						
							
							
								
								Add this toolbar, and nccu calendar fix  
							
							
							
						 
						
							2012-06-04 16:51:29 +08:00  
				
					
						
							
							
								 
						
							
								2f500ff460 
								
							 
						 
						
							
							
								
								For non-login user,show no drop down menu and return to home after press orbit button.  
							
							
							
						 
						
							2012-05-29 16:33:38 +08:00  
				
					
						
							
							
								 
						
							
								4f484599b7 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								ff620b41aa 
								
							 
						 
						
							
							
								
								add script for cache user  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								6f0cf0e92e 
								
							 
						 
						
							
							
								
								cache privilege user list.  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								3480fa2545 
								
							 
						 
						
							
							
								
								Fix login and label.  Check sync jobs and update info function.  
							
							
							
						 
						
							2012-05-24 17:01:00 +08:00  
				
					
						
							
							
								 
						
							
								c062b43069 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-23 12:11:38 +08:00  
				
					
						
							
							
								 
						
							
								71d4241a2f 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							
							
						 
						
							2012-05-23 12:11:26 +08:00  
				
					
						
							
							
								 
						
							
								006b84f6a1 
								
							 
						 
						
							
							
								
								Ray's fix for ie  
							
							
							
						 
						
							2012-05-23 12:06:09 +08:00  
				
					
						
							
							
								 
						
							
								7c44e94285 
								
							 
						 
						
							
							
								
								Order list by created_at desc  
							
							... 
							
							
							
							Add best image size in news new 
							
						 
						
							2012-05-23 11:46:19 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								eab82269c1 
								
							 
						 
						
							
							
								
								Remove seconds from date display  
							
							
							
						 
						
							2012-05-22 20:19:04 +08:00  
				
					
						
							
							
								 
						
							
								d6b92fc604 
								
							 
						 
						
							
							
								
								Fixed bugs for nccu  
							
							
							
						 
						
							2012-05-22 20:00:07 +08:00  
				
					
						
							
							
								 
						
							
								11a371cbb9 
								
							 
						 
						
							
							
								
								Fix destroy in structure  
							
							... 
							
							
							
							Fix sorting 
							
						 
						
							2012-05-22 17:55:45 +08:00  
				
					
						
							
							
								 
						
							
								541aa5831e 
								
							 
						 
						
							
							
								
								JS changes to load drag and drop  
							
							
							
						 
						
							2012-05-22 17:37:15 +08:00  
				
					
						
							
							
								 
						
							
								874a89d99b 
								
							 
						 
						
							
							
								
								Ray's fix for structure side_bar  
							
							
							
						 
						
							2012-05-22 16:48:57 +08:00  
				
					
						
							
							
								 
						
							
								d0b030c47d 
								
							 
						 
						
							
							
								
								Put inc/ajax_setting in new_admin  
							
							... 
							
							
							
							Fix callback for link on save 
							
						 
						
							2012-05-22 16:11:00 +08:00  
				
					
						
							
							
								 
						
							
								99bcdf6e1e 
								
							 
						 
						
							
							
								
								clean up unless code  
							
							
							
						 
						
							2012-05-22 14:59:54 +08:00  
				
					
						
							
							
								 
						
							
								79f67208fa 
								
							 
						 
						
							
							
								
								js for preventing user do stupid things durning ajax  
							
							
							
						 
						
							2012-05-22 14:59:54 +08:00  
				
					
						
							
							
								 
						
							
								5e9836f371 
								
							 
						 
						
							
							
								
								Changes for structure  
							
							
							
						 
						
							2012-05-22 14:45:49 +08:00