chris
							
						 | 
						
							
							
							
							
							
								
							
							
								92d2af13f2
								
							
						 | 
						
							
							
								
								changes for ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:17:04 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								a2e9aa2e0b
								
							
						 | 
						
							
							
								
								Updated ADBanner with fixes on index page, ADImage with fixes
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/ad_banners/index.html.erb
	app/views/admin/ad_images/_form.html.erb
	vendor/built_in_modules/ad_banner/init.rb 
							
						 | 
						
							2013-08-09 15:21:51 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3676de8a14
								
							
						 | 
						
							
							
								
								Change validation for url: can include IPs
							
							
							
							
							
						 | 
						
							2013-02-19 17:39:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								e24f7a7880
								
							
						 | 
						
							
							
								
								Put back some field so ad_image can work
							
							
							
							
							
						 | 
						
							2013-01-10 11:08:57 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1c1839fc00
								
							
						 | 
						
							
							
								
								Remove useless code in de_image.rb
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2ea3193879
								
							
						 | 
						
							
							
								
								Fix for banner link
							
							
							
							
							
						 | 
						
							2012-08-13 11:03:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5f88408dcb
								
							
						 | 
						
							
							
								
								Check for 'http' or 'https' before saving a link
							
							
							
							
							
						 | 
						
							2012-08-04 16:29:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								49dd3a1770
								
							
						 | 
						
							
							
								
								Remove i18n_variable for controllers, helpers and models
							
							
							
							
							
						 | 
						
							2012-07-27 19:13:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								bbcdaf00e7
								
							
						 | 
						
							
							
								
								Disable ad_banner_preview. Just show window
							
							
							
							
							
						 | 
						
							2012-04-24 14:37:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e7bb9ea86b
								
							
						 | 
						
							
							
								
								Fix ad image date selector
							
							
							
							
							
						 | 
						
							2012-04-24 14:37:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8f28d45379
								
							
						 | 
						
							
							
								
								The new AdBanner.
							
							
							
							
							
						 | 
						
							2012-04-02 03:04:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								394099c388
								
							
						 | 
						
							
							
								
								Ad banner close complete,need validation
							
							
							
							
							
						 | 
						
							2012-02-04 09:37:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								f530eb7112
								
							
						 | 
						
							
							
								
								Revert "mistake commit"
							
							
							
							
							
							
							
							This reverts commit 2608b72d65. 
							
						 | 
						
							2012-02-03 14:39:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								2608b72d65
								
							
						 | 
						
							
							
								
								mistake commit
							
							
							
							
							
						 | 
						
							2012-02-03 14:28:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								a980847eb3
								
							
						 | 
						
							
							
								
								Basic function for AdBanner
							
							
							
							
							
						 | 
						
							2012-02-01 14:27:51 +08:00 |