chris
							
						 | 
						
							
							
							
							
							
								
							
							
								d2602a3a84
								
							
						 | 
						
							
							
								
								Change code for new page slide.js
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/pages/_form.html.erb 
							
						 | 
						
							2013-10-19 19:14:14 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f694134150
								
							
						 | 
						
							
							
								
								Remove useless code
							
							
							
							
							
							
							
							Add data-title 
							
						 | 
						
							2013-10-19 19:14:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								00e9a5df5b
								
							
						 | 
						
							
							
								
								new ui member settings account data
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb 
							
						 | 
						
							2013-10-18 22:28:27 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								32c1defba0
								
							
						 | 
						
							
							
								
								Updated Site Preferences Templates
							
							
							
							
							
						 | 
						
							2013-10-18 20:03:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								14d2b0cc76
								
							
						 | 
						
							
							
								
								fix new ui member account privilege
							
							
							
							
							
						 | 
						
							2013-10-18 19:52:36 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								3e491380cd
								
							
						 | 
						
							
							
								
								Revert "new ui member settings account data"
							
							
							
							
							
							
							
							This reverts commit e1f4ee464b. 
							
						 | 
						
							2013-10-18 19:51:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								e1f4ee464b
								
							
						 | 
						
							
							
								
								new ui member settings account data
							
							
							
							
							
						 | 
						
							2013-10-18 19:12:27 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								14fea3638f
								
							
						 | 
						
							
							
								
								Updated with some locale fixes in site preferences
							
							
							
							
							
						 | 
						
							2013-10-18 15:26:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								a67be030c5
								
							
						 | 
						
							
							
								
								Fix JS Path
							
							
							
							
							
						 | 
						
							2013-10-17 11:21:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a76164465e
								
							
						 | 
						
							
							
								
								Fix editing a tag module
							
							
							
							
							
						 | 
						
							2013-10-16 23:34:51 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								d2459f42c0
								
							
						 | 
						
							
							
								
								Added Favicon and default image for orbitbar
							
							
							
							
							
						 | 
						
							2013-10-16 18:50:22 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								155039ac16
								
							
						 | 
						
							
							
								
								Updated fixes for site info - desktop openess, title always displayed
							
							
							
							
							
						 | 
						
							2013-10-16 18:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								2bcecc322e
								
							
						 | 
						
							
							
								
								Update Ad_Banner for new jQuery
							
							
							
							
							
							
							
							Removed loading module.js in module_widget.html.erb 
							
						 | 
						
							2013-10-16 12:28:21 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								df5cda7a98
								
							
						 | 
						
							
							
								
								new feature added for not loading submenus inside api for desktop
							
							
							
							
							
						 | 
						
							2013-10-16 09:37:39 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								fbea249782
								
							
						 | 
						
							
							
								
								jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5
							
							
							
							
							
						 | 
						
							2013-10-16 09:37:33 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								279ac774d4
								
							
						 | 
						
							
							
								
								Migrate form old ui to new ui (categories, tags and authorizations)
							
							
							
							
							
						 | 
						
							2013-10-15 23:38:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								11b880752d
								
							
						 | 
						
							
							
								
								Fix Ad_Banner backend refresh page after edit banner
							
							
							
							
							
						 | 
						
							2013-10-15 19:50:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								76ba7087b2
								
							
						 | 
						
							
							
								
								Fix Ad_Banner frontend for IE8
							
							
							
							
							
							
							
							Fix backend bug in editing banner
Translation Added 
							
						 | 
						
							2013-10-15 19:37:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								96c3be68f7
								
							
						 | 
						
							
							
								
								Fixed Enable and Disable, Sitemap and Terms of Use for header and footer
							
							
							
							
							
						 | 
						
							2013-10-15 10:37:49 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								5fb3731430
								
							
						 | 
						
							
							
								
								Show Custom orbit bar icon only for frontend and desktop
							
							
							
							
							
						 | 
						
							2013-10-15 10:07:46 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fb34dc673f
								
							
						 | 
						
							
							
								
								Changeable Orbitbar logo
							
							
							
							
							
						 | 
						
							2013-10-14 18:20:26 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								4120be6f8e
								
							
						 | 
						
							
							
								
								fixes in sitemap, site preference
							
							
							
							
							
						 | 
						
							2013-10-14 16:48:50 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								55fa1cef4f
								
							
						 | 
						
							
							
								
								Added Enable and disable terms of use, sitemap
							
							
							
							
							
						 | 
						
							2013-10-11 13:14:37 +00:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								5c8a57e700
								
							
						 | 
						
							
							
								
								Fixed Sitemap Toggle
							
							
							
							
							
						 | 
						
							2013-10-09 09:06:21 +00:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								08a8d668ec
								
							
						 | 
						
							
							
								
								Display de page contexts in the mobile version as set in structure
							
							
							
							
							
						 | 
						
							2013-10-08 18:11:29 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								315a24556c
								
							
						 | 
						
							
							
								
								Fix parser common to skip not found module_app
							
							
							
							
							
							
							
							Do not show default widget if there's no data 
							
						 | 
						
							2013-10-08 16:42:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								cce68beff1
								
							
						 | 
						
							
							
								
								Quick fix for front end reloading
							
							
							
							
							
						 | 
						
							2013-10-08 14:52:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								cf7f7aa29c
								
							
						 | 
						
							
							
								
								Fix tag page slide issues
							
							
							
							
							
						 | 
						
							2013-10-08 12:47:31 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								5328a26440
								
							
						 | 
						
							
							
								
								Fix structure position
							
							
							
							
							
						 | 
						
							2013-10-08 12:33:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fe1869199e
								
							
						 | 
						
							
							
								
								Fix typo, it wasn't executing the filtering on tags
							
							
							
							
							
						 | 
						
							2013-10-07 19:01:59 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								061225f56c
								
							
						 | 
						
							
							
								
								Override mongoid-tree callback condition for default position
							
							
							
							
							
						 | 
						
							2013-10-07 18:23:54 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								b3e16ce23b
								
							
						 | 
						
							
							
								
								Updated desktop widgets controller
							
							
							
							
							
						 | 
						
							2013-10-07 18:13:55 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fad191aefe
								
							
						 | 
						
							
							
								
								Updated Desktop Inheritence class
							
							
							
							
							
						 | 
						
							2013-10-07 17:47:13 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								48aa7ed638
								
							
						 | 
						
							
							
								
								Update rake for resetting position
							
							
							
							
							
							
							
							Fix codemirror css 
							
						 | 
						
							2013-10-07 16:23:07 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								21db2a2cba
								
							
						 | 
						
							
							
								
								Drag and drop to reorder users
							
							
							
							
							
						 | 
						
							2013-10-07 15:53:54 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								1194bdd9b4
								
							
						 | 
						
							
							
								
								Updated Sitemap with UI fixes - checkbox tag pending
							
							
							
							
							
						 | 
						
							2013-10-07 15:05:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								831bd722b8
								
							
						 | 
						
							
							
								
								Fix site preference openness problem
							
							
							
							
							
						 | 
						
							2013-10-07 14:37:52 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								940a915125
								
							
						 | 
						
							
							
								
								Updated Sitemap with new UI
							
							
							
							
							
						 | 
						
							2013-10-07 09:43:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								792785f7ba
								
							
						 | 
						
							
							
								
								Fix relation for Ad_banner and Ad_image
							
							
							
							
							
							
							
							Update site.rake for New UI 
							
						 | 
						
							2013-10-04 19:20:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								43cf6b70b7
								
							
						 | 
						
							
							
								
								Fix structure reorder position
							
							
							
							
							
						 | 
						
							2013-10-04 15:07:24 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								ba8da9b6bb
								
							
						 | 
						
							
							
								
								Updated button class in template form
							
							
							
							
							
						 | 
						
							2013-10-04 14:41:48 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								ff93670949
								
							
						 | 
						
							
							
								
								Updated template editing
							
							
							
							
							
						 | 
						
							2013-10-04 14:41:31 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								08907aa8c1
								
							
						 | 
						
							
							
								
								Search Engine Preferences complete
							
							
							
							
							
						 | 
						
							2013-10-02 15:23:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								31b55a0635
								
							
						 | 
						
							
							
								
								Revert "Updated Orbit js to latest version"
							
							
							
							
							
							
							
							This reverts commit b18e61a6c0. 
							
						 | 
						
							2013-10-02 12:32:45 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								433c8d5da6
								
							
						 | 
						
							
							
								
								Fix link in category for authorization, fix update of auth users
							
							
							
							
							
						 | 
						
							2013-10-02 12:18:20 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								b18e61a6c0
								
							
						 | 
						
							
							
								
								Updated Orbit js to latest version
							
							
							
							
							
						 | 
						
							2013-10-02 12:09:44 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								4fe2e31f0e
								
							
						 | 
						
							
							
								
								Updated Global css to fix the line height
							
							
							
							
							
						 | 
						
							2013-10-01 17:51:07 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								31e4fb9f39
								
							
						 | 
						
							
							
								
								Updated sidebar line height
							
							
							
							
							
						 | 
						
							2013-10-01 17:47:58 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								9bdb633157
								
							
						 | 
						
							
							
								
								Updated with UI Changes
							
							
							
							
							
						 | 
						
							2013-10-01 17:39:21 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								caca264b50
								
							
						 | 
						
							
							
								
								isotope fixed for all plugins for list and form.
							
							
							
							
							
						 | 
						
							2013-10-01 15:06:49 +08:00 |