Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								a02cd97880
								
							
						 | 
						
							
							
								
								file manger preview and pagination is done.
							
							
							
							
							
						 | 
						
							2013-12-11 14:41:08 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e145f4e4a9
								
							
						 | 
						
							
							
								
								Fixed asset precompile
							
							
							
							
							
						 | 
						
							2013-12-05 19:11:28 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9db4c787c9
								
							
						 | 
						
							
							
								
								approve and delete all done with registration approval notification for admin
							
							
							
							
							
						 | 
						
							2013-12-05 17:30:33 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								0eb8e1a305
								
							
						 | 
						
							
							
								
								Add phone number and address, dynamic map to mobile site
							
							
							
							
							
						 | 
						
							2013-12-05 17:27:30 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9428171859
								
							
						 | 
						
							
							
								
								all problem fixed for all categories and tags in plugin widget
							
							
							
							
							
						 | 
						
							2013-11-22 10:22:47 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								44c93c2dde
								
							
						 | 
						
							
							
								
								Updated with Mobile UI working
							
							
							
							
							
						 | 
						
							2013-11-19 11:33:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								20e2f07b26
								
							
						 | 
						
							
							
								
								add Member frontend page selection options and fix backend role filter page
							
							
							
							
							
						 | 
						
							2013-11-15 17:08:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								c291f15e23
								
							
						 | 
						
							
							
								
								add member-role.js
							
							
							
							
							
						 | 
						
							2013-11-15 17:00:41 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								dc5ef21516
								
							
						 | 
						
							
							
								
								Revert "add Member frontend page selection options and fix backend role filter page"
							
							
							
							
							
							
							
							This reverts commit ea3f9c8163. 
							
						 | 
						
							2013-11-15 16:58:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								ea3f9c8163
								
							
						 | 
						
							
							
								
								add Member frontend page selection options and fix backend role filter page
							
							
							
							
							
						 | 
						
							2013-11-15 16:16:39 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								eeb7f72876
								
							
						 | 
						
							
							
								
								Updated Items.js as per ray's specifications
							
							
							
							
							
						 | 
						
							2013-11-13 16:40:37 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								a49562e341
								
							
						 | 
						
							
							
								
								Fixed Reloading problem and generate div only if path argument present
							
							
							
							
							
						 | 
						
							2013-11-13 15:47:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								182729a7fe
								
							
						 | 
						
							
							
								
								Prevent reloading issue in kernel.js
							
							
							
							
							
						 | 
						
							2013-11-13 10:19:40 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								afff07ec89
								
							
						 | 
						
							
							
								
								items.js modified for new page setting
							
							
							
							
							
						 | 
						
							2013-11-08 18:32:45 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								2f61f55be2
								
							
						 | 
						
							
							
								
								Rays fixes
							
							
							
							
							
						 | 
						
							2013-11-08 12:55:04 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0db28d9ab4
								
							
						 | 
						
							
							
								
								gallery theater url fix for theater
							
							
							
							
							
						 | 
						
							2013-11-07 22:11:40 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c51dd81d2b
								
							
						 | 
						
							
							
								
								fixed page setting select all bug
							
							
							
							
							
						 | 
						
							2013-11-07 19:27:04 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								49217d4705
								
							
						 | 
						
							
							
								
								fixed all button for page settings and also filter display after page refresh
							
							
							
							
							
						 | 
						
							2013-11-06 22:36:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								3744e1c3e7
								
							
						 | 
						
							
							
								
								By Ray, Fix structure page editinh bug
							
							
							
							
							
						 | 
						
							2013-11-06 17:16:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								5df8ff2e52
								
							
						 | 
						
							
							
								
								By Ray, Fix structure page editing bug
							
							
							
							
							
						 | 
						
							2013-11-06 16:48:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								ff6eb5d674
								
							
						 | 
						
							
							
								
								Fix annoucement preview image bug
							
							
							
							
							
						 | 
						
							2013-11-06 16:31:27 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								9d7af2ccac
								
							
						 | 
						
							
							
								
								fixed the edit link problem in site settings
							
							
							
							
							
						 | 
						
							2013-11-05 16:54:33 +08:00 | 
						
					
				
					
						
							
							
								 
								rulingcom
							
						 | 
						
							
							
							
							
							
								
							
							
								b1867dd47a
								
							
						 | 
						
							
							
								
								new code logic for saving tree.. should work fine even if the node positions fail
							
							
							
							
							
						 | 
						
							2013-11-04 22:20:50 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								2c8705ac3e
								
							
						 | 
						
							
							
								
								fixed site structure and also member roles side bar problem.
							
							
							
							
							
						 | 
						
							2013-11-04 17:39:16 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								eaa87b3dd8
								
							
						 | 
						
							
							
								
								new categories for calendar with colors inside.. plus changed the working of calendar. it has now categories like all other modules
							
							
							
							
							
						 | 
						
							2013-11-04 15:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								62c663d699
								
							
						 | 
						
							
							
								
								Fix for togglebox and menu_enabled_for
							
							
							
							
							
						 | 
						
							2013-10-30 17:26:31 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								454e36b4ae
								
							
						 | 
						
							
							
								
								iFrame ajaxStop
							
							
							
							
							
						 | 
						
							2013-10-29 11:09:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a14d69211b
								
							
						 | 
						
							
							
								
								PagePart widgets for "system widget"
							
							
							
							
							
							
							
							Delete useless code 
							
						 | 
						
							2013-10-28 16:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								218cb03641
								
							
						 | 
						
							
							
								
								PagePart widgets except "system widget"
							
							
							
							
							
						 | 
						
							2013-10-28 16:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								42d0afe65c
								
							
						 | 
						
							
							
								
								Page form with front end style
							
							
							
							
							
						 | 
						
							2013-10-28 16:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f3b3c94b42
								
							
						 | 
						
							
							
								
								Item control iframe dom
							
							
							
							
							
							
							
							Css for preview 
							
						 | 
						
							2013-10-26 18:58:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								254f926093
								
							
						 | 
						
							
							
								
								fix new ui announcement preview
							
							
							
							
							
						 | 
						
							2013-10-24 15:03:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3a3f913ae6
								
							
						 | 
						
							
							
								
								Put back old js
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								8ebfac2b99
								
							
						 | 
						
							
							
								
								Structure link with json
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:40 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a4d1c68299
								
							
						 | 
						
							
							
								
								Structure page with json
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:35 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6d5f1a2f12
								
							
						 | 
						
							
							
								
								Fix in js and css for pageslide and ad_banner
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:30 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								94c1d7d5a0
								
							
						 | 
						
							
							
								
								Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								52fa11a429
								
							
						 | 
						
							
							
								
								Fix filemanager delete url path
							
							
							
							
							
						 | 
						
							2013-10-23 10:42:54 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f9f2232259
								
							
						 | 
						
							
							
								
								Add setForm and resetForm to pageslide.js
							
							
							
							
							
							
							
							Category, AdBanner and Tag are using js to load the values in the form 
							
						 | 
						
							2013-10-21 06:34:55 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								8e168b0fe1
								
							
						 | 
						
							
							
								
								Remove erro-cover on close and loadComplete
							
							
							
							
							
						 | 
						
							2013-10-20 21:16:17 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								606ac05563
								
							
						 | 
						
							
							
								
								Pageslide fix for error message and focused element
							
							
							
							
							
						 | 
						
							2013-10-20 20:54:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9e74d6d47b
								
							
						 | 
						
							
							
								
								Add missing js and css for mobile and fix ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:35:33 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								7353b48212
								
							
						 | 
						
							
							
								
								Finalize ad_banner changes: front-end, back-end, mobile
							
							
							
							
							
						 | 
						
							2013-10-19 19:17:59 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fea86ba3a9
								
							
						 | 
						
							
							
								
								Page slide does not reload from server for ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:17:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								92d2af13f2
								
							
						 | 
						
							
							
								
								changes for ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:17:04 +08:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								 
								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 |