962bae9a82 
								
							 
						 
						
							
							
								
								merge  
							
							
							
						 
						
							2012-10-01 21:09:09 +08:00  
				
					
						
							
							
								 
						
							
								2ea3193879 
								
							 
						 
						
							
							
								
								Fix for banner link  
							
							
							
						 
						
							2012-08-13 11:03:11 +08:00  
				
					
						
							
							
								 
						
							
								9e1e33798c 
								
							 
						 
						
							
							
								
								fix search for i.e.  
							
							
							
						 
						
							2012-08-09 18:35:57 +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  
				
					
						
							
							
								 
						
							
								77deffb512 
								
							 
						 
						
							
							
								
								Nccu calendar and daily job.  
							
							
							
						 
						
							2012-05-15 14:03:54 +08:00  
				
					
						
							
							
								 
						
							
								d88d4e58dc 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into ldap  
							
							... 
							
							
							
							Conflicts:
	config/environments/development.rb 
							
						 
						
							2012-05-09 13:51:00 +08:00  
				
					
						
							
							
								 
						
							
								9ead6cafda 
								
							 
						 
						
							
							
								
								Ray's changes  
							
							
							
						 
						
							2012-05-09 04:15:02 +08:00  
				
					
						
							
							
								 
						
							
								ffcfda912e 
								
							 
						 
						
							
							
								
								Patch from ldap: Calendar sync done,need Ray's JS change  
							
							
							
						 
						
							2012-05-08 20:44:17 +08:00  
				
					
						
							
							
								 
						
							
								f827e8429e 
								
							 
						 
						
							
							
								
								Calendar sync done,need Ray's JS change  
							
							
							
						 
						
							2012-05-08 16:08:41 +08:00  
				
					
						
							
							
								 
						
							
								f427c3803f 
								
							 
						 
						
							
							
								
								clean up useless flash msgs. add i18n vars for app auth and object auth  
							
							
							
						 
						
							2012-05-04 15:40:43 +08:00  
				
					
						
							
							
								 
						
							
								05ded8de03 
								
							 
						 
						
							
							
								
								Fix for NCCU 0430 all functions ok with two submanagers but different behavors  
							
							
							
						 
						
							2012-05-04 15:38:18 +08:00  
				
					
						
							
							
								 
						
							
								5aca3db95f 
								
							 
						 
						
							
							
								
								Ray's changes for structure and web_links  
							
							
							
						 
						
							2012-04-27 11:02:56 +08:00  
				
					
						
							
							
								 
						
							
								6a30b0a1e4 
								
							 
						 
						
							
							
								
								Add RSS event  
							
							
							
						 
						
							2012-02-28 18:29:13 +08:00  
				
					
						
							
							
								 
						
							
								680b28023a 
								
							 
						 
						
							
							
								
								Fix ad_banner loading  
							
							
							
						 
						
							2012-02-27 18:50:56 +08:00  
				
					
						
							
							
								 
						
							
								cf038183b9 
								
							 
						 
						
							
							
								
								Ika's changes in modules  
							
							
							
						 
						
							2012-02-20 08:48:27 +08:00  
				
					
						
							
							
								 
						
							
								9cd3cbc478 
								
							 
						 
						
							
							
								
								Modifications for design, pages, page_parts…  
							
							... 
							
							
							
							Move orbit_bar out of kernel.js 
							
						 
						
							2012-02-17 02:09:32 +08:00  
				
					
						
							
							
								 
						
							
								5da75161c4 
								
							 
						 
						
							
							
								
								announcemenet & web_resource widget  
							
							
							
						 
						
							2012-02-16 17:52:49 +08:00  
				
					
						
							
							
								 
						
							
								55ae7de01c 
								
							 
						 
						
							
							
								
								Orbit-bar in front-end and back-end, side-bar and drop-down menu  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								8ef2d4b02e 
								
							 
						 
						
							
							
								
								include ad_banner query code. cleaned up parser  
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
				
					
						
							
							
								 
						
							
								62aaf79491 
								
							 
						 
						
							
							
								
								Merge with sub_roles  
							
							
							
						 
						
							2011-12-23 18:34:21 +08:00  
				
					
						
							
							
								 
						
							
								e99affbddd 
								
							 
						 
						
							
							
								
								Merge with Matt's code  
							
							
							
						 
						
							2011-11-20 01:26:24 +08:00  
				
					
						
							
							
								 
						
							
								0a6efeb0a2 
								
							 
						 
						
							
							
								
								put dymanic loading related kernel code and query kernel code into public/static  
							
							... 
							
							
							
							put dymanic loading related kernel code and query kernel code into
public/static.
everything in JS need be loaded at frontend from ruling com should be
placed here. 
							
						 
						
							2011-10-21 14:11:41 +08:00