chris
							
						 
						
							 
							
							
							
							
								
							
							
								3c283d1a7a 
								
							 
						 
						
							
							
								
								Set default picture  
							
							 
							
							... 
							
							
							
							Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title 
							
						 
						
							2012-08-16 17:24:12 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c5b95e2e0f 
								
							 
						 
						
							
							
								
								Fix rss feed i18n  
							
							 
							
							
							
						 
						
							2012-08-15 16:17:28 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								43bc704468 
								
							 
						 
						
							
							
								
								Error popup only shows on flash[:error]  
							
							 
							
							
							
						 
						
							2012-08-15 15:55:29 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								d9f6bb3b4e 
								
							 
						 
						
							
							
								
								can display scope  
							
							 
							
							
							
						 
						
							2012-08-15 11:34:19 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								bcc13a47e6 
								
							 
						 
						
							
							
								
								Fix deadline was set to nil when update  
							
							 
							
							
							
						 
						
							2012-08-14 16:23:34 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								efaed060d9 
								
							 
						 
						
							
							
								
								Change for date  
							
							 
							
							
							
						 
						
							2012-08-14 15:11:52 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								77224bcc8f 
								
							 
						 
						
							
							
								
								check deadline for news  
							
							 
							
							
							
						 
						
							2012-08-14 13:49:24 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								e57b429398 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							 
							
							
							
						 
						
							2012-08-14 13:13:25 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								5bb4aa95ee 
								
							 
						 
						
							
							
								
								fix for dept  
							
							 
							
							
							
						 
						
							2012-08-14 13:13:06 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								9196deb997 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							 
							
							
							
						 
						
							2012-08-14 01:00:25 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c32b0dd4b4 
								
							 
						 
						
							
							
								
								Move delete checkboxes to js  
							
							 
							
							
							
						 
						
							2012-08-14 00:59:01 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								83569fac82 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							 
							
							
							
						 
						
							2012-08-13 18:36:04 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								6cc470ede9 
								
							 
						 
						
							
							
								
								nccu fix  
							
							 
							
							
							
						 
						
							2012-08-13 18:35:47 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c2f3f45196 
								
							 
						 
						
							
							
								
								Fix for link in nccu widget  
							
							 
							
							
							
						 
						
							2012-08-13 11:34:14 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								080974b563 
								
							 
						 
						
							
							
								
								Merge branch 'new_rss'  
							
							 
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb 
							
						 
						
							2012-08-12 23:32:28 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f1b4d9e204 
								
							 
						 
						
							
							
								
								Add authorization for rescue interface  
							
							 
							
							... 
							
							
							
							Change logic for NCCU site for status panel. 
							
						 
						
							2012-08-12 23:29:13 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								33fc96ac7c 
								
							 
						 
						
							
							
								
								Changes for NCCU after email  
							
							 
							
							
							
						 
						
							2012-08-11 18:19:30 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								9333503545 
								
							 
						 
						
							
							
								
								demo_site widget edit  
							
							 
							
							
							
						 
						
							2012-08-10 15:33:28 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								2bd132cef9 
								
							 
						 
						
							
							
								
								Pass category and tag to search to redirect to the right page  
							
							 
							
							... 
							
							
							
							Ray's change for mouseover (take out the black background) 
							
						 
						
							2012-08-09 19:16:26 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								6059edad70 
								
							 
						 
						
							
							
								
								Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss  
							
							 
							
							
							
						 
						
							2012-08-09 18:36:31 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								1e7bc9aadd 
								
							 
						 
						
							
							
								
								1.Rss feed but no entry for clicking now. wait for design.  
							
							 
							
							... 
							
							
							
							2.Unit link is now fixed. 
							
						 
						
							2012-08-09 17:04:37 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								e256440678 
								
							 
						 
						
							
							
								
								RSS first page  
							
							 
							
							
							
						 
						
							2012-08-09 17:04:08 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								2d2172752f 
								
							 
						 
						
							
							
								
								remove announcement category column in announcement  
							
							 
							
							
							
						 
						
							2012-08-09 16:14:05 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								d5c55c9697 
								
							 
						 
						
							
							
								
								widget & frontend field  
							
							 
							
							
							
						 
						
							2012-08-09 15:25:30 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								987e6fff2b 
								
							 
						 
						
							
							
								
								1.Rss feed but no entry for clicking now. wait for design.  
							
							 
							
							... 
							
							
							
							2.Unit link is now fixed. 
							
						 
						
							2012-08-09 02:20:10 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								5fcc910723 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU into new_rss  
							
							 
							
							
							
						 
						
							2012-08-09 00:32:09 +08:00  
						
					 
				
					
						
							
							
								 
								Matt
							
						 
						
							 
							
							
							
							
								
							
							
								1aea8d91f4 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							 
							
							
							
						 
						
							2012-08-08 18:16:38 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								0d55a2f76b 
								
							 
						 
						
							
							
								
								Hide quick edit  
							
							 
							
							
							
						 
						
							2012-08-08 18:11:03 +08:00  
						
					 
				
					
						
							
							
								 
								Matt
							
						 
						
							 
							
							
							
							
								
							
							
								62ba8c9f18 
								
							 
						 
						
							
							
								
								Fix bugs on 172:180  
							
							 
							
							
							
						 
						
							2012-08-08 17:56:00 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								41930eb693 
								
							 
						 
						
							
							
								
								RSS first page  
							
							 
							
							
							
						 
						
							2012-08-08 17:41:48 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								2158e0a879 
								
							 
						 
						
							
							
								
								Merge branch 'nccu_fix_matt'  
							
							 
							
							
							
						 
						
							2012-08-08 16:15:49 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								1b35415699 
								
							 
						 
						
							
							
								
								conditional showing quick edit.  
							
							 
							
							
							
						 
						
							2012-08-08 15:56:46 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								959def6c1f 
								
							 
						 
						
							
							
								
								Merge branch 'nccu_fix_matt' of github.com:Rulingcom/NCCU into nccu_fix_matt  
							
							 
							
							... 
							
							
							
							Conflicts:
	app/models/item.rb
	config/locales/en.yml
	vendor/built_in_modules/announcement/app/models/bulletin.rb
	vendor/built_in_modules/news/app/models/news_bulletin.rb 
							
						 
						
							2012-08-08 14:48:29 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a03d1ad10b 
								
							 
						 
						
							
							
								
								Change for getting url from key  
							
							 
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								acf4446523 
								
							 
						 
						
							
							
								
								Add meta to head for fb share  
							
							 
							
							
							
						 
						
							2012-08-08 11:04:19 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								06919e76ed 
								
							 
						 
						
							
							
								
								fix approval at news and announcement for abnormal flags that causing search result fault.  
							
							 
							
							
							
						 
						
							2012-08-08 11:01:50 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								1cdc0e24bd 
								
							 
						 
						
							
							
								
								First version of Solr search.  
							
							 
							
							
							
						 
						
							2012-08-08 10:59:55 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c6c8187bda 
								
							 
						 
						
							
							
								
								Changes for design: menu, frontend news and announcement  
							
							 
							
							
							
						 
						
							2012-08-08 10:53:04 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c8dcc9734d 
								
							 
						 
						
							
							
								
								Change width for site map frontend, add link for more in announcement widget  
							
							 
							
							
							
						 
						
							2012-08-08 10:53:04 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								cd4c9306da 
								
							 
						 
						
							
							
								
								Revert useless changes  
							
							 
							
							
							
						 
						
							2012-08-08 10:24:44 +08:00  
						
					 
				
					
						
							
							
								 
								Harry Bomrah
							
						 
						
							 
							
							
							
							
								
							
							
								4660c26b7a 
								
							 
						 
						
							
							
								
								fix for ie8,9 for tinymce  
							
							 
							
							
							
						 
						
							2012-08-07 20:55:18 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								cbf7ccc13b 
								
							 
						 
						
							
							
								
								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-07 19:21:54 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								73b2cd1035 
								
							 
						 
						
							
							
								
								Fix typo and title in news and announcement frontend  
							
							 
							
							
							
						 
						
							2012-08-05 15:04:52 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								5f88408dcb 
								
							 
						 
						
							
							
								
								Check for 'http' or 'https' before saving a link  
							
							 
							
							
							
						 
						
							2012-08-04 16:29:31 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								5fc679e0ca 
								
							 
						 
						
							
							
								
								Toggle line color for announcement frontend  
							
							 
							
							
							
						 
						
							2012-08-04 16:16:28 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6a94d4f550 
								
							 
						 
						
							
							
								
								Put back impressionist where it was commented out  
							
							 
							
							
							
						 
						
							2012-08-04 15:42:53 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								2d2e01115b 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							 
							
							... 
							
							
							
							With news and announcement views 
							
						 
						
							2012-08-03 01:44:06 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								4127d7f2eb 
								
							 
						 
						
							
							
								
								Fix tags  
							
							 
							
							
							
						 
						
							2012-08-03 01:35:41 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								d2564af001 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							 
							
							
							
						 
						
							2012-08-01 16:38:35 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								25a911b4f8 
								
							 
						 
						
							
							
								
								Change for page: take category and tag at the same time  
							
							 
							
							
							
						 
						
							2012-08-01 16:33:46 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								acebec8904 
								
							 
						 
						
							
							
								
								don't dislay web links if no eng. lists in widget is now sorted.  
							
							 
							
							
							
						 
						
							2012-08-01 15:24:55 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c951cc6b6f 
								
							 
						 
						
							
							
								
								Fix for data_migration  
							
							 
							
							
							
						 
						
							2012-08-01 00:58:59 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								b2f28eabaf 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							 
							
							
							
						 
						
							2012-07-31 18:23:01 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								b989f458d3 
								
							 
						 
						
							
							
								
								Do not show news/anc if no context.  
							
							 
							
							
							
						 
						
							2012-07-31 18:22:40 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								0078c97b19 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							 
							
							
							
						 
						
							2012-07-31 14:27:44 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								9f859b903d 
								
							 
						 
						
							
							
								
								Add custom validator and fix .html_safe with rescue  
							
							 
							
							
							
						 
						
							2012-07-31 14:25:46 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								7e3b59c09a 
								
							 
						 
						
							
							
								
								finished tag clouds  
							
							 
							
							
							
						 
						
							2012-07-31 11:57:32 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								af4865ceb7 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							 
							
							
							
						 
						
							2012-07-31 11:01:11 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f3ccbce5c8 
								
							 
						 
						
							
							
								
								Put back impressions for new and bulletin.  
							
							 
							
							... 
							
							
							
							Add view_count field to tag. 
							
						 
						
							2012-07-30 17:57:55 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								bb154f5be6 
								
							 
						 
						
							
							
								
								fix error when creating bulletin and news  
							
							 
							
							
							
						 
						
							2012-07-30 16:38:02 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4e1a91ed90 
								
							 
						 
						
							
							
								
								Merge branch 'changing_tag'  
							
							 
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/models/news_tag.rb 
							
						 
						
							2012-07-30 14:43:53 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								effad63c92 
								
							 
						 
						
							
							
								
								make sure no pending news or announcement will be searched out  
							
							 
							
							
							
						 
						
							2012-07-30 14:39:40 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								946ec9306f 
								
							 
						 
						
							
							
								
								first version of tag cloud.  
							
							 
							
							
							
						 
						
							2012-07-30 11:59:20 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								23854e7adc 
								
							 
						 
						
							
							
								
								Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var  
							
							 
							
							... 
							
							
							
							Conflicts:
	app/controllers/pages_controller.rb
	app/models/item.rb
	app/models/site.rb
	config/environments/development.rb
	vendor/built_in_modules/announcement/app/models/bulletin.rb 
							
						 
						
							2012-07-27 19:21:39 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								8eec7b4dac 
								
							 
						 
						
							
							
								
								Fix announcement for i18n_variable removal  
							
							 
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								e2ebd48b22 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							 
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								d589a1b522 
								
							 
						 
						
							
							
								
								fix for 標題後台為「校園新聞」,前台顯示為「新聞」 該頁面為列表,最上方卻出現「搜尋結果」? from Mr.張  
							
							 
							
							
							
						 
						
							2012-07-27 07:42:00 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								c0cac812c5 
								
							 
						 
						
							
							
								
								demo site widget  
							
							 
							
							
							
						 
						
							2012-07-26 16:39:29 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								fb1f08327d 
								
							 
						 
						
							
							
								
								fix redis search limit for 10 items  
							
							 
							
							
							
						 
						
							2012-07-26 12:12:43 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								875fad848c 
								
							 
						 
						
							
							
								
								Fix announcement for i18n_variable removal  
							
							 
							
							
							
						 
						
							2012-07-26 03:29:06 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								b9cf5263f6 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							 
							
							
							
						 
						
							2012-07-26 02:27:43 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4768da3c7a 
								
							 
						 
						
							
							
								
								fix announcement loading failed caused by impression. disable pinyin search.  
							
							 
							
							
							
						 
						
							2012-07-25 18:26:05 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								397b444390 
								
							 
						 
						
							
							
								
								fix for bugs  
							
							 
							
							
							
						 
						
							2012-07-24 20:58:34 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f9bdb4a327 
								
							 
						 
						
							
							
								
								New and Announcement search. Disabled impression.  
							
							 
							
							
							
						 
						
							2012-07-20 15:47:40 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								10731dc211 
								
							 
						 
						
							
							
								
								demo widget  
							
							 
							
							
							
						 
						
							2012-07-18 18:07:45 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								033667f99b 
								
							 
						 
						
							
							
								
								fix for missing disable category at frontend and widget  
							
							 
							
							
							
						 
						
							2012-07-17 11:26:50 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								a4b1681d39 
								
							 
						 
						
							
							
								
								fix  rejection for announcement and news.  
							
							 
							
							
							
						 
						
							2012-07-17 10:21:46 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							 
							
							
							
						 
						
							2012-07-13 15:36:10 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								85d6bbe1c9 
								
							 
						 
						
							
							
								
								add i18n variable. fix web_links for disable category  
							
							 
							
							
							
						 
						
							2012-07-11 17:56:31 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								ca2c056a07 
								
							 
						 
						
							
							
								
								fix for not displaying bulletin at fronted when it's parent category is disable  
							
							 
							
							
							
						 
						
							2012-07-11 17:17:44 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								773371e885 
								
							 
						 
						
							
							
								
								fix from messy search  
							
							 
							
							
							
						 
						
							2012-07-09 16:48:23 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								89446ba796 
								
							 
						 
						
							
							
								
								demo  
							
							 
							
							
							
						 
						
							2012-07-09 16:28:04 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								fce2762ec3 
								
							 
						 
						
							
							
								
								demo  
							
							 
							
							
							
						 
						
							2012-07-09 16:28:04 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								1d8e386bde 
								
							 
						 
						
							
							
								
								demo website widget  
							
							 
							
							
							
						 
						
							2012-07-09 16:28:03 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								49862e70f9 
								
							 
						 
						
							
							
								
								hide category at front end  
							
							 
							
							
							
						 
						
							2012-07-09 12:05:21 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								56caf4b34e 
								
							 
						 
						
							
							
								
								category disable for backend  
							
							 
							
							
							
						 
						
							2012-07-06 18:11:55 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							 
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								32480e10ed 
								
							 
						 
						
							
							
								
								en translation  
							
							 
							
							
							
						 
						
							2012-07-04 17:43:52 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								ae2cbb728e 
								
							 
						 
						
							
							
								
								archive for announcement  
							
							 
							
							
							
						 
						
							2012-07-04 17:36:51 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4fe92b844e 
								
							 
						 
						
							
							
								
								Add sorting order for NCCU request  
							
							 
							
							
							
						 
						
							2012-07-03 15:47:28 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								c0b3798bad 
								
							 
						 
						
							
							
								
								fix for date for qu menu  
							
							 
							
							
							
						 
						
							2012-06-29 11:41:06 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f66c3d9c0c 
								
							 
						 
						
							
							
								
								fix bugs.  
							
							 
							
							
							
						 
						
							2012-06-29 11:17:35 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								6c4c1046bc 
								
							 
						 
						
							
							
								
								fix date select cause error back to the time of Jesus  
							
							 
							
							
							
						 
						
							2012-06-28 15:19:51 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								58a11ff569 
								
							 
						 
						
							
							
								
								fix javascript for new and anc link removing  
							
							 
							
							
							
						 
						
							2012-06-28 13:50:11 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								243c9e2946 
								
							 
						 
						
							
							
								
								fix relation between bulletin and category	 (news also)  
							
							 
							
							
							
						 
						
							2012-06-27 15:16:16 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								55449efb35 
								
							 
						 
						
							
							
								
								fix 新聞與公告QA  
							
							 
							
							... 
							
							
							
							1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
	2.優先處理-編輯中的檔案列表,無法刪除
	3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除 
							
						 
						
							2012-06-27 14:21:06 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								6a4abc6c43 
								
							 
						 
						
							
							
								
								fix news error  
							
							 
							
							
							
						 
						
							2012-06-27 09:59:32 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								83a72bdf6e 
								
							 
						 
						
							
							
								
								fix for announcement  
							
							 
							
							
							
						 
						
							2012-06-26 18:23:44 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								818c58c1ee 
								
							 
						 
						
							
							
								
								fix for 新聞與公告QA  
							
							 
							
							... 
							
							
							
							1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位 
							
						 
						
							2012-06-26 17:46:02 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								df722ba90f 
								
							 
						 
						
							
							
								
								change display of user dept  for showing announcement  
							
							 
							
							
							
						 
						
							2012-06-26 16:21:18 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								2b54067ecb 
								
							 
						 
						
							
							
								
								change order of display menu of categories of news_bulletin and bulletin.  
							
							 
							
							
							
						 
						
							2012-06-26 14:28:21 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								cb17fe0825 
								
							 
						 
						
							
							
								
								Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working  
							
							 
							
							
							
						 
						
							2012-06-20 14:50:51 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								8dd1ab32c1 
								
							 
						 
						
							
							
								
								Add this toolbar, and nccu calendar fix  
							
							 
							
							
							
						 
						
							2012-06-04 16:51:29 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								11247ce84c 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							 
							
							
							
						 
						
							2012-05-29 17:17:26 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4f484599b7 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							 
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a663231c8c 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-25 10:01:41 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								75b67dddf5 
								
							 
						 
						
							
							
								
								Fix date bugs  
							
							 
							
							
							
						 
						
							2012-05-25 09:59:39 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c062b43069 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-23 12:11:38 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								7c44e94285 
								
							 
						 
						
							
							
								
								Order list by created_at desc  
							
							 
							
							... 
							
							
							
							Add best image size in news new 
							
						 
						
							2012-05-23 11:46:19 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								e0260542d3 
								
							 
						 
						
							
							
								
								fix code  
							
							 
							
							
							
						 
						
							2012-05-22 16:11:52 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								79f67208fa 
								
							 
						 
						
							
							
								
								js for preventing user do stupid things durning ajax  
							
							 
							
							
							
						 
						
							2012-05-22 14:59:54 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								815e6a8361 
								
							 
						 
						
							
							
								
								Fix matt's code and add it to filters  
							
							 
							
							
							
						 
						
							2012-05-19 03:19:55 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								db410b9c50 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							 
							
							
							
						 
						
							2012-05-18 19:44:18 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								6ce6577e83 
								
							 
						 
						
							
							
								
								fix news approve and preview  
							
							 
							
							
							
						 
						
							2012-05-18 18:47:18 +08:00  
						
					 
				
					
						
							
							
								 
								Matt
							
						 
						
							 
							
							
							
							
								
							
							
								6a022c90da 
								
							 
						 
						
							
							
								
								Changes on nccu  
							
							 
							
							
							
						 
						
							2012-05-18 15:20:45 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f72d0bc7e0 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-18 10:51:20 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								d9c12ea5a4 
								
							 
						 
						
							
							
								
								Proof authed_users for case when no category  
							
							 
							
							
							
						 
						
							2012-05-18 10:50:51 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a4afd5c1d3 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-18 10:36:32 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								8ad7f70822 
								
							 
						 
						
							
							
								
								Proof i18n_variable for categories  
							
							 
							
							
							
						 
						
							2012-05-18 10:28:28 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								17b6a70506 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-17 23:36:24 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								16ada34585 
								
							 
						 
						
							
							
								
								fix ad_banner.    new ad_image with best size from ad_banner. content editable at tab  
							
							 
							
							
							
						 
						
							2012-05-17 23:35:46 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								1e2b146c21 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-17 10:00:07 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								4467bc5e48 
								
							 
						 
						
							
							
								
								Change Date to DateTime  
							
							 
							
							... 
							
							
							
							Fix filename error 
							
						 
						
							2012-05-17 09:59:49 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								eba4671733 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-17 06:46:29 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f663985a40 
								
							 
						 
						
							
							
								
								starting ad_banner auth  
							
							 
							
							
							
						 
						
							2012-05-17 06:42:33 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6b9c8eb15d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-17 06:31:57 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								be7ce0bf45 
								
							 
						 
						
							
							
								
								Redmine change's  
							
							 
							
							
							
						 
						
							2012-05-17 06:25:38 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								0b0916179f 
								
							 
						 
						
							
							
								
								Change assets  
							
							 
							
							
							
						 
						
							2012-05-16 11:07:11 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f950f77f36 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	Gemfile
	app/models/ad_banner.rb 
							
						 
						
							2012-05-15 23:02:22 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								42881553a8 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							 
							
							
							
						 
						
							2012-05-15 22:48:40 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								5e9b55e08e 
								
							 
						 
						
							
							
								
								Ray took out 'default' tags  
							
							 
							
							
							
						 
						
							2012-05-15 22:47:28 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								e54f4409fb 
								
							 
						 
						
							
							
								
								Add impressionist  
							
							 
							
							
							
						 
						
							2012-05-15 21:26:09 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								59b55d1574 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-14 12:42:06 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								9ba4c2cf2f 
								
							 
						 
						
							
							
								
								Change to apply page to had object_auth  
							
							 
							
							
							
						 
						
							2012-05-14 12:40:50 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ebc8dd33ec 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json 
							
						 
						
							2012-05-14 00:57:17 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								b804ba4d96 
								
							 
						 
						
							
							
								
								Fix for manager and admin can see all post in announcement. Haven't applied to news  
							
							 
							
							
							
						 
						
							2012-05-14 00:50:36 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								7a6d30ad62 
								
							 
						 
						
							
							
								
								Remove unless files and change routes.  
							
							 
							
							
							
						 
						
							2012-05-14 00:50:36 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								0119ab1a74 
								
							 
						 
						
							
							
								
								New Interface for App Auth and Object Auth  
							
							 
							
							
							
						 
						
							2012-05-14 00:50:12 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								8b42c595b3 
								
							 
						 
						
							
							
								
								Don't display admin in any premission select. Fix not necessary header for UT data  
							
							 
							
							
							
						 
						
							2012-05-14 00:49:22 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								62e9a772f6 
								
							 
						 
						
							
							
								
								Fix titles for widgets  
							
							 
							
							... 
							
							
							
							Add translations 
							
						 
						
							2012-05-13 23:09:48 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								4ae8299949 
								
							 
						 
						
							
							
								
								Add custom title to widgets  
							
							 
							
							... 
							
							
							
							Fix pagination conflict with main_content and widgets 
							
						 
						
							2012-05-13 22:35:00 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								281cfa6518 
								
							 
						 
						
							
							
								
								Changes for widgets  
							
							 
							
							
							
						 
						
							2012-05-13 21:55:39 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								e696516aae 
								
							 
						 
						
							
							
								
								Fix for manager and admin can see all post in announcement. Haven't applied to news  
							
							 
							
							
							
						 
						
							2012-05-11 17:07:21 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								0a34f0277e 
								
							 
						 
						
							
							
								
								Remove unless files and change routes.  
							
							 
							
							
							
						 
						
							2012-05-11 16:46:36 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								20a1a6e30f 
								
							 
						 
						
							
							
								
								New Interface for App Auth and Object Auth  
							
							 
							
							
							
						 
						
							2012-05-11 16:44:40 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								4f1e47bb82 
								
							 
						 
						
							
							
								
								Don't display admin in any premission select. Fix not necessary header for UT data  
							
							 
							
							
							
						 
						
							2012-05-10 14:43:05 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								87449ec6a8 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-10 10:34:28 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								07815eee8f 
								
							 
						 
						
							
							
								
								fix display for announcement and remove ut field  
							
							 
							
							
							
						 
						
							2012-05-10 10:29:18 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f13e006e4d 
								
							 
						 
						
							
							
								
								fix display for announcement and remove ut field  
							
							 
							
							
							
						 
						
							2012-05-10 10:27:01 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								de739d7d20 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json 
							
						 
						
							2012-05-10 00:34:23 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								bc5e975fab 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							 
							
							
							
						 
						
							2012-05-10 00:29:22 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								13587306bc 
								
							 
						 
						
							
							
								
								Add list widgets for announcement, news and links with categories and tags  
							
							 
							
							
							
						 
						
							2012-05-10 00:25:30 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6727f27181 
								
							 
						 
						
							
							
								
								Change for 0509 Nccu check  
							
							 
							
							
							
						 
						
							2012-05-09 16:58:12 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								9a6b66c57d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of  https://github.com/Rulingcom/orbit  into nccu_0509  
							
							 
							
							
							
						 
						
							2012-05-09 15:54:59 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								93946c37f4 
								
							 
						 
						
							
							
								
								fix wrong link  
							
							 
							
							
							
						 
						
							2012-05-09 15:54:00 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								c82d701b55 
								
							 
						 
						
							
							
								
								Permission setting for announcement for bulletin cate  
							
							 
							
							
							
						 
						
							2012-05-09 15:28:02 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								1785da51a2 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-05-09 15:04:06 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								50edfdd02f 
								
							 
						 
						
							
							
								
								Changes for tag key in side_bar announcement and news, fix ad_banner css for dot  
							
							 
							
							
							
						 
						
							2012-05-09 14:59:06 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								71a5731fe8 
								
							 
						 
						
							
							
								
								Permission setting for announcement for bulletin cate  
							
							 
							
							
							
						 
						
							2012-05-09 14:54:20 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								d88d4e58dc 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	config/environments/development.rb 
							
						 
						
							2012-05-09 13:51:00 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								9ead6cafda 
								
							 
						 
						
							
							
								
								Ray's changes  
							
							 
							
							
							
						 
						
							2012-05-09 04:15:02 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								23d2d9a81e 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							 
							
							
							
						 
						
							2012-05-08 17:36:35 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								41424d2829 
								
							 
						 
						
							
							
								
								Fix error in front-end announcement index  
							
							 
							
							
							
						 
						
							2012-05-08 17:40:14 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ef9afca19f 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							 
							
							
							
						 
						
							2012-05-08 17:28:05 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								55bfaea43e 
								
							 
						 
						
							
							
								
								Can show announcement and news list by tag's key  
							
							 
							
							
							
						 
						
							2012-05-08 17:27:42 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								d2e07f537a 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							 
							
							
							
						 
						
							2012-05-08 17:24:40 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a3868cb785 
								
							 
						 
						
							
							
								
								Ray's changes for front-end banner  
							
							 
							
							
							
						 
						
							2012-05-08 17:21:26 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								7603cb91ad 
								
							 
						 
						
							
							
								
								Change subrole's context from code to text at approval setting.  
							
							 
							
							
							
						 
						
							2012-05-08 16:21:10 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								caba8ce7a4 
								
							 
						 
						
							
							
								
								Add nccu icon  
							
							 
							
							... 
							
							
							
							Change news list in front-end
Hide links and files in news and announcement front-end show when nothing 
							
						 
						
							2012-05-08 15:27:43 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								2b9190a49e 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb 
							
						 
						
							2012-05-08 11:40:38 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ba4385e3fd 
								
							 
						 
						
							
							
								
								Add module authorization for news  
							
							 
							
							... 
							
							
							
							Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom 
							
						 
						
							2012-05-08 10:50:09 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ca88d0e01b 
								
							 
						 
						
							
							
								
								Fix bug that was never displaying preview  
							
							 
							
							
							
						 
						
							2012-05-07 17:29:56 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								48f8fbde7f 
								
							 
						 
						
							
							
								
								Fix site_locale_default_head and active for current locale  
							
							 
							
							
							
						 
						
							2012-05-07 00:53:52 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f190ce18ee 
								
							 
						 
						
							
							
								
								Put sorting in web_link, page_context and design  
							
							 
							
							
							
						 
						
							2012-05-05 21:20:20 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								e9b337a385 
								
							 
						 
						
							
							
								
								Copy changes into news after merge  
							
							 
							
							
							
						 
						
							2012-05-04 18:49:07 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								119d8ff13a 
								
							 
						 
						
							
							
								
								add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.  
							
							 
							
							
							
						 
						
							2012-05-04 15:50:45 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								048ce4c97e 
								
							 
						 
						
							
							
								
								disable input  
							
							 
							
							
							
						 
						
							2012-05-04 15:50:45 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								453cb21066 
								
							 
						 
						
							
							
								
								Announcement preivew  
							
							 
							
							
							
						 
						
							2012-05-04 15:50:45 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								f427c3803f 
								
							 
						 
						
							
							
								
								clean up useless flash msgs. add i18n vars for app auth and object auth  
							
							 
							
							
							
						 
						
							2012-05-04 15:40:43 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								05ded8de03 
								
							 
						 
						
							
							
								
								Fix for NCCU 0430 all functions ok with two submanagers but different behavors  
							
							 
							
							
							
						 
						
							2012-05-04 15:38:18 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								92a53c1b27 
								
							 
						 
						
							
							
								
								Ray's fix  
							
							 
							
							
							
						 
						
							2012-05-02 16:20:59 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								20504b2205 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							... 
							
							
							
							Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb 
							
						 
						
							2012-04-30 07:57:20 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								b8f52fa1ec 
								
							 
						 
						
							
							
								
								Separate announcement and news  
							
							 
							
							
							
						 
						
							2012-04-30 06:31:46 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								63ee8eaca9 
								
							 
						 
						
							
							
								
								Remove url from sorting  
							
							 
							
							... 
							
							
							
							Add sorting_options to params in filters 
							
						 
						
							2012-04-30 06:30:52 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								32faef0c70 
								
							 
						 
						
							
							
								
								DRY code for sorting  
							
							 
							
							
							
						 
						
							2012-04-30 06:30:52 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								a46a8898d7 
								
							 
						 
						
							
							
								
								Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen  
							
							 
							
							
							
						 
						
							2012-04-30 00:24:11 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								382932036d 
								
							 
						 
						
							
							
								
								Hide Approval button when bulletin is checked.  
							
							 
							
							
							
						 
						
							2012-04-30 00:24:11 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								c4db7e2157 
								
							 
						 
						
							
							
								
								Fix approval setting ajax problem  
							
							 
							
							
							
						 
						
							2012-04-30 00:24:11 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								94d61abf83 
								
							 
						 
						
							
							
								
								A modal view for approval user  
							
							 
							
							
							
						 
						
							2012-04-30 00:24:10 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								851dc72f42 
								
							 
						 
						
							
							
								
								Ray's changes in css and html  
							
							 
							
							
							
						 
						
							2012-04-30 00:17:18 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								2362e1cfdd 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							 
							
							
							
						 
						
							2012-04-27 15:28:32 +08:00