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  
				
					
						
							
							
								 
						
							
								cd4c9306da 
								
							 
						 
						
							
							
								
								Revert useless changes  
							
							
							
						 
						
							2012-08-08 10:24:44 +08:00  
				
					
						
							
							
								 
						
							
								4660c26b7a 
								
							 
						 
						
							
							
								
								fix for ie8,9 for tinymce  
							
							
							
						 
						
							2012-08-07 20:55:18 +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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								bb154f5be6 
								
							 
						 
						
							
							
								
								fix error when creating bulletin and news  
							
							
							
						 
						
							2012-07-30 16:38:02 +08:00  
				
					
						
							
							
								 
						
							
								effad63c92 
								
							 
						 
						
							
							
								
								make sure no pending news or announcement will be searched out  
							
							
							
						 
						
							2012-07-30 14:39:40 +08:00  
				
					
						
							
							
								 
						
							
								e2ebd48b22 
								
							 
						 
						
							
							
								
								Remove i18n_variable for announcement  
							
							
							
						 
						
							2012-07-27 19:12:58 +08:00  
				
					
						
							
							
								 
						
							
								fb1f08327d 
								
							 
						 
						
							
							
								
								fix redis search limit for 10 items  
							
							
							
						 
						
							2012-07-26 12:12:43 +08:00  
				
					
						
							
							
								 
						
							
								4768da3c7a 
								
							 
						 
						
							
							
								
								fix announcement loading failed caused by impression. disable pinyin search.  
							
							
							
						 
						
							2012-07-25 18:26:05 +08:00  
				
					
						
							
							
								 
						
							
								397b444390 
								
							 
						 
						
							
							
								
								fix for bugs  
							
							
							
						 
						
							2012-07-24 20:58:34 +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  
				
					
						
							
							
								 
						
							
								49862e70f9 
								
							 
						 
						
							
							
								
								hide category at front end  
							
							
							
						 
						
							2012-07-09 12:05:21 +08:00  
				
					
						
							
							
								 
						
							
								56caf4b34e 
								
							 
						 
						
							
							
								
								category disable for backend  
							
							
							
						 
						
							2012-07-06 18:11:55 +08:00  
				
					
						
							
							
								 
						
							
								c5fdff764e 
								
							 
						 
						
							
							
								
								orbit disable object for categories  
							
							
							
						 
						
							2012-07-05 16:00:45 +08:00  
				
					
						
							
							
								 
						
							
								ae2cbb728e 
								
							 
						 
						
							
							
								
								archive for announcement  
							
							
							
						 
						
							2012-07-04 17:36:51 +08:00  
				
					
						
							
							
								 
						
							
								4fe92b844e 
								
							 
						 
						
							
							
								
								Add sorting order for NCCU request  
							
							
							
						 
						
							2012-07-03 15:47:28 +08:00  
				
					
						
							
							
								 
						
							
								c0b3798bad 
								
							 
						 
						
							
							
								
								fix for date for qu menu  
							
							
							
						 
						
							2012-06-29 11:41:06 +08:00  
				
					
						
							
							
								 
						
							
								f66c3d9c0c 
								
							 
						 
						
							
							
								
								fix bugs.  
							
							
							
						 
						
							2012-06-29 11:17:35 +08:00  
				
					
						
							
							
								 
						
							
								6c4c1046bc 
								
							 
						 
						
							
							
								
								fix date select cause error back to the time of Jesus  
							
							
							
						 
						
							2012-06-28 15:19:51 +08:00  
				
					
						
							
							
								 
						
							
								4f484599b7 
								
							 
						 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar  
							
							
							
						 
						
							2012-05-29 15:23:50 +08:00  
				
					
						
							
							
								 
						
							
								a663231c8c 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-25 10:01:41 +08:00  
				
					
						
							
							
								 
						
							
								75b67dddf5 
								
							 
						 
						
							
							
								
								Fix date bugs  
							
							
							
						 
						
							2012-05-25 09:59:39 +08:00  
				
					
						
							
							
								 
						
							
								c062b43069 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-23 12:11:38 +08:00  
				
					
						
							
							
								 
						
							
								7c44e94285 
								
							 
						 
						
							
							
								
								Order list by created_at desc  
							
							... 
							
							
							
							Add best image size in news new 
							
						 
						
							2012-05-23 11:46:19 +08:00  
				
					
						
							
							
								 
						
							
								f1c8bed29d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb 
							
						 
						
							2012-05-22 20:33:07 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								815e6a8361 
								
							 
						 
						
							
							
								
								Fix matt's code and add it to filters  
							
							
							
						 
						
							2012-05-19 03:19:55 +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  
				
					
						
							
							
								 
						
							
								f72d0bc7e0 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-18 10:51:20 +08:00  
				
					
						
							
							
								 
						
							
								d9c12ea5a4 
								
							 
						 
						
							
							
								
								Proof authed_users for case when no category  
							
							
							
						 
						
							2012-05-18 10:50:51 +08:00  
				
					
						
							
							
								 
						
							
								a4afd5c1d3 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							
							
						 
						
							2012-05-18 10:36:32 +08:00  
				
					
						
							
							
								 
						
							
								8ad7f70822 
								
							 
						 
						
							
							
								
								Proof i18n_variable for categories  
							
							
							
						 
						
							2012-05-18 10:28:28 +08:00  
				
					
						
							
							
								 
						
							
								f950f77f36 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	Gemfile
	app/models/ad_banner.rb 
							
						 
						
							2012-05-15 23:02:22 +08:00  
				
					
						
							
							
								 
						
							
								e54f4409fb 
								
							 
						 
						
							
							
								
								Add impressionist  
							
							
							
						 
						
							2012-05-15 21:26:09 +08:00  
				
					
						
							
							
								 
						
							
								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