Commit Graph

3709 Commits

Author SHA1 Message Date
PCoder 558e187e11 Update text: including/excluding VAT 2018-04-15 13:39:41 +02:00
PCoder c738888ab2 Set vm unit price parameters from the passed context 2018-04-15 13:39:01 +02:00
PCoder aa55c1e868 Update main.js to compute total from the unitprice's defined in the window context 2018-04-15 13:37:06 +02:00
PCoder 82a2014fa5 Pass vm_pricing context from default VMPricing object 2018-04-15 13:34:55 +02:00
PCoder 74393ac6ac Optimize imports 2018-04-15 13:32:53 +02:00
PCoder 283a0d25d1 Update get_vm_price method to use pricing defined in VMPricing 2018-04-15 13:31:55 +02:00
PCoder 0ea9051de1 Change the name of the DCL Calculator Plugin
DCL Caclulator Plugin -> DCL Calculator Section Plugin
Note: We do not change the plugin name itself because it causes
data loss
2018-04-12 08:38:14 +02:00
PCoder 3e1d5ba0e2 Improve string representation of VMPricing object 2018-04-12 08:03:19 +02:00
PCoder d50f282057 Add create_vm_pricing management command 2018-04-12 08:01:43 +02:00
PCoder 588f513f2a Remove initial VMPricing code from migration 2018-04-12 07:59:04 +02:00
PCoder 1116812a99 Correct hdd price in VMPricing init 2018-04-09 21:40:03 +02:00
PCoder 76c9b20cc9 Add VMPricing init migration 2018-04-09 21:34:09 +02:00
PCoder 4d6fdf2de9 Add DCLCalculatorPluginModel and VMPricing models 2018-04-09 21:32:53 +02:00
PCoder b9d44b510f Merge branch 'master' into task/4379/price_without_vat 2018-04-09 21:20:24 +02:00
PCoder dd30542f9f Use DCLCalculatorPluginModel in DCLCalculatorPlugin 2018-04-09 21:18:50 +02:00
PCoder c7afbb32c0 Add DCLCalculatorPluginModel 2018-04-09 21:18:18 +02:00
PCoder d07cc41d0a Update VMPricing and add get_default_pricing class method 2018-04-09 21:17:48 +02:00
Arvind Tiwari d53e70be2c
Update Changelog 2018-04-09 03:30:37 +05:30
Arvind Tiwari a7db7e05b0
Merge pull request #615 from tiwariav/bugfix/4427/fix_navbar_logo_repeat
bugfix/4427 fix navbar logo repeat
2018-04-09 03:27:29 +05:30
Arvind Tiwari f30719f320
Merge pull request #613 from pcoder/bugfix/footer_links
Bugfix/footer links
2018-04-09 03:27:09 +05:30
Arvind Tiwari a306f59327
Update mixins.py 2018-04-09 03:12:41 +05:30
Arvind Tiwari d1347afaff update changelog 2018-04-09 03:10:32 +05:30
Arvind Tiwari 6e95e3d885 merge master 2018-04-09 03:09:05 +05:30
Arvind Tiwari 79b5ff6e2c
Merge pull request #616 from tiwariav/bugfix/4396/ungleich_favicon
Bugfix/4396 ungleich favicon
2018-04-09 03:08:03 +05:30
Arvind Tiwari 5dd29bb09e
Update mixins.py 2018-04-09 03:02:50 +05:30
Arvind Tiwari 4305c5cc41 fix logo link url to ungleich home 2018-04-09 02:46:09 +05:30
Arvind Tiwari 600cc7899a mobile visibility 2018-04-09 02:34:34 +05:30
Arvind Tiwari f9ce871c5d update changelog 2018-04-09 02:18:34 +05:30
Arvind Tiwari f4b6949d39 corrected favicon link on pages 2018-04-09 02:16:57 +05:30
Arvind Tiwari e6629a1357 update changelog 2018-04-09 02:00:42 +05:30
Arvind Tiwari 774b13034d
Merge pull request #614 from tiwariav/bugfix/dcl_migration
bugfix/ dcl migrations
2018-04-09 01:54:37 +05:30
Arvind Tiwari ff1908d2e6 added navbar-transparent styles to glasfaser.css 2018-04-09 01:52:49 +05:30
Arvind Tiwari fb7ccff584 remove old migrations from squashed migration 2018-04-09 01:11:45 +05:30
PCoder 2a08c1efd3 Merge branch 'master' into task/4379/price_without_vat 2018-04-08 13:15:41 +02:00
PCoder 30d7785700 Redirect to DCL home on hosting footer for all domains 2018-04-08 08:36:00 +02:00
PCoder c3dff3155e Redirect the contact link to dcl always 2018-04-08 00:29:39 +02:00
PCoder 698cf7f1ee Fix link in signup message 2018-04-07 13:16:36 +02:00
PCoder 7b1cb975df Fix Method Resolution Order 2018-04-07 13:15:44 +02:00
PCoder 178ff8da38 CMS home page can now be accessed at /cms/ for all sites 2018-04-07 13:13:55 +02:00
PCoder c6e3963303 Update footer links in dcl _footer.html 2018-04-07 12:55:32 +02:00
PCoder f911d6b403 Add HostingContextMixin to various hosting views 2018-04-07 12:53:53 +02:00
PCoder 399c91d636 Add HostingContextMixin that sets the REDIRECT_TO_CMS and
MULTISITE_CMS_FALLBACK urls
2018-04-07 12:51:49 +02:00
PCoder ffe4eb4123 Use REDIRECT_TO_CMS and MULTISITE_CMS_FALLBACK to construct
/hosting footer urls
2018-04-07 10:25:27 +02:00
Pcoder 56f6c87fab
Merge pull request #612 from pcoder/bugifix/cms_redirect_for_multitenant_urls_also
bugfix/Redirect multi-tenant urls to /cms also
2018-04-07 00:13:14 +02:00
PCoder 24a9b8ab78 Redirect multi-tenant urls to /cms also 2018-04-07 00:13:24 +02:00
PCoder c167e1ca94 Update Changelog for 1.6.4 2018-04-06 22:31:39 +02:00
PCoder 9fca25ec5a Update Changelog 2018-04-06 20:28:15 +02:00
Pcoder dbc702ebcf
Merge pull request #600 from pcoder/task/4362/fix_need_of_cms_dummy_page
Task/4362/Remove conflicting cms/ urlconf
2018-04-06 20:13:25 +02:00
PCoder 2d5927bc31 Merge branch 'master' into task/4362/fix_need_of_cms_dummy_page 2018-04-06 08:13:47 +02:00
PCoder 7fe5c3f88c Merge branch 'master' into task/4379/price_without_vat 2018-04-06 00:53:29 +02:00