Commit graph

3418 commits

Author SHA1 Message Date
PCoder
9e33168d30 Update Changelog 2018-02-22 23:42:19 +01:00
Pcoder
6b3b86f140
Merge pull request #574 from pcoder/task/3798/fix_dg_logo_redirection
Task/3798/Redirect user to digital glarus on clicking logo in the email
2018-02-22 23:37:53 +01:00
Pcoder
1d1232e617
Merge pull request #573 from pcoder/task/3554/remove_beta_url
Task/3554/Remove beta access resources
2018-02-22 23:32:41 +01:00
Arvind Tiwari
1e7ef77463
Merge pull request #571 from tiwariav/task/4166/dcl_fix_scroll
task/4166/dcl fix scroll
2018-02-23 00:21:18 +05:30
M.Ravi
74a8a28c52 Reorganize imports and fix flake8 error 2018-02-22 18:20:12 +01:00
M.Ravi
35d6fd8fd3 Remove datacenterlight/order-success urlconf, view and template as
we are not using it anymore
2018-02-22 17:53:51 +01:00
M.Ravi
488d259ec5 Merge branch 'master' into task/3554/remove_beta_url 2018-02-22 13:58:02 +01:00
Arvind Tiwari
14ec15ff13 stylefix 2018-02-22 17:24:45 +05:30
PCoder
d9760ba203 Use /cms prefix for multisites also 2018-02-22 10:41:34 +01:00
PCoder
3f489f5498 Update Changelog for 1.4 2018-02-22 07:32:31 +01:00
Pcoder
059ad0c26a
Merge pull request #572 from pcoder/multisite
Task/4104/Multisite and access control
2018-02-22 07:22:05 +01:00
PCoder
4035ffcfd4 Log the error also 2018-02-22 07:07:26 +01:00
PCoder
6477401093 Remove beta access related email templates 2018-02-22 06:45:58 +01:00
PCoder
d72df9b350 Merge remote-tracking branch 'mainRepo/master' into multisite 2018-02-21 20:19:05 +01:00
M.Ravi
b8db6d708d Rename sdd_size -> ssd_size 2018-02-21 11:46:33 +01:00
M.Ravi
22e18f578e Update Changelog for 1.3.3 2018-02-21 11:41:10 +01:00
Nico Schottelius
2927ca96cb Update allowed hosts with nüglarus.ch 2018-02-21 11:28:45 +01:00
M.Ravi
42bb5bd7a9 Update Changelog 2018-02-21 11:15:05 +01:00
Pcoder
d48f27711c
Merge pull request #567 from tiwariav/task/4105/cms_ungleich_footer_plugin
task/4105 cms footer plugin
2018-02-21 11:12:02 +01:00
PCoder
e8e9b56c94 Redirect user to digital glarus on clicking logo in the email 2018-02-20 20:27:40 +01:00
PCoder
8aeefd7144 Remove datacenterlight/img/beta-img.png and hosting/image/Beta.png
and corresponding references in the code
2018-02-20 19:56:22 +01:00
PCoder
a5ad1a9edf Remove unused beta access templates and js 2018-02-20 19:48:52 +01:00
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
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