Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4659941989
								
							
						 | 
						
							
							
								
								hidding new ad_banner
							
							
							
							
							
						 | 
						
							2012-05-09 09:49:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								453cb21066
								
							
						 | 
						
							
							
								
								Announcement preivew
							
							
							
							
							
						 | 
						
							2012-05-04 15:50:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								f6307abfbf
								
							
						 | 
						
							
							
								
								fix broken ad_banner
							
							
							
							
							
						 | 
						
							2012-05-04 15:40:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								851dc72f42
								
							
						 | 
						
							
							
								
								Ray's changes in css and html
							
							
							
							
							
						 | 
						
							2012-04-30 00:17:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3beb035101
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
						 | 
						
							2012-04-27 11:11:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5aca3db95f
								
							
						 | 
						
							
							
								
								Ray's changes for structure and web_links
							
							
							
							
							
						 | 
						
							2012-04-27 11:02:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4af2068c1f
								
							
						 | 
						
							
							
								
								Fix ad_banner sec and msec
							
							
							
							
							
						 | 
						
							2012-04-26 17:11:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								faace9893a
								
							
						 | 
						
							
							
								
								dehumanize ad banner
							
							
							
							
							
						 | 
						
							2012-04-26 17:11:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9a5ce5f512
								
							
						 | 
						
							
							
								
								Remove unless sidebar links.
							
							
							
							
							
						 | 
						
							2012-04-26 17:11:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								876036dd20
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb 
							
						 | 
						
							2012-04-25 16:39:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								65a6f9c416
								
							
						 | 
						
							
							
								
								Ray's css fix for quick edit
							
							
							
							
							
						 | 
						
							2012-04-25 16:26:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a3a109fb8b
								
							
						 | 
						
							
							
								
								Remove JS debug msg.
							
							
							
							
							
						 | 
						
							2012-04-25 16:10:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								7f285f4719
								
							
						 | 
						
							
							
								
								Change ad_banner preview from using title to id
							
							
							
							
							
						 | 
						
							2012-04-25 16:10:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								c57ba305e9
								
							
						 | 
						
							
							
								
								Fix ad_banner
							
							
							
							
							
						 | 
						
							2012-04-24 14:37:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0c4328987a
								
							
						 | 
						
							
							
								
								Ray's changes for css files, sort headers in announcement and pagination
							
							
							
							
							
						 | 
						
							2012-04-24 02:37:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								67ba2389a2
								
							
						 | 
						
							
							
								
								fix js
							
							
							
							
							
						 | 
						
							2012-04-23 14:07:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8eedbc951e
								
							
						 | 
						
							
							
								
								add i18n vars
							
							
							
							
							
						 | 
						
							2012-04-23 14:07:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0c46b4da23
								
							
						 | 
						
							
							
								
								AdImage and AnBanner JS fixed
							
							
							
							
							
						 | 
						
							2012-04-23 14:07:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								81b0046f42
								
							
						 | 
						
							
							
								
								Preview now can be use at both ad_banner and ad_image,however it won't run correctly  if user change its ad_banner at ad_image.
							
							
							
							
							
						 | 
						
							2012-04-23 14:07:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								e353afb5ac
								
							
						 | 
						
							
							
								
								fix i18n vars in ad_banner
							
							
							
							
							
						 | 
						
							2012-04-23 14:07:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1b70852ff7
								
							
						 | 
						
							
							
								
								realtime preview is working. but save to object when preview
							
							
							
							
							
						 | 
						
							2012-04-23 14:06:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								ff472714de
								
							
						 | 
						
							
							
								
								AdBanner i18n vars patch
							
							
							
							
							
						 | 
						
							2012-04-23 14:05:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								430b0fd9ae
								
							
						 | 
						
							
							
								
								Merge branch 'ad_banner' of https://github.com/Rulingcom/orbit into ad_banner
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/ad_banners/_ad_image_update.html.erb 
							
						 | 
						
							2012-04-13 16:52:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4af73ecf6f
								
							
						 | 
						
							
							
								
								fix preview window size.
							
							
							
							
							
						 | 
						
							2012-04-13 16:46:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0fe5baf93f
								
							
						 | 
						
							
							
								
								fix for letting ad_banner display even when file in not uploaded
							
							
							
							
							
						 | 
						
							2012-04-13 16:14:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ca0fc4c767
								
							
						 | 
						
							
							
								
								Comment out code that bugged upload image in ad_banner
							
							
							
							
							
						 | 
						
							2012-04-13 15:53:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b54578ce1e
								
							
						 | 
						
							
							
								
								ad banner preview
							
							
							
							
							
						 | 
						
							2012-04-12 07:14:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								d2a3a4d26e
								
							
						 | 
						
							
							
								
								ad banner preview
							
							
							
							
							
						 | 
						
							2012-04-09 12:44:08 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a9988a0d5c
								
							
						 | 
						
							
							
								
								Change for interface,form.
							
							
							
							
							
						 | 
						
							2012-04-02 11:00:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8f28d45379
								
							
						 | 
						
							
							
								
								The new AdBanner.
							
							
							
							
							
						 | 
						
							2012-04-02 03:04:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b17cd7570f
								
							
						 | 
						
							
							
								
								changing to new admin_layout
							
							
							
							
							
						 | 
						
							2012-04-02 02:58:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								928c642840
								
							
						 | 
						
							
							
								
								change layout from old admin to new_admin. not complete code
							
							
							
							
							
						 | 
						
							2012-04-02 02:58:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								8b3b71ca58
								
							
						 | 
						
							
							
								
								fix js bugs,partial bugs
							
							
							
							
							
						 | 
						
							2012-02-06 16:17:07 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								68cea1ea49
								
							
						 | 
						
							
							
								
								AdBanner is now working
							
							
							
							
							
						 | 
						
							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 |