0645f04240 
								
							 
						 
						
							
							
								
								Ray's change in css  
							
							
							
						 
						
							2012-08-08 18:11:18 +08:00  
				
					
						
							
							
								 
						
							
								62ba8c9f18 
								
							 
						 
						
							
							
								
								Fix bugs on 172:180  
							
							
							
						 
						
							2012-08-08 17:56:00 +08:00  
				
					
						
							
							
								 
						
							
								e8317e0a4b 
								
							 
						 
						
							
							
								
								1.Remove category column when category is specified  
							
							... 
							
							
							
							2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable. 
							
						 
						
							2012-08-08 14:46:08 +08:00  
				
					
						
							
							
								 
						
							
								b4c2dfe0ef 
								
							 
						 
						
							
							
								
								Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share  
							
							
							
						 
						
							2012-08-08 11:53:47 +08:00  
				
					
						
							
							
								 
						
							
								3fdff9357c 
								
							 
						 
						
							
							
								
								Merge branch 'fb_share' of github.com:Rulingcom/NCCU into fb_share  
							
							
							
						 
						
							2012-08-08 11:52:11 +08:00  
				
					
						
							
							
								 
						
							
								fbb53cca36 
								
							 
						 
						
							
							
								
								Ray's changes for sitemap backend  
							
							
							
						 
						
							2012-08-08 11:51:20 +08:00  
				
					
						
							
							
								 
						
							
								05e61b63bb 
								
							 
						 
						
							
							
								
								Fix fb share, redirect with js when the page is not requested by fb but by user  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								a03d1ad10b 
								
							 
						 
						
							
							
								
								Change for getting url from key  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								6cfdf0f25a 
								
							 
						 
						
							
							
								
								Change the way the orig_url is passed to fb  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								4bed925e0f 
								
							 
						 
						
							
							
								
								Try fb from override and generated page  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								acf4446523 
								
							 
						 
						
							
							
								
								Add meta to head for fb share  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								85a556a4a2 
								
							 
						 
						
							
							
								
								first version of fb_share  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								c6c8187bda 
								
							 
						 
						
							
							
								
								Changes for design: menu, frontend news and announcement  
							
							
							
						 
						
							2012-08-08 10:53:04 +08:00  
				
					
						
							
							
								 
						
							
								9982fd880f 
								
							 
						 
						
							
							
								
								Update the path when name is changed in item.rb  
							
							
							
						 
						
							2012-08-08 10:53:04 +08:00  
				
					
						
							
							
								 
						
							
								c8dcc9734d 
								
							 
						 
						
							
							
								
								Change width for site map frontend, add link for more in announcement widget  
							
							
							
						 
						
							2012-08-08 10:53:04 +08:00  
				
					
						
							
							
								 
						
							
								292105bdf1 
								
							 
						 
						
							
							
								
								Remove remotipart (not working with ie9) the upload is working except that the pop-up does not disappear in ie  
							
							
							
						 
						
							2012-08-08 10:53:04 +08:00  
				
					
						
							
							
								 
						
							
								86a3d4a4b1 
								
							 
						 
						
							
							
								
								Remove console.log  
							
							
							
						 
						
							2012-08-08 10:52:22 +08:00  
				
					
						
							
							
								 
						
							
								ecc5c39840 
								
							 
						 
						
							
							
								
								Fix remote upload file for tinymce  
							
							
							
						 
						
							2012-08-08 10:51:54 +08:00  
				
					
						
							
							
								 
						
							
								e9de0e24b4 
								
							 
						 
						
							
							
								
								Fix fb share, redirect with js when the page is not requested by fb but by user  
							
							
							
						 
						
							2012-08-08 10:12:21 +08:00  
				
					
						
							
							
								 
						
							
								db16fdc7b5 
								
							 
						 
						
							
							
								
								Change for getting url from key  
							
							
							
						 
						
							2012-08-08 07:46:10 +08:00  
				
					
						
							
							
								 
						
							
								f7e6703d5f 
								
							 
						 
						
							
							
								
								Change the way the orig_url is passed to fb  
							
							
							
						 
						
							2012-08-08 06:50:28 +08:00  
				
					
						
							
							
								 
						
							
								fc560f4205 
								
							 
						 
						
							
							
								
								Try fb from override and generated page  
							
							
							
						 
						
							2012-08-08 05:40:50 +08:00  
				
					
						
							
							
								 
						
							
								3cb182ff8e 
								
							 
						 
						
							
							
								
								Add meta to head for fb share  
							
							
							
						 
						
							2012-08-08 03:10:26 +08:00  
				
					
						
							
							
								 
						
							
								4660c26b7a 
								
							 
						 
						
							
							
								
								fix for ie8,9 for tinymce  
							
							
							
						 
						
							2012-08-07 20:55:18 +08:00  
				
					
						
							
							
								 
						
							
								8ea7bf75cd 
								
							 
						 
						
							
							
								
								Fix uploader, ie9 ok, not ie8  
							
							
							
						 
						
							2012-08-07 17:32:15 +08:00  
				
					
						
							
							
								 
						
							
								1c62c1a799 
								
							 
						 
						
							
							
								
								first version of fb_share  
							
							
							
						 
						
							2012-08-06 16:12:49 +08:00  
				
					
						
							
							
								 
						
							
								5f88408dcb 
								
							 
						 
						
							
							
								
								Check for 'http' or 'https' before saving a link  
							
							
							
						 
						
							2012-08-04 16:29:31 +08:00  
				
					
						
							
							
								 
						
							
								6a94d4f550 
								
							 
						 
						
							
							
								
								Put back impressionist where it was commented out  
							
							
							
						 
						
							2012-08-04 15:42:53 +08:00  
				
					
						
							
							
								 
						
							
								50b313976e 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							
							
						 
						
							2012-08-03 17:12:54 +08:00  
				
					
						
							
							
								 
						
							
								2d2e01115b 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							... 
							
							
							
							With news and announcement views 
							
						 
						
							2012-08-03 01:44:06 +08:00  
				
					
						
							
							
								 
						
							
								4127d7f2eb 
								
							 
						 
						
							
							
								
								Fix tags  
							
							
							
						 
						
							2012-08-03 01:35:41 +08:00  
				
					
						
							
							
								 
						
							
								1b29eb5de4 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-08-01 18:15:28 +08:00  
				
					
						
							
							
								 
						
							
								ee5ac0227e 
								
							 
						 
						
							
							
								
								change the algorithm of tag cloud.  
							
							
							
						 
						
							2012-08-01 18:15:10 +08:00  
				
					
						
							
							
								 
						
							
								df9a1e8057 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2012-08-01 17:11:37 +08:00  
				
					
						
							
							
								 
						
							
								f917adcdf3 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2012-08-01 17:09:00 +08:00  
				
					
						
							
							
								 
						
							
								0d048de33f 
								
							 
						 
						
							
							
								
								Fix link in sitemap  
							
							
							
						 
						
							2012-08-01 17:08:07 +08:00  
				
					
						
							
							
								 
						
							
								83acb78966 
								
							 
						 
						
							
							
								
								path instead of url  
							
							
							
						 
						
							2012-08-01 17:05:34 +08:00  
				
					
						
							
							
								 
						
							
								410dfe62e8 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2012-08-01 17:03:39 +08:00  
				
					
						
							
							
								 
						
							
								02ade108d0 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2012-08-01 16:59:11 +08:00  
				
					
						
							
							
								 
						
							
								4df4274629 
								
							 
						 
						
							
							
								
								Add links to frontend_sitemap  
							
							
							
						 
						
							2012-08-01 16:38:07 +08:00  
				
					
						
							
							
								 
						
							
								25a911b4f8 
								
							 
						 
						
							
							
								
								Change for page: take category and tag at the same time  
							
							
							
						 
						
							2012-08-01 16:33:46 +08:00  
				
					
						
							
							
								 
						
							
								0078c97b19 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-07-31 14:27:44 +08:00  
				
					
						
							
							
								 
						
							
								9f859b903d 
								
							 
						 
						
							
							
								
								Add custom validator and fix .html_safe with rescue  
							
							
							
						 
						
							2012-07-31 14:25:46 +08:00  
				
					
						
							
							
								 
						
							
								7e3b59c09a 
								
							 
						 
						
							
							
								
								finished tag clouds  
							
							
							
						 
						
							2012-07-31 11:57:32 +08:00  
				
					
						
							
							
								 
						
							
								ecb75fd085 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2012-07-30 18:37:20 +08:00  
				
					
						
							
							
								 
						
							
								39b63a970c 
								
							 
						 
						
							
							
								
								Fix .class to .class.to_s  
							
							
							
						 
						
							2012-07-30 18:34:54 +08:00  
				
					
						
							
							
								 
						
							
								f3ccbce5c8 
								
							 
						 
						
							
							
								
								Put back impressions for new and bulletin.  
							
							... 
							
							
							
							Add view_count field to tag. 
							
						 
						
							2012-07-30 17:57:55 +08:00  
				
					
						
							
							
								 
						
							
								7440727acd 
								
							 
						 
						
							
							
								
								Fix: "._type" to ".class"  
							
							
							
						 
						
							2012-07-30 17:21:37 +08:00  
				
					
						
							
							
								 
						
							
								4e1a91ed90 
								
							 
						 
						
							
							
								
								Merge branch 'changing_tag'  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/models/news_tag.rb 
							
						 
						
							2012-07-30 14:43:53 +08:00  
				
					
						
							
							
								 
						
							
								946ec9306f 
								
							 
						 
						
							
							
								
								first version of tag cloud.  
							
							
							
						 
						
							2012-07-30 11:59:20 +08:00  
				
					
						
							
							
								 
						
							
								a6a8fe3d64 
								
							 
						 
						
							
							
								
								Remove remaining 18n_variables  
							
							
							
						 
						
							2012-07-27 19:37:25 +08:00  
				
					
						
							
							
								 
						
							
								a657a7d615 
								
							 
						 
						
							
							
								
								remove cache  
							
							
							
						 
						
							2012-07-27 19:14:24 +08:00  
				
					
						
							
							
								 
						
							
								a8cc581279 
								
							 
						 
						
							
							
								
								Sitemap done for backend and fronted  
							
							
							
						 
						
							2012-07-27 19:13:40 +08:00  
				
					
						
							
							
								 
						
							
								934b515914 
								
							 
						 
						
							
							
								
								Sitemap with main  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								38804bd118 
								
							 
						 
						
							
							
								
								Add disable for main title  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								db9c4c0e10 
								
							 
						 
						
							
							
								
								Partial sitemap  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								12f9f666eb 
								
							 
						 
						
							
							
								
								Fix bugs after i18n_variable removal  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								804695749d 
								
							 
						 
						
							
							
								
								Fix bugs after removal of i18n_variable  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								53cae0a9ee 
								
							 
						 
						
							
							
								
								Remove i18n_variable for views  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								49dd3a1770 
								
							 
						 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models  
							
							
							
						 
						
							2012-07-27 19:13:39 +08:00  
				
					
						
							
							
								 
						
							
								e2ebd48b22 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
				
					
						
							
							
								 
						
							
								de831f1f96 
								
							 
						 
						
							
							
								
								disable homepage cache for english page  
							
							
							
						 
						
							2012-07-27 05:08:24 +08:00  
				
					
						
							
							
								 
						
							
								87549d4e1f 
								
							 
						 
						
							
							
								
								fix for nil value  
							
							
							
						 
						
							2012-07-25 17:49:16 +08:00  
				
					
						
							
							
								 
						
							
								13ec25ed10 
								
							 
						 
						
							
							
								
								fix for orbit bar broken  
							
							
							
						 
						
							2012-07-25 17:44:50 +08:00  
				
					
						
							
							
								 
						
							
								97b4eee798 
								
							 
						 
						
							
							
								
								full site search with google  
							
							
							
						 
						
							2012-07-25 17:20:25 +08:00  
				
					
						
							
							
								 
						
							
								f9bdb4a327 
								
							 
						 
						
							
							
								
								New and Announcement search. Disabled impression.  
							
							
							
						 
						
							2012-07-20 15:47:40 +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