Commit Graph

2071 Commits

Author SHA1 Message Date
saurabhbhatia 7cfd9080e8 correct signup workflow 2013-11-29 19:00:32 +08:00
Harry Bomrah b10a2edc22 redirects are ok now
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/confirmations_controller.rb
2013-11-29 18:52:57 +08:00
saurabhbhatia 6e9c21781c Confirmations Workflow working 2013-11-29 18:46:07 +08:00
Harry Bomrah f1c2e29bf1 form validations and ajax check plus user approval done 2013-11-29 16:40:46 +08:00
saurabhbhatia f4be776697 added after confirmation path 2013-11-29 12:31:50 +08:00
saurabhbhatia ea6909a6b0 Mailer now working in production added scope for pending users 2013-11-29 12:03:16 +08:00
saurabhbhatia 9260c3d2b7 Add Approval to User 2013-11-29 10:52:29 +08:00
saurabhbhatia 9bc79fddd7 Email confirmation for user working 2013-11-29 09:26:52 +08:00
saurabhbhatia 38b2d02d92 Email added to Signup Form 2013-11-28 18:06:14 +08:00
saurabhbhatia f509e74938 Rescue nil in Albums 2013-11-28 16:22:03 +08:00
saurabhbhatia 1a4c689ee6 Fixed application locale 2013-11-28 12:28:43 +08:00
saurabhbhatia 8e6cf99b08 Stay on the same tab 2013-11-28 11:01:21 +08:00
saurabhbhatia fa85920043 Fixed orbit bar theme 2013-11-28 10:18:13 +08:00
Harry Bomrah 0338557a33 redirection to login page after creating new user, account validation done, fill in all languages for names also done plus the name error in the backend for noname or half filled profile is also fixed 2013-11-27 20:39:00 +08:00
saurabhbhatia f32692c20a Removed logger 2013-11-27 20:30:01 +08:00
saurabhbhatia 21928d23ee Added redirect for after sign_in 2013-11-27 20:22:06 +08:00
saurabhbhatia 6d5dd4a80f Changed Site Valid Locales to In Use Locales 2013-11-27 17:51:48 +08:00
Harry Bomrah 8d7e350c32 facebook login and import done 2013-11-27 09:46:02 +08:00
Harry Bomrah 73b82bc177 second commit for harry.tp 2013-11-27 09:46:00 +08:00
Harry Bomrah 12127a8d6c commit for harry.tp 2013-11-27 09:45:57 +08:00
saurabhbhatia eb4cf1d165 Fixed Preference Checkbox 2013-11-26 11:48:33 +08:00
saurabhbhatia 3c6965a603 Added back auth object 2013-11-26 10:02:45 +08:00
saurabhbhatia 7a0961e527 Updated Preference and Default Image 2013-11-26 10:01:19 +08:00
saurabhbhatia dead52d8ab Changes in Registration Process 2013-11-25 17:05:36 +08:00
saurabhbhatia 242878a09f Rescue nil for sitemap 2013-11-25 12:53:57 +08:00
saurabhbhatia cb7b7c4edf Fixed Footer to display even if the terms page is absent 2013-11-25 12:52:42 +08:00
saurabhbhatia 7b0ac6b0dc Removed mobile settings from preference page 2013-11-25 12:43:26 +08:00
saurabhbhatia 03957f565b Added Mobile Web as a separate page 2013-11-25 12:43:23 +08:00
saurabhbhatia e62f91d3fd Sub Menu and Language Fix 2013-11-22 17:16:23 +08:00
saurabhbhatia 66d0adf628 Fixed submenu 2013-11-22 13:13:42 +08:00
Harry Bomrah 9428171859 all problem fixed for all categories and tags in plugin widget 2013-11-22 10:22:47 +08:00
Manson Wang 1febd0bdac Fix front_end member plugin urls 2013-11-21 16:32:04 +08:00
Manson Wang 26124e9138 Fix 'Missing Frontend Page' when page is a subpage 2013-11-21 14:33:16 +08:00
saurabhbhatia 35ce0fda6e Enable Mobile Added to Site preferences 2013-11-20 16:21:05 +08:00
Manson Wang 3bac21647e Fix user plugin front_end 2013-11-20 11:27:20 +08:00
saurabhbhatia 2325086776 Updated gallery data api 2013-11-19 22:18:25 +08:00
saurabhbhatia 9178ebd793 Rescue condition for model nil 2013-11-19 17:13:27 +08:00
saurabhbhatia c545c6f172 API for Locations 2013-11-19 16:24:15 +08:00
saurabhbhatia 44c93c2dde Updated with Mobile UI working 2013-11-19 11:33:19 +08:00
saurabhbhatia 82ffc7c3fd Fixed Mobile Site 2013-11-19 10:33:25 +08:00
Harry Bomrah 91d5ab6352 gallery versioning added.. and also the models changed for gallery now more R4 compatible. urls for gallery working fine now.. 2013-11-19 09:32:08 +08:00
Harry Bomrah 16b695200a gallery_album to album 2013-11-19 09:31:49 +08:00
Harry Bomrah 369bbe4d72 category click, event click and more button fix 2013-11-18 17:15:36 +08:00
Harry Bomrah 4888195566 more button works according to categories 2013-11-15 22:35:20 +08:00
saurabhbhatia a38cf6304e Fix for More link 2013-11-15 17:32:00 +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 ce8e9c0a5f Revert "more button fix and also new way to select more page."
This reverts commit e129b25554.
2013-11-15 16:58:27 +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
Harry Bomrah e129b25554 more button fix and also new way to select more page. 2013-11-15 15:13:58 +08:00
saurabhbhatia 7028390248 Fixed Submenu 2013-11-15 14:48:15 +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
saurabhbhatia 635f82db2f Updated Approvable to work for submanager role also 2013-11-13 10:35:03 +08:00
Manson Wang 182729a7fe Prevent reloading issue in kernel.js 2013-11-13 10:19:40 +08:00
Manson Wang a1840c86de Fix Peg_content,Annoucement authorization bug 2013-11-12 19:09:29 +08:00
saurabhbhatia 5f3f27fe9a Desktop Enabled in menu 2013-11-11 18:31:04 +08:00
saurabhbhatia c575dbd33a Fixed Desktop Openness 2013-11-11 17:40:51 +08:00
Harry Bomrah 405c2c5a12 small fix for banner pagination. 2013-11-11 17:23:18 +08:00
saurabhbhatia 5e0696890a Updated Remember me, and Homepage widget more link 2013-11-11 17:23:03 +08:00
Harry Bomrah afff07ec89 items.js modified for new page setting 2013-11-08 18:32:45 +08:00
Harry Bomrah ed569601c3 two major fix for site setting and bulletin controller 2013-11-08 16:38:17 +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
saurabhbhatia 4f3f074573 Fixed page node link 2013-11-07 19:46:50 +08:00
Harry Bomrah c51dd81d2b fixed page setting select all bug 2013-11-07 19:27:04 +08:00
Harry Bomrah d17953ab86 partial is rendered when editing a page part 2013-11-07 17:23:15 +08:00
Harry Bomrah 4353b481c7 changed the frontend loading to more rails specific. and also fixed the filter reload in thumbnali and summary view of members 2013-11-07 14:39:07 +08:00
saurabhbhatia 4e706fab0c Fixed gallery and video widgets 2013-11-07 11:00:10 +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
saurabhbhatia 591a3e0bc4 Updated redirect path after saving a page 2013-11-06 17:20:40 +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
saurabhbhatia 9760100b69 Removed the logger 2013-11-06 16:38:55 +08:00
Manson Wang ff6eb5d674 Fix annoucement preview image bug 2013-11-06 16:31:27 +08:00
saurabhbhatia 2d0fd1d2e4 Fixed select all checkboxes 2013-11-06 15:29:15 +08:00
saurabhbhatia ef67941ba5 Fix for widgets edit form 2013-11-06 15:11:09 +08:00
Manson Wang 18d0657321 Fix dashboard system usage refresh bug 2013-11-06 09:29:57 +08:00
Harry Bomrah 3c4f22234b fixed template updation from site preferences 2013-11-05 20:50:05 +08:00
Harry Bomrah bae1c0da7d now only approved announcement can be viewed when backend is open 2013-11-05 20:50:02 +08:00
Manson Wang 7401a6ae59 Update for dashboard and Fix site.rake,new_site.rake for missing "menu_enabled_for" 2013-11-05 19:38:47 +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
Manson Wang 7ad05ef034 Dashboard with Google Chart 2013-11-04 17:48:51 +08:00
Harry Bomrah 2c8705ac3e fixed site structure and also member roles side bar problem. 2013-11-04 17:39:16 +08:00
saurabhbhatia 2b97d4ca22 Updated Theme in design 2013-11-04 16:31:09 +08:00
saurabhbhatia 3816314b5b Fixed Temaplte Module with Info and Images 2013-11-04 16:12:30 +08:00
saurabhbhatia 1f3f9831ad Fixed Openness Issue 2013-11-04 15:44:51 +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
saurabhbhatia 17f31d1e25 Fix for Site preference 2013-11-04 09:41:28 +08:00
saurabhbhatia d636248073 Updated Sidebar, Application Controllers 2013-11-01 16:42:39 +08:00
chris 8a4242aae9 Fix data count for page form in structure 2013-10-31 18:12:07 +08:00
chris c541e84254 Remove include of ParserBackEnd 2013-10-31 16:17:51 +08:00
chris 778f7c7863 Delete Archive folder in assets and useless files in lib 2013-10-31 14:13:24 +08:00
chris 68e12fd737 Add format validation to link.rb 2013-10-31 14:09:59 +08:00
chris 00010867a4 Fix link in structure 2013-10-30 18:53:23 +08:00
Manson Wang a885313e75 Dashboard with HighChart 2013-10-30 18:23:46 +08:00
chris 62c663d699 Fix for togglebox and menu_enabled_for 2013-10-30 17:26:31 +08:00
saurabhbhatia 3aac221c4e removed site restart after site preferences update 2013-10-30 14:18:03 +08:00