85a556a4a2 
								
							 
						 
						
							
							
								
								first version of fb_share  
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
				
					
						
							
							
								 
						
							
								06919e76ed 
								
							 
						 
						
							
							
								
								fix approval at news and announcement for abnormal flags that causing search result fault.  
							
							
							
						 
						
							2012-08-08 11:01:50 +08:00  
				
					
						
							
							
								 
						
							
								c6c8187bda 
								
							 
						 
						
							
							
								
								Changes for design: menu, frontend news and announcement  
							
							
							
						 
						
							2012-08-08 10:53:04 +08:00  
				
					
						
							
							
								 
						
							
								73b2cd1035 
								
							 
						 
						
							
							
								
								Fix typo and title in news and announcement frontend  
							
							
							
						 
						
							2012-08-05 15:04:52 +08:00  
				
					
						
							
							
								 
						
							
								4127d7f2eb 
								
							 
						 
						
							
							
								
								Fix tags  
							
							
							
						 
						
							2012-08-03 01:35:41 +08:00  
				
					
						
							
							
								 
						
							
								25a911b4f8 
								
							 
						 
						
							
							
								
								Change for page: take category and tag at the same time  
							
							
							
						 
						
							2012-08-01 16:33:46 +08:00  
				
					
						
							
							
								 
						
							
								b2f28eabaf 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-07-31 18:23:01 +08:00  
				
					
						
							
							
								 
						
							
								b989f458d3 
								
							 
						 
						
							
							
								
								Do not show news/anc if no context.  
							
							
							
						 
						
							2012-07-31 18:22:40 +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  
				
					
						
							
							
								 
						
							
								4dea025c8a 
								
							 
						 
						
							
							
								
								fix for  
							
							... 
							
							
							
							1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code. 
							
						 
						
							2012-07-31 10:59:48 +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  
				
					
						
							
							
								 
						
							
								61c1af7316 
								
							 
						 
						
							
							
								
								Remove i18n_variable for news  
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
				
					
						
							
							
								 
						
							
								d589a1b522 
								
							 
						 
						
							
							
								
								fix for 標題後台為「校園新聞」,前台顯示為「新聞」 該頁面為列表,最上方卻出現「搜尋結果」? from Mr.張  
							
							
							
						 
						
							2012-07-27 07:42:00 +08:00  
				
					
						
							
							
								 
						
							
								fb1f08327d 
								
							 
						 
						
							
							
								
								fix redis search limit for 10 items  
							
							
							
						 
						
							2012-07-26 12:12:43 +08:00  
				
					
						
							
							
								 
						
							
								25f4e292e6 
								
							 
						 
						
							
							
								
								add not found for no result  
							
							
							
						 
						
							2012-07-25 13:58:09 +08:00  
				
					
						
							
							
								 
						
							
								f9bdb4a327 
								
							 
						 
						
							
							
								
								New and Announcement search. Disabled impression.  
							
							
							
						 
						
							2012-07-20 15:47:40 +08:00  
				
					
						
							
							
								 
						
							
								a7b92ed3e8 
								
							 
						 
						
							
							
								
								fix  rejection for announcement and news.  
							
							
							
						 
						
							2012-07-17 10:22:42 +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  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
				
					
						
							
							
								 
						
							
								58a11ff569 
								
							 
						 
						
							
							
								
								fix javascript for new and anc link removing  
							
							
							
						 
						
							2012-06-28 13:50:11 +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  
				
					
						
							
							
								 
						
							
								2b54067ecb 
								
							 
						 
						
							
							
								
								change order of display menu of categories of news_bulletin and bulletin.  
							
							
							
						 
						
							2012-06-26 14:28:21 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								4f484599b7 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								7c44e94285 
								
							 
						 
						
							
							
								
								Order list by created_at desc  
							
							... 
							
							
							
							Add best image size in news new 
							
						 
						
							2012-05-23 11:46:19 +08:00  
				
					
						
							
							
								 
						
							
								d6b92fc604 
								
							 
						 
						
							
							
								
								Fixed bugs for nccu  
							
							
							
						 
						
							2012-05-22 20:00:07 +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  
				
					
						
							
							
								 
						
							
								db410b9c50 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							
							
						 
						
							2012-05-18 19:44:18 +08:00  
				
					
						
							
							
								 
						
							
								4d33c7a56d 
								
							 
						 
						
							
							
								
								Changes for dat and time format  
							
							... 
							
							
							
							Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title 
							
						 
						
							2012-05-18 19:42:36 +08:00  
				
					
						
							
							
								 
						
							
								661fcafe70 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of  https://github.com/Rulingcom/orbit  into design_team  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb 
							
						 
						
							2012-05-18 18:50:10 +08:00  
				
					
						
							
							
								 
						
							
								6ce6577e83 
								
							 
						 
						
							
							
								
								fix news approve and preview  
							
							
							
						 
						
							2012-05-18 18:47:18 +08:00  
				
					
						
							
							
								 
						
							
								8ad7f70822 
								
							 
						 
						
							
							
								
								Proof i18n_variable for categories  
							
							
							
						 
						
							2012-05-18 10:28:28 +08:00  
				
					
						
							
							
								 
						
							
								be7ce0bf45 
								
							 
						 
						
							
							
								
								Redmine change's  
							
							
							
						 
						
							2012-05-17 06:25:38 +08:00  
				
					
						
							
							
								 
						
							
								e54f4409fb 
								
							 
						 
						
							
							
								
								Add impressionist  
							
							
							
						 
						
							2012-05-15 21:26:09 +08:00  
				
					
						
							
							
								 
						
							
								039e837fff 
								
							 
						 
						
							
							
								
								Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509  
							
							... 
							
							
							
							Conflicts:
	app/views/admin/object_auths_new_interface/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb 
							
						 
						
							2012-05-14 00:51:53 +08:00  
				
					
						
							
							
								 
						
							
								7a6d30ad62 
								
							 
						 
						
							
							
								
								Remove unless files and change routes.  
							
							
							
						 
						
							2012-05-14 00:50:36 +08:00  
				
					
						
							
							
								 
						
							
								8b42c595b3 
								
							 
						 
						
							
							
								
								Don't display admin in any premission select. Fix not necessary header for UT data  
							
							
							
						 
						
							2012-05-14 00:49:22 +08:00  
				
					
						
							
							
								 
						
							
								62e9a772f6 
								
							 
						 
						
							
							
								
								Fix titles for widgets  
							
							... 
							
							
							
							Add translations 
							
						 
						
							2012-05-13 23:09:48 +08:00  
				
					
						
							
							
								 
						
							
								4ae8299949 
								
							 
						 
						
							
							
								
								Add custom title to widgets  
							
							... 
							
							
							
							Fix pagination conflict with main_content and widgets 
							
						 
						
							2012-05-13 22:35:00 +08:00  
				
					
						
							
							
								 
						
							
								281cfa6518 
								
							 
						 
						
							
							
								
								Changes for widgets  
							
							
							
						 
						
							2012-05-13 21:55:39 +08:00  
				
					
						
							
							
								 
						
							
								0a34f0277e 
								
							 
						 
						
							
							
								
								Remove unless files and change routes.  
							
							
							
						 
						
							2012-05-11 16:46:36 +08:00