Commit graph

3452 commits

Author SHA1 Message Date
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 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
Arvind Tiwari daf8d178ad Merge branch 'master' into task/4105/cms_ungleich_footer_plugin 2018-02-09 01:35:42 +05:30
Arvind Tiwari 873c7b6c7c
Merge pull request #560 from tiwariav/task/cms_plugin_remove_unused_headers
Task/4051 remove unused cms header plugins
2018-02-09 01:31:28 +05:30
Arvind Tiwari a3fa4b138f facebook and youtube url added 2018-02-08 21:26:28 +05:30
Arvind Tiwari c9e2413c4e removed static_placeholder, added previous default 2018-02-08 20:08:20 +05:30
Arvind Tiwari effb90feaa modified gitignore 2018-02-08 19:43:43 +05:30
Arvind Tiwari 10c6fd5696 add optimize folder 2018-02-08 19:43:13 +05:30
Arvind Tiwari 4145129974 remove whitespace from output 2018-02-08 19:10:37 +05:30
Arvind Tiwari b9c53717e3 Merge branch 'master' into task/3713/clean_up_css 2018-02-08 17:11:41 +05:30
Arvind Tiwari 3378bf7562
Merge pull request #559 from tiwariav/task/3995/cms_plugins_padding_fix
Task/3995 galsfaser section cms plugin padding fix
2018-02-08 16:21:50 +05:30
Arvind Tiwari b0548b6bb4
Update order_detail.html 2018-02-07 19:30:53 +05:30
Arvind Tiwari 3049e84961
Merge pull request #568 from tiwariav/bugifx/order_pdf_resolution
bugfix/invoice_pdf_resolution
2018-02-07 19:15:09 +05:30
Arvind Tiwari 22121fa7bc use the minified js 2018-02-07 19:14:03 +05:30
Arvind Tiwari d50e249ba2 add static_placeholder for footer to ungleich_cms_page, help text for footer link 2018-02-07 18:37:48 +05:30
Arvind Tiwari 426e56c4f3 help text for copyright text 2018-02-07 18:21:16 +05:30
Arvind Tiwari e93eda8845 update html2canvas to fix bugs 2018-02-07 02:23:23 +05:30
Arvind Tiwari 69a11a6b06 remove unused template tags 2018-02-07 01:12:11 +05:30
Arvind Tiwari 2ea1a11f2b new footer plugin added 2018-02-07 01:06:03 +05:30
Arvind Tiwari 95370c7562
Update Changelog 2018-02-05 03:26:33 +05:30
Arvind Tiwari cdd4a8e041
Merge pull request #566 from tiwariav/bugifx/order_pdf_resolution
bugfix/invoice pdf resolution
2018-02-05 03:25:19 +05:30
Arvind Tiwari d73b0e2fde scale increased to 2 2018-02-05 03:17:33 +05:30
Arvind Tiwari ff2761912e minor fix 2018-02-05 02:57:46 +05:30
Arvind Tiwari a43428539f optimize script documentation and report output 2018-02-05 02:47:18 +05:30