Commit Graph

1213 Commits

Author SHA1 Message Date
Manson Wang d1c532e8f4 Fix site setting default-language changing effect 2013-12-02 12:15:42 +08:00
Harry Bomrah 8c4d6b972a minor fix for emailers and facebook 2013-12-02 12:10:17 +08:00
saurabhbhatia 685f696536 Added Sendgrid details for production 2013-12-02 10:42:12 +08:00
saurabhbhatia 18a1701472 Fixed Default Locale 2013-11-29 21:37:25 +08:00
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
Harry Bomrah f1c2e29bf1 form validations and ajax check plus user approval done 2013-11-29 16:40:46 +08:00
saurabhbhatia 38b2d02d92 Email added to Signup Form 2013-11-28 18:06:14 +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 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 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 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
saurabhbhatia 35ce0fda6e Enable Mobile Added to Site preferences 2013-11-20 16:21:05 +08:00
saurabhbhatia 2325086776 Updated gallery data api 2013-11-19 22:18:25 +08:00
saurabhbhatia c545c6f172 API for Locations 2013-11-19 16:24:15 +08:00
Spen 20e2f07b26 add Member frontend page selection options and fix backend role filter page 2013-11-15 17:08:45 +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 5f3f27fe9a Desktop Enabled in menu 2013-11-11 18:31:04 +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
saurabhbhatia 2f61f55be2 Rays fixes 2013-11-08 12:55:04 +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 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 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
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
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
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 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
chris 454e36b4ae iFrame ajaxStop 2013-10-29 11:09:20 +08:00
chris 16659d79cd Fix asset:precompile error and delete useless file 2013-10-28 17:04:36 +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 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 94c1d7d5a0 Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js 2013-10-23 18:39:21 +08:00
saurabhbhatia 0a69bbb653 Updated Favicon display and wording 2013-10-22 10:34:10 +08:00
saurabhbhatia 11ef2a13d6 Updated Site preference with Remove Image functionality for orbit bar 2013-10-21 18:45:49 +08:00
saurabhbhatia cf89ed108a Fixed Site Preferences Language 2013-10-21 17:46:29 +08:00
saurabhbhatia e42cf8720e Updated Site Preferences with language fix 2013-10-21 16:53:11 +08:00
Spen c76adc1896 new ui member account privilege fix 2013-10-21 10:42:50 +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 4403ca3504 Add timeout before running script on window load 2013-10-20 19:13:20 +08:00
chris a9343e9a82 Fix new_ui:save_pages 2013-10-20 19:05:19 +08:00
chris 2530dace02 Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run 2013-10-20 18:44:04 +08:00
chris 1d32552b51 Add missing effect to banner 2013-10-19 19:54:37 +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 68a379f8a4 Some fixes for tags: authorization, translation…
can_use now takes all the open_for into account
2013-10-19 19:14:31 +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
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
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
Manson Wang 11b880752d Fix Ad_Banner backend refresh page after edit banner 2013-10-15 19:50:01 +08:00