Commit graph

3372 commits

Author SHA1 Message Date
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
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
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
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
adb0db101d
Update django.po 2018-02-10 22:11:51 +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
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
e93eda8845 update html2canvas to fix bugs 2018-02-07 02:23:23 +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
9f05298675 margin reduced for grid items 2018-02-04 19:56:11 +05:30
Arvind Tiwari
1f8fe3cb00 section-heading margin issue fix 2018-02-04 19:33:47 +05:30
PCoder
4408f54a5c Update Changelog 2018-01-23 22:44:53 +01:00
Pcoder
b1099d20b9
Merge pull request #558 from pcoder/task/4046/compute_hdd_sdd
Task/4046/Add sdd_size, hdd_size to VirtualMachineSerializer
2018-01-23 22:40:11 +01:00
PCoder
d7ce4ef4c5 Update Changelog 2018-01-23 22:07:33 +01:00
Pcoder
5595bf9b9f
Merge pull request #562 from pcoder/task/3670/shorten_ssh_key_name
Task/3670/shorten ssh key name
2018-01-23 22:01:51 +01:00
PCoder
58eec62fc3 Update Changelog 2018-01-23 21:51:51 +01:00
Pcoder
effb8ab37b
Merge pull request #565 from pcoder/task/4049/replace_blog_image
Update blog header background image
2018-01-23 21:47:10 +01:00
PCoder
5f127ceb3d Compress blog background image 2018-01-23 21:43:11 +01:00
PCoder
2549d70ca4 Update blog header background image 2018-01-22 00:13:53 +01:00
PCoder
63906a3b8a Update Changelog for 1.3.2 2018-01-16 00:32:28 +01:00
Pcoder
dcef5e5af2
Merge pull request #564 from pcoder/add_tos_to_dcl_footer
Add tos to dcl footer
2018-01-16 00:27:46 +01:00
PCoder
71071bf9ed Update dcl's django.po: Add translation for - Terms of Use 2018-01-16 00:13:40 +01:00
PCoder
b88c19c2c9 Add terms-of-service item to dcl's footer 2018-01-16 00:11:32 +01:00
PCoder
dd9b0d8fd9 Refactor dcl's ssh key name prefix to DCL_SSH_KEY_NAME_PREFIX 2018-01-08 19:50:42 +01:00
PCoder
0706ac5909 Shorten generated ssh key and add seconds to the name 2018-01-08 19:35:39 +01:00