Commit graph

3474 commits

Author SHA1 Message Date
PCoder 3769e00c8c Fix a PEP8 error 2018-02-20 19:22:28 +01:00
M.Ravi 8ba3bfc89f Dcl migration for removing beta-access related tables 2018-02-20 15:24:41 +01:00
M.Ravi 5f136a9dfe Remove BetaAccess related models 2018-02-20 15:13:12 +01:00
M.Ravi a90bc3b3ce Remove BetaAccess related forms 2018-02-20 15:11:09 +01:00
M.Ravi 3cdf915b86 Remove more classes related to Beta 2018-02-20 15:06:24 +01:00
M.Ravi 4f1c5d7c77 Remove BetaProgramView 2018-02-20 12:19:30 +01:00
M.Ravi cc2e18a7d2 Remove /beta_access url from dcl 2018-02-20 11:58:29 +01:00
M.Ravi 3389803493 Remove /beta-program url from dcl 2018-02-20 11:54:42 +01:00
PCoder fcd11c93c2 Add UNGLEICH_SITE_CONFIGS env variable to travis.yml 2018-02-20 09:23:24 +01:00
PCoder 575835aa05 Load multisite urls using json 2018-02-20 08:48:19 +01:00
PCoder 7f6a66bc16 Update django-multisite version 2018-02-20 08:25:43 +01:00
PCoder cb102fe622 Use ungleich's fork of djangocms-multisite 2018-02-20 07:20:01 +01:00
PCoder 05e49b04bb Revert back aldryn_newsblog app 2018-02-20 07:05:56 +01:00
PCoder 593c83aeee Autoformat membership/admin.py 2018-02-20 06:58:08 +01:00
PCoder de4d1bc7c8 Change the multisite url prefix multi to ncms 2018-02-20 06:55:09 +01:00
PCoder cc4f0dc32d Cleanup unused code from urls_multi 2018-02-20 06:53:29 +01:00
PCoder c1d98603e6 Obtain value for MULTISITE_CMS_URLS from env 2018-02-20 06:25:02 +01:00
Arvind Tiwari 3bb64478ed merge master 2018-02-19 02:34:23 +05:30
PCoder d5a0224476 Set FILER_ENABLE_PERMISSIONS to True 2018-02-17 17:01:07 +01:00
PCoder aa63515ff5 Change url for multi domains 2018-02-17 16:54:11 +01:00
PCoder 4c5ff149f7 Some multisite parameters 2018-02-17 16:52:54 +01:00
PCoder 91d340c4b1 Fix some bugs 2018-02-17 13:11:54 +01:00
PCoder be3aeb45e7 Remove urls2.py 2018-02-17 11:33:48 +01:00
PCoder bca2956e06 Rename urls1.py to urls_multi.py 2018-02-17 11:33:28 +01:00
PCoder c1c8b38cf2 Update multisite cms urls, aliases and fallback urls 2018-02-17 11:30:36 +01:00
M.Ravi df35fd1f35 Add urls for example1 and example2 2018-02-15 17:58:30 +01:00
M.Ravi d7d831a831 Comment out debug_toolbar for DEBUG version 2018-02-15 17:57:54 +01:00
M.Ravi bea1f40b1b Add multisite dependent apps and corresponding settings 2018-02-15 17:37:51 +01:00
M.Ravi cb5dd8a592 REmove aldryn_newsblog for the moment 2018-02-15 11:58:44 +01:00
M.Ravi a30e8a6adf Configure multisite SITE_ID 2018-02-15 10:58:06 +01:00
M.Ravi f62b331919 Add multisite requirements 2018-02-15 10:55:45 +01:00
Arvind Tiwari aec7f99aee reduce the scroll amount on click of nav menu 2018-02-15 02:11:08 +05:30
Arvind Tiwari 0aa0e6fd6c carousel text style made more specific 2018-02-15 02:02:00 +05:30
Arvind Tiwari bb6e6da2cb left alignment for mobile text, letter spacing reduced to 0px for headings 2018-02-15 01:55:29 +05:30
Arvind Tiwari a2d79cfab3
Merge pull request #569 from tiwariav/bugfix/glasfaser_navbar
Bugfix/glasfaser navbar
2018-02-14 05:10:57 +05:30
Arvind Tiwari 7692997c82 minor improvements 2018-02-13 19:03:15 +05:30
M.Ravi abf316da9e Add Change password functinality while editing a user via admin
site
2018-02-13 03:33:30 +01:00
M.Ravi 16add66ed8 Improve CustomUserAdmin
This is required for managing djangoCMS Users (page) and also
CustomUser via admin site.
2018-02-13 03:04:25 +01:00
M.Ravi 5e68fec29e Add is_staff setter method for CustomUser 2018-02-13 02:42:40 +01:00
M.Ravi 6a9232851a Set CMS_PERMISSION True for per page access control 2018-02-13 02:40:29 +01:00
M.Ravi 7f5866b777 Move djangocms_admin_style above django.contrib.auth in the
INSTALLED_APPS
2018-02-13 02:39:07 +01:00
M.Ravi 74f213e1d5 Set default value for validation_slug 2018-02-13 02:37:03 +01:00
Arvind Tiwari b99ad38b67 remove yellow from :active state 2018-02-12 03:50:48 +05:30
Arvind Tiwari c2d048d26b undo style changes inherited from agency.css 2018-02-12 03:44:41 +05:30
Arvind Tiwari adb0db101d
Update django.po 2018-02-10 22:11:51 +05:30
Arvind Tiwari 6c3cb5edaf dcl footer link color 2018-02-09 07:36:04 +05:30
Arvind Tiwari 39f9dc25e7 fix 404 page 2018-02-09 07:00:36 +05:30
Arvind Tiwari 909067e11f removed vendor files from hosting and using the ones from dataccenterlight 2018-02-09 06:50:17 +05:30
Arvind Tiwari f42c5a5e20 Merge branch 'master' into task/3713/clean_up_css 2018-02-09 02:20:06 +05:30
Arvind Tiwari 40fa46a85a merge migrations 2018-02-09 02:19:05 +05:30