Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								26292f0dcc
								
							
						 | 
						
							
							
								
								Asset upload
							
							
							
							
							
						 | 
						
							2012-05-17 06:28:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								9129835f23
								
							
						 | 
						
							
							
								
								Add tags to assets
							
							
							
							
							
						 | 
						
							2012-05-16 18:19:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0b0916179f
								
							
						 | 
						
							
							
								
								Change assets
							
							
							
							
							
						 | 
						
							2012-05-16 11:07:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e54f4409fb
								
							
						 | 
						
							
							
								
								Add impressionist
							
							
							
							
							
						 | 
						
							2012-05-15 21:26:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								53a0fbddf0
								
							
						 | 
						
							
							
								
								Fix commit error
							
							
							
							
							
						 | 
						
							2012-05-15 21:25:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								8fcb8ef8de
								
							
						 | 
						
							
							
								
								Change the way links are displayed in menus in front-end
							
							
							
							
							
						 | 
						
							2012-05-14 21:43:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9ba4c2cf2f
								
							
						 | 
						
							
							
								
								Change to apply page to had object_auth
							
							
							
							
							
						 | 
						
							2012-05-14 12:40:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								cf8d20dc84
								
							
						 | 
						
							
							
								
								Add category and tag to pages
							
							
							
							
							
						 | 
						
							2012-05-14 00:33:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4ae8299949
								
							
						 | 
						
							
							
								
								Add custom title to widgets
							
							
							
							
							
							
							
							Fix pagination conflict with main_content and widgets 
							
						 | 
						
							2012-05-13 22:35:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								17b486f9e9
								
							
						 | 
						
							
							
								
								Fix bugs for shift_to and change items.rake for the missing position in db
							
							
							
							
							
						 | 
						
							2012-05-11 17:56:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6a443f0976
								
							
						 | 
						
							
							
								
								Add mongoid-tree to Item
							
							
							
							
							
						 | 
						
							2012-05-11 16:16:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								41c0c26330
								
							
						 | 
						
							
							
								
								Add mail_settings
							
							
							
							
							
						 | 
						
							2012-05-09 11:38:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								909ca19456
								
							
						 | 
						
							
							
								
								Fix bugs in sub_menu
							
							
							
							
							
						 | 
						
							2012-05-09 04:31:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								9ead6cafda
								
							
						 | 
						
							
							
								
								Ray's changes
							
							
							
							
							
						 | 
						
							2012-05-09 04:15:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								26a50cc862
								
							
						 | 
						
							
							
								
								Add sub_menu to children
							
							
							
							
							
						 | 
						
							2012-05-09 04:15:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								55bfaea43e
								
							
						 | 
						
							
							
								
								Can show announcement and news list by tag's key
							
							
							
							
							
						 | 
						
							2012-05-08 17:27:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5c7cf1aef2
								
							
						 | 
						
							
							
								
								Add sub_menu to site_info
							
							
							
							
							
						 | 
						
							2012-05-08 17:27:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								8a3f0b9bdc
								
							
						 | 
						
							
							
								
								Add menu_enabled_for: the page can be shown even if there's no link in the menu
							
							
							
							
							
						 | 
						
							2012-05-07 15:47:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								8b61314cc4
								
							
						 | 
						
							
							
								
								Add i18n for site_info.
							
							
							
							
							
							
							
							Add always display site title.
Changes for menu in front-end 
							
						 | 
						
							2012-05-07 15:11:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0246341aef
								
							
						 | 
						
							
							
								
								Add footer to site_info
							
							
							
							
							
						 | 
						
							2012-05-07 11:25:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								1fb6c20b86
								
							
						 | 
						
							
							
								
								Add site_info
							
							
							
							
							
						 | 
						
							2012-05-07 00:54:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ce1fecaf93
								
							
						 | 
						
							
							
								
								Add position ordering and hiding page for i18n
							
							
							
							
							
						 | 
						
							2012-05-06 00:35:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f190ce18ee
								
							
						 | 
						
							
							
								
								Put sorting in web_link, page_context and design
							
							
							
							
							
						 | 
						
							2012-05-05 21:20:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								51ee9a4bfa
								
							
						 | 
						
							
							
								
								Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/ad_banners/_ad_banner_tab.html.erb 
							
						 | 
						
							2012-04-24 14:43:30 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								c57ba305e9
								
							
						 | 
						
							
							
								
								Fix ad_banner
							
							
							
							
							
						 | 
						
							2012-04-24 14:37:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a5b13e680f
								
							
						 | 
						
							
							
								
								Add sub_menu in r_tags
							
							
							
							
							
						 | 
						
							2012-04-24 02:30:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0836583694
								
							
						 | 
						
							
							
								
								Disable ad_banner_preview. Just show window
							
							
							
							
							
						 | 
						
							2012-04-23 18:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a5db2382e7
								
							
						 | 
						
							
							
								
								Fix ad image date selector
							
							
							
							
							
						 | 
						
							2012-04-23 18:20:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								35452c039d
								
							
						 | 
						
							
							
								
								Fix ad_banner
							
							
							
							
							
						 | 
						
							2012-04-23 17:03:55 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								51190a79cb
								
							
						 | 
						
							
							
								
								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-17 16:03:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a9a4ca6ede
								
							
						 | 
						
							
							
								
								fix i18n vars in ad_banner
							
							
							
							
							
						 | 
						
							2012-04-17 15:21:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6f9363ef54
								
							
						 | 
						
							
							
								
								Fix bugs in upload design and missing menu
							
							
							
							
							
						 | 
						
							2012-04-06 17:37:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8f28d45379
								
							
						 | 
						
							
							
								
								The new AdBanner.
							
							
							
							
							
						 | 
						
							2012-04-02 03:04:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								32519f308f
								
							
						 | 
						
							
							
								
								Fix several bus when there is no design
							
							
							
							
							
						 | 
						
							2012-04-02 02:41:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3ba89ecbcf
								
							
						 | 
						
							
							
								
								Fact check program completed,Lin checked
							
							
							
							
							
						 | 
						
							2012-03-27 18:54:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f5fd3dec7a
								
							
						 | 
						
							
							
								
								Trying nokogiri
							
							
							
							
							
						 | 
						
							2012-03-27 18:42:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a126935d2c
								
							
						 | 
						
							
							
								
								Clean the parsers and introduce the metas
							
							
							
							
							
						 | 
						
							2012-03-21 18:30:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f4fda08e86
								
							
						 | 
						
							
							
								
								Replace PrototypeR4 by Orbit.
							
							
							
							
							
							
							
							Move session into mongoid_store.
Reset session when sing_in. 
							
						 | 
						
							2012-03-16 14:58:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								cceb785a8d
								
							
						 | 
						
							
							
								
								change view and action for announcement ,Lin checked.  Also add validation for object_auth make sure for each object,the object will be unique for each action.
							
							
							
							
							
						 | 
						
							2012-02-29 18:58:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								2e58c63ff7
								
							
						 | 
						
							
							
								
								fix bugs with token
							
							
							
							
							
						 | 
						
							2012-02-29 18:56:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								cc550c5745
								
							
						 | 
						
							
							
								
								First version for App and Object auth.Taking Announcement as experiment
							
							
							
							
							
						 | 
						
							2012-02-29 18:55:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3bcd7ea349
								
							
						 | 
						
							
							
								
								Exp with object_auth
							
							
							
							
							
						 | 
						
							2012-02-29 18:50:23 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f13ebc6c46
								
							
						 | 
						
							
							
								
								Fix bugs and changes for nccu
							
							
							
							
							
						 | 
						
							2012-02-27 18:50:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								dcc64a20d2
								
							
						 | 
						
							
							
								
								Finish sorting for announcements
							
							
							
							
							
						 | 
						
							2012-02-24 15:30:49 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								9b001aa6c3
								
							
						 | 
						
							
							
								
								new page_content app
							
							
							
							
							
						 | 
						
							2012-02-21 19:22:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								c304819d6b
								
							
						 | 
						
							
							
								
								Commented out code for Windows
							
							
							
							
							
						 | 
						
							2012-02-20 08:55:21 +08:00 |