edf9d8a159 
								
							 
						 
						
							
							
								
								Fix can_display  
							
							
							
						 
						
							2012-08-16 18:55:34 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								c5b95e2e0f 
								
							 
						 
						
							
							
								
								Fix rss feed i18n  
							
							
							
						 
						
							2012-08-15 16:17:28 +08:00  
				
					
						
							
							
								 
						
							
								bcc13a47e6 
								
							 
						 
						
							
							
								
								Fix deadline was set to nil when update  
							
							
							
						 
						
							2012-08-14 16:23:34 +08:00  
				
					
						
							
							
								 
						
							
								efaed060d9 
								
							 
						 
						
							
							
								
								Change for date  
							
							
							
						 
						
							2012-08-14 15:11:52 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								77224bcc8f 
								
							 
						 
						
							
							
								
								check deadline for news  
							
							
							
						 
						
							2012-08-14 13:49:24 +08:00  
				
					
						
							
							
								 
						
							
								9196deb997 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:Rulingcom/NCCU  
							
							
							
						 
						
							2012-08-14 01:00:25 +08:00  
				
					
						
							
							
								 
						
							
								c32b0dd4b4 
								
							 
						 
						
							
							
								
								Move delete checkboxes to js  
							
							
							
						 
						
							2012-08-14 00:59:01 +08:00  
				
					
						
							
							
								 
						
							
								6cc470ede9 
								
							 
						 
						
							
							
								
								nccu fix  
							
							
							
						 
						
							2012-08-13 18:35:47 +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  
				
					
						
							
							
								 
						
							
								06919e76ed 
								
							 
						 
						
							
							
								
								fix approval at news and announcement for abnormal flags that causing search result fault.  
							
							
							
						 
						
							2012-08-08 11:01:50 +08:00  
				
					
						
							
							
								 
						
							
								1cdc0e24bd 
								
							 
						 
						
							
							
								
								First version of Solr search.  
							
							
							
						 
						
							2012-08-08 10:59:55 +08:00  
				
					
						
							
							
								 
						
							
								73b2cd1035 
								
							 
						 
						
							
							
								
								Fix typo and title in news and announcement frontend  
							
							
							
						 
						
							2012-08-05 15:04:52 +08:00  
				
					
						
							
							
								 
						
							
								6a94d4f550 
								
							 
						 
						
							
							
								
								Put back impressionist where it was commented out  
							
							
							
						 
						
							2012-08-04 15:42:53 +08:00  
				
					
						
							
							
								 
						
							
								2d2e01115b 
								
							 
						 
						
							
							
								
								Fix page: take category and tag at the same time  
							
							... 
							
							
							
							With news and announcement views 
							
						 
						
							2012-08-03 01:44:06 +08:00  
				
					
						
							
							
								 
						
							
								4127d7f2eb 
								
							 
						 
						
							
							
								
								Fix tags  
							
							
							
						 
						
							2012-08-03 01:35:41 +08:00  
				
					
						
							
							
								 
						
							
								acebec8904 
								
							 
						 
						
							
							
								
								don't dislay web links if no eng. lists in widget is now sorted.  
							
							
							
						 
						
							2012-08-01 15:24:55 +08:00  
				
					
						
							
							
								 
						
							
								b989f458d3 
								
							 
						 
						
							
							
								
								Do not show news/anc if no context.  
							
							
							
						 
						
							2012-07-31 18:22:40 +08:00  
				
					
						
							
							
								 
						
							
								bb154f5be6 
								
							 
						 
						
							
							
								
								fix error when creating bulletin and news  
							
							
							
						 
						
							2012-07-30 16:38:02 +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  
				
					
						
							
							
								 
						
							
								effad63c92 
								
							 
						 
						
							
							
								
								make sure no pending news or announcement will be searched out  
							
							
							
						 
						
							2012-07-30 14:39:40 +08:00  
				
					
						
							
							
								 
						
							
								946ec9306f 
								
							 
						 
						
							
							
								
								first version of tag cloud.  
							
							
							
						 
						
							2012-07-30 11:59:20 +08:00  
				
					
						
							
							
								 
						
							
								afa4b7dcb3 
								
							 
						 
						
							
							
								
								Remove cache  
							
							
							
						 
						
							2012-07-28 16:06:44 +08:00  
				
					
						
							
							
								 
						
							
								61c1af7316 
								
							 
						 
						
							
							
								
								Remove i18n_variable for news  
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
				
					
						
							
							
								 
						
							
								fb1f08327d 
								
							 
						 
						
							
							
								
								fix redis search limit for 10 items  
							
							
							
						 
						
							2012-07-26 12:12:43 +08:00  
				
					
						
							
							
								 
						
							
								f9bdb4a327 
								
							 
						 
						
							
							
								
								New and Announcement search. Disabled impression.  
							
							
							
						 
						
							2012-07-20 15:47:40 +08:00  
				
					
						
							
							
								 
						
							
								033667f99b 
								
							 
						 
						
							
							
								
								fix for missing disable category at frontend and widget  
							
							
							
						 
						
							2012-07-17 11:26:50 +08:00  
				
					
						
							
							
								 
						
							
								a4b1681d39 
								
							 
						 
						
							
							
								
								fix  rejection for announcement and news.  
							
							
							
						 
						
							2012-07-17 10:21:46 +08:00  
				
					
						
							
							
								 
						
							
								4daf36908c 
								
							 
						 
						
							
							
								
								working cache  
							
							
							
						 
						
							2012-07-13 15:36:10 +08:00  
				
					
						
							
							
								 
						
							
								85d6bbe1c9 
								
							 
						 
						
							
							
								
								add i18n variable. fix web_links for disable category  
							
							
							
						 
						
							2012-07-11 17:56:31 +08:00  
				
					
						
							
							
								 
						
							
								ca2c056a07 
								
							 
						 
						
							
							
								
								fix for not displaying bulletin at fronted when it's parent category is disable  
							
							
							
						 
						
							2012-07-11 17:17:44 +08:00  
				
					
						
							
							
								 
						
							
								09d46f2f75 
								
							 
						 
						
							
							
								
								NCCU 上傳版本  0709  
							
							... 
							
							
							
							Merge branch 'nccu0621'
Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb 
							
						 
						
							2012-07-09 16:02:59 +08:00  
				
					
						
							
							
								 
						
							
								49862e70f9 
								
							 
						 
						
							
							
								
								hide category at front end  
							
							
							
						 
						
							2012-07-09 12:05:21 +08:00  
				
					
						
							
							
								 
						
							
								56caf4b34e 
								
							 
						 
						
							
							
								
								category disable for backend  
							
							
							
						 
						
							2012-07-06 18:11:55 +08:00  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
				
					
						
							
							
								 
						
							
								6a4abc6c43 
								
							 
						 
						
							
							
								
								fix news error  
							
							
							
						 
						
							2012-06-27 09:59:32 +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  
				
					
						
							
							
								 
						
							
								4f484599b7 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								75b67dddf5 
								
							 
						 
						
							
							
								
								Fix date bugs  
							
							
							
						 
						
							2012-05-25 09:59:39 +08:00  
				
					
						
							
							
								 
						
							
								7c44e94285 
								
							 
						 
						
							
							
								
								Order list by created_at desc  
							
							... 
							
							
							
							Add best image size in news new 
							
						 
						
							2012-05-23 11:46:19 +08:00  
				
					
						
							
							
								 
						
							
								e0260542d3 
								
							 
						 
						
							
							
								
								fix code  
							
							
							
						 
						
							2012-05-22 16:11:52 +08:00  
				
					
						
							
							
								 
						
							
								79f67208fa 
								
							 
						 
						
							
							
								
								js for preventing user do stupid things durning ajax  
							
							
							
						 
						
							2012-05-22 14:59:54 +08:00  
				
					
						
							
							
								 
						
							
								27cf99462e 
								
							 
						 
						
							
							
								
								Fix bug in page and news  
							
							
							
						 
						
							2012-05-22 14:42:19 +08:00  
				
					
						
							
							
								 
						
							
								661fcafe70 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of  https://github.com/Rulingcom/orbit  into design_team  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb 
							
						 
						
							2012-05-18 18:50:10 +08:00  
				
					
						
							
							
								 
						
							
								6ce6577e83 
								
							 
						 
						
							
							
								
								fix news approve and preview  
							
							
							
						 
						
							2012-05-18 18:47:18 +08:00  
				
					
						
							
							
								 
						
							
								d9c12ea5a4 
								
							 
						 
						
							
							
								
								Proof authed_users for case when no category  
							
							
							
						 
						
							2012-05-18 10:50:51 +08:00  
				
					
						
							
							
								 
						
							
								8ad7f70822 
								
							 
						 
						
							
							
								
								Proof i18n_variable for categories  
							
							
							
						 
						
							2012-05-18 10:28:28 +08:00  
				
					
						
							
							
								 
						
							
								e54f4409fb 
								
							 
						 
						
							
							
								
								Add impressionist  
							
							
							
						 
						
							2012-05-15 21:26:09 +08:00