Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								11247ce84c
								
							
						 | 
						
							
							
								
								Clean up code , cache other auths.  Fix sidebar
							
							
							
							
							
						 | 
						
							2012-05-29 17:17:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1f1868a75f
								
							
						 | 
						
							
							
								
								cache privilege user list.
							
							
							
							
							
						 | 
						
							2012-05-29 17:17:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								541aa5831e
								
							
						 | 
						
							
							
								
								JS changes to load drag and drop
							
							
							
							
							
						 | 
						
							2012-05-22 17:37:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5e9836f371
								
							
						 | 
						
							
							
								
								Changes for structure
							
							
							
							
							
						 | 
						
							2012-05-22 14:45:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								aa114568c4
								
							
						 | 
						
							
							
								
								Move design to site_settings side_bar
							
							
							
							
							
						 | 
						
							2012-05-21 18:20:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								5f6696a358
								
							
						 | 
						
							
							
								
								fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
							
							
							
							
							
						 | 
						
							2012-05-18 14:19:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								16ada34585
								
							
						 | 
						
							
							
								
								fix ad_banner.    new ad_image with best size from ad_banner. content editable at tab
							
							
							
							
							
						 | 
						
							2012-05-17 23:35:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1b1c2c0032
								
							
						 | 
						
							
							
								
								image title and description callback fixed…
							
							
							
							
							
						 | 
						
							2012-05-17 20:19:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2f7d561310
								
							
						 | 
						
							
							
								
								Put back I18n for file_upload
							
							
							
							
							
						 | 
						
							2012-05-17 19:40:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								606050627e
								
							
						 | 
						
							
							
								
								Remove I18n for file_upload html
							
							
							
							
							
						 | 
						
							2012-05-17 19:09:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								27fd2d0714
								
							
						 | 
						
							
							
								
								Hide assets links from side_bar
							
							
							
							
							
						 | 
						
							2012-05-17 18:37:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								c9cbec4239
								
							
						 | 
						
							
							
								
								Asset changes, add description
							
							
							
							
							
						 | 
						
							2012-05-17 18:31:40 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								29c54e6480
								
							
						 | 
						
							
							
								
								Add mandatory fields to assets
							
							
							
							
							
						 | 
						
							2012-05-17 16:40:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0f354b8ccc
								
							
						 | 
						
							
							
								
								fix ad_image size hints.   fix orbit backend controller error when changing language.
							
							
							
							
							
						 | 
						
							2012-05-17 06:44:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a3acd865d7
								
							
						 | 
						
							
							
								
								AdBanner reopen new banner and delete.   Rename title with content editable tag.
							
							
							
							
							
						 | 
						
							2012-05-17 06:44:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								82d78acbad
								
							
						 | 
						
							
							
								
								First version of app and object auth for web_resource module. Basic fund is ok.  backend need to be secued
							
							
							
							
							
						 | 
						
							2012-05-17 06:43:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								03387d3c07
								
							
						 | 
						
							
							
								
								Object auth for ad_banner
							
							
							
							
							
						 | 
						
							2012-05-17 06:42:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								f663985a40
								
							
						 | 
						
							
							
								
								starting ad_banner auth
							
							
							
							
							
						 | 
						
							2012-05-17 06:42:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								b05836835a
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
						 | 
						
							2012-05-17 06:28:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								26292f0dcc
								
							
						 | 
						
							
							
								
								Asset upload
							
							
							
							
							
						 | 
						
							2012-05-17 06:28:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								27a0984da1
								
							
						 | 
						
							
							
								
								tinymce loading fixed…
							
							
							
							
							
						 | 
						
							2012-05-16 18:51:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								617a683d00
								
							
						 | 
						
							
							
								
								image insertion completed..
							
							
							
							
							
						 | 
						
							2012-05-16 16:22:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								30137b50b4
								
							
						 | 
						
							
							
								
								popup fix..
							
							
							
							
							
						 | 
						
							2012-05-16 15:33:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0b0916179f
								
							
						 | 
						
							
							
								
								Change assets
							
							
							
							
							
						 | 
						
							2012-05-16 11:07:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								80e84c10ba
								
							
						 | 
						
							
							
								
								Remove link from dashboard
							
							
							
							
							
						 | 
						
							2012-05-15 23:01:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e54f4409fb
								
							
						 | 
						
							
							
								
								Add impressionist
							
							
							
							
							
						 | 
						
							2012-05-15 21:26:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9ba4c2cf2f
								
							
						 | 
						
							
							
								
								Change to apply page to had object_auth
							
							
							
							
							
						 | 
						
							2012-05-14 12:40:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								7a6d30ad62
								
							
						 | 
						
							
							
								
								Remove unless files and change routes.
							
							
							
							
							
						 | 
						
							2012-05-14 00:50:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0119ab1a74
								
							
						 | 
						
							
							
								
								New Interface for App Auth and Object Auth
							
							
							
							
							
						 | 
						
							2012-05-14 00:50:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								cf8d20dc84
								
							
						 | 
						
							
							
								
								Add category and tag to pages
							
							
							
							
							
						 | 
						
							2012-05-14 00:33:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e40c76bf5f
								
							
						 | 
						
							
							
								
								Fix new page form
							
							
							
							
							
							
							
							Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json 
							
						 | 
						
							2012-05-13 23:48:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								01d0c002f5
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/pages/_edit.html.erb
	app/views/admin/pages/_form.html.erb
	lib/parsers/parser_back_end.rb 
							
						 | 
						
							2012-05-13 23:14:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								62e9a772f6
								
							
						 | 
						
							
							
								
								Fix titles for widgets
							
							
							
							
							
							
							
							Add translations 
							
						 | 
						
							2012-05-13 23:09:48 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								281cfa6518
								
							
						 | 
						
							
							
								
								Changes for widgets
							
							
							
							
							
						 | 
						
							2012-05-13 21:55:39 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4685952bd6
								
							
						 | 
						
							
							
								
								Changes in page_edit
							
							
							
							
							
						 | 
						
							2012-05-13 20:13:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ef2d416c70
								
							
						 | 
						
							
							
								
								Ray's changes for page_edit
							
							
							
							
							
						 | 
						
							2012-05-13 19:36:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								803253ebcf
								
							
						 | 
						
							
							
								
								Put nestedSortable in page_edit.js.erb
							
							
							
							
							
						 | 
						
							2012-05-12 22:12:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								ef49df448d
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
							
							
							
							
							
							
							
							Conflicts:
	app/helpers/admin/item_helper.rb 
							
						 | 
						
							2012-05-11 18:09:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								076f5ad6ef
								
							
						 | 
						
							
							
								
								Ray's changes for drag and drop in structure's side_bar
							
							
							
							
							
						 | 
						
							2012-05-11 17:54:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6a443f0976
								
							
						 | 
						
							
							
								
								Add mongoid-tree to Item
							
							
							
							
							
						 | 
						
							2012-05-11 16:16:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								fd52d00187
								
							
						 | 
						
							
							
								
								Add drag and drop to structure side_bar
							
							
							
							
							
						 | 
						
							2012-05-11 10:00:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								63f904d3b0
								
							
						 | 
						
							
							
								
								Fix tinymce js load
							
							
							
							
							
							
							
							Change to full_name for page_context index 
							
						 | 
						
							2012-05-10 20:36:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								b6aad17681
								
							
						 | 
						
							
							
								
								Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
							
							
							
							
							
						 | 
						
							2012-05-10 14:16:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a43877323e
								
							
						 | 
						
							
							
								
								Add tinymce to page_part edit for text
							
							
							
							
							
						 | 
						
							2012-05-10 10:34:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								9161dc73b5
								
							
						 | 
						
							
							
								
								Translation for "or"
							
							
							
							
							
						 | 
						
							2012-05-10 00:27:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								13587306bc
								
							
						 | 
						
							
							
								
								Add list widgets for announcement, news and links with categories and tags
							
							
							
							
							
						 | 
						
							2012-05-10 00:25:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								47bca643af
								
							
						 | 
						
							
							
								
								hidding new ad_banner
							
							
							
							
							
						 | 
						
							2012-05-09 14:17:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f9f7ddc8ee
								
							
						 | 
						
							
							
								
								Hide some links in side_bar for site_settings
							
							
							
							
							
						 | 
						
							2012-05-09 12:53:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								44a485611a
								
							
						 | 
						
							
							
								
								Site_info and site_setting i18n
							
							
							
							
							
						 | 
						
							2012-05-09 12:29:46 +08:00 |