fb53ad524a 
								
							 
						 
						
							
							
								
								Add time to announcement quick edit  
							
							... 
							
							
							
							Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit 
							
						 
						
							2012-08-14 14:38:21 +08:00  
				
					
						
							
							
								 
						
							
								2ea3193879 
								
							 
						 
						
							
							
								
								Fix for banner link  
							
							
							
						 
						
							2012-08-13 11:03:11 +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  
				
					
						
							
							
								 
						
							
								9982fd880f 
								
							 
						 
						
							
							
								
								Update the path when name is changed in item.rb  
							
							
							
						 
						
							2012-08-08 10:53:04 +08:00  
				
					
						
							
							
								 
						
							
								5f88408dcb 
								
							 
						 
						
							
							
								
								Check for 'http' or 'https' before saving a link  
							
							
							
						 
						
							2012-08-04 16:29:31 +08:00  
				
					
						
							
							
								 
						
							
								4127d7f2eb 
								
							 
						 
						
							
							
								
								Fix tags  
							
							
							
						 
						
							2012-08-03 01:35:41 +08:00  
				
					
						
							
							
								 
						
							
								ee5ac0227e 
								
							 
						 
						
							
							
								
								change the algorithm of tag cloud.  
							
							
							
						 
						
							2012-08-01 18:15:10 +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  
				
					
						
							
							
								 
						
							
								f3ccbce5c8 
								
							 
						 
						
							
							
								
								Put back impressions for new and bulletin.  
							
							... 
							
							
							
							Add view_count field to tag. 
							
						 
						
							2012-07-30 17:57:55 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								97b4eee798 
								
							 
						 
						
							
							
								
								full site search with google  
							
							
							
						 
						
							2012-07-25 17:20:25 +08:00  
				
					
						
							
							
								 
						
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							
							
						 
						
							2012-07-13 15:36:10 +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  
				
					
						
							
							
								 
						
							
								d0632b2e4c 
								
							 
						 
						
							
							
								
								change name format  
							
							
							
						 
						
							2012-07-03 16:05:19 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								6f0cf0e92e 
								
							 
						 
						
							
							
								
								cache privilege user list.  
							
							
							
						 
						
							2012-05-29 15:23:50 +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  
				
					
						
							
							
								 
						
							
								11a371cbb9 
								
							 
						 
						
							
							
								
								Fix destroy in structure  
							
							... 
							
							
							
							Fix sorting 
							
						 
						
							2012-05-22 17:55:45 +08:00  
				
					
						
							
							
								 
						
							
								d0b030c47d 
								
							 
						 
						
							
							
								
								Put inc/ajax_setting in new_admin  
							
							... 
							
							
							
							Fix callback for link on save 
							
						 
						
							2012-05-22 16:11:00 +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  
				
					
						
							
							
								 
						
							
								6a022c90da 
								
							 
						 
						
							
							
								
								Changes on nccu  
							
							
							
						 
						
							2012-05-18 15:20:45 +08:00  
				
					
						
							
							
								 
						
							
								79f484300e 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 18:32:06 +08:00  
				
					
						
							
							
								 
						
							
								c9cbec4239 
								
							 
						 
						
							
							
								
								Asset changes, add description  
							
							
							
						 
						
							2012-05-17 18:31:40 +08:00  
				
					
						
							
							
								 
						
							
								5e93fe51a9 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 16:41:11 +08:00  
				
					
						
							
							
								 
						
							
								29c54e6480 
								
							 
						 
						
							
							
								
								Add mandatory fields to assets  
							
							
							
						 
						
							2012-05-17 16:40:09 +08:00  
				
					
						
							
							
								 
						
							
								bfad553cc3 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 09:31:02 +08:00  
				
					
						
							
							
								 
						
							
								84dac1d250 
								
							 
						 
						
							
							
								
								Create FileAssetUploader  
							
							
							
						 
						
							2012-05-17 09:30:21 +08:00  
				
					
						
							
							
								 
						
							
								eba4671733 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 06:46:29 +08:00  
				
					
						
							
							
								 
						
							
								cd1640482a 
								
							 
						 
						
							
							
								
								Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509  
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/_side_bar.html.erb 
							
						 
						
							2012-05-17 06:45:30 +08:00  
				
					
						
							
							
								 
						
							
								0f354b8ccc 
								
							 
						 
						
							
							
								
								fix ad_image size hints.   fix orbit backend controller error when changing language.  
							
							
							
						 
						
							2012-05-17 06:44:14 +08:00  
				
					
						
							
							
								 
						
							
								82d78acbad 
								
							 
						 
						
							
							
								
								First version of app and object auth for web_resource module. Basic fund is ok.  backend need to be secued  
							
							
							
						 
						
							2012-05-17 06:43:39 +08:00  
				
					
						
							
							
								 
						
							
								03387d3c07 
								
							 
						 
						
							
							
								
								Object auth for ad_banner  
							
							
							
						 
						
							2012-05-17 06:42:33 +08:00  
				
					
						
							
							
								 
						
							
								6b9c8eb15d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-17 06:31:57 +08:00  
				
					
						
							
							
								 
						
							
								26292f0dcc 
								
							 
						 
						
							
							
								
								Asset upload  
							
							
							
						 
						
							2012-05-17 06:28:29 +08:00  
				
					
						
							
							
								 
						
							
								9129835f23 
								
							 
						 
						
							
							
								
								Add tags to assets  
							
							
							
						 
						
							2012-05-16 18:19:41 +08:00  
				
					
						
							
							
								 
						
							
								0647698012 
								
							 
						 
						
							
							
								
								fix ad_image size hints.   fix orbit backend controller error when changing language.  
							
							
							
						 
						
							2012-05-16 17:16:48 +08:00  
				
					
						
							
							
								 
						
							
								a31a9c4792 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of  https://github.com/Rulingcom/orbit  into nccu_0509  
							
							... 
							
							
							
							Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb 
							
						 
						
							2012-05-16 12:13:07 +08:00