56ecf9c69b 
								
							 
						 
						
							
							
								
								remove remember for nccu  
							
							
							
						 
						
							2012-07-03 15:59:25 +08:00  
				
					
						
							
							
								 
						
							
								4fe92b844e 
								
							 
						 
						
							
							
								
								Add sorting order for NCCU request  
							
							
							
						 
						
							2012-07-03 15:47:28 +08:00  
				
					
						
							
							
								 
						
							
								4014f8ee47 
								
							 
						 
						
							
							
								
								fix over queue at resque  
							
							
							
						 
						
							2012-07-03 10:51:26 +08:00  
				
					
						
							
							
								 
						
							
								1278581a82 
								
							 
						 
						
							
							
								
								add rescue job . can work with init script  
							
							
							
						 
						
							2012-06-29 17:42:36 +08:00  
				
					
						
							
							
								 
						
							
								c0b3798bad 
								
							 
						 
						
							
							
								
								fix for date for qu menu  
							
							
							
						 
						
							2012-06-29 11:41:06 +08:00  
				
					
						
							
							
								 
						
							
								f66c3d9c0c 
								
							 
						 
						
							
							
								
								fix bugs.  
							
							
							
						 
						
							2012-06-29 11:17:35 +08:00  
				
					
						
							
							
								 
						
							
								6c4c1046bc 
								
							 
						 
						
							
							
								
								fix date select cause error back to the time of Jesus  
							
							
							
						 
						
							2012-06-28 15:19:51 +08:00  
				
					
						
							
							
								 
						
							
								58a11ff569 
								
							 
						 
						
							
							
								
								fix javascript for new and anc link removing  
							
							
							
						 
						
							2012-06-28 13:50:11 +08:00  
				
					
						
							
							
								 
						
							
								243c9e2946 
								
							 
						 
						
							
							
								
								fix relation between bulletin and category	 (news also)  
							
							
							
						 
						
							2012-06-27 15:16:16 +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  
				
					
						
							
							
								 
						
							
								83a72bdf6e 
								
							 
						 
						
							
							
								
								fix for announcement  
							
							
							
						 
						
							2012-06-26 18:23:44 +08:00  
				
					
						
							
							
								 
						
							
								818c58c1ee 
								
							 
						 
						
							
							
								
								fix for 新聞與公告QA  
							
							... 
							
							
							
							1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位 
							
						 
						
							2012-06-26 17:46:02 +08:00  
				
					
						
							
							
								 
						
							
								df722ba90f 
								
							 
						 
						
							
							
								
								change display of user dept  for showing announcement  
							
							
							
						 
						
							2012-06-26 16:21:18 +08:00  
				
					
						
							
							
								 
						
							
								2b54067ecb 
								
							 
						 
						
							
							
								
								change order of display menu of categories of news_bulletin and bulletin.  
							
							
							
						 
						
							2012-06-26 14:28:21 +08:00  
				
					
						
							
							
								 
						
							
								56b1bd9eaa 
								
							 
						 
						
							
							
								
								add translation  
							
							
							
						 
						
							2012-06-26 10:57:51 +08:00  
				
					
						
							
							
								 
						
							
								73fbed8837 
								
							 
						 
						
							
							
								
								fix 1.page_content user empty problem  
							
							... 
							
							
							
							2.add i18n variable for news and announcement 
							
						 
						
							2012-06-26 10:04:40 +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  
				
					
						
							
							
								 
						
							
								86a4a6cbe2 
								
							 
						 
						
							
							
								
								put ldap setting into config file. should load be rails env. Also make god config more friendly.  
							
							
							
						 
						
							2012-06-22 14:32:28 +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  
				
					
						
							
							
								 
						
							
								a663231c8c 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-25 10:01:41 +08:00  
				
					
						
							
							
								 
						
							
								75b67dddf5 
								
							 
						 
						
							
							
								
								Fix date bugs  
							
							
							
						 
						
							2012-05-25 09:59:39 +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  
				
					
						
							
							
								 
						
							
								1c35e38097 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							
							
						 
						
							2012-05-22 16:54:35 +08:00  
				
					
						
							
							
								 
						
							
								dd4c1697cd 
								
							 
						 
						
							
							
								
								Fix bug when object_auth was only built but not created  
							
							
							
						 
						
							2012-05-22 16:52:12 +08:00  
				
					
						
							
							
								 
						
							
								874a89d99b 
								
							 
						 
						
							
							
								
								Ray's fix for structure side_bar  
							
							
							
						 
						
							2012-05-22 16:48:57 +08:00  
				
					
						
							
							
								 
						
							
								f497851fe3 
								
							 
						 
						
							
							
								
								Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg  
							
							
							
						 
						
							2012-05-22 16:12:00 +08:00  
				
					
						
							
							
								 
						
							
								e0260542d3 
								
							 
						 
						
							
							
								
								fix code  
							
							
							
						 
						
							2012-05-22 16:11:52 +08:00  
				
					
						
							
							
								 
						
							
								d0b030c47d 
								
							 
						 
						
							
							
								
								Put inc/ajax_setting in new_admin  
							
							... 
							
							
							
							Fix callback for link on save 
							
						 
						
							2012-05-22 16:11:00 +08:00  
				
					
						
							
							
								 
						
							
								1bbf89a354 
								
							 
						 
						
							
							
								
								fix code  
							
							
							
						 
						
							2012-05-22 15:54:46 +08:00  
				
					
						
							
							
								 
						
							
								ef72a2330c 
								
							 
						 
						
							
							
								
								Merge branch '0522_nccu_emg' of github.com:Rulingcom/orbit into 0522_nccu_emg  
							
							
							
						 
						
							2012-05-22 15:00:37 +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  
				
					
						
							
							
								 
						
							
								361722f252 
								
							 
						 
						
							
							
								
								fix orbit core to adopt current user behavior  
							
							
							
						 
						
							2012-05-22 14:59:54 +08:00