Commit graph

4073 commits

Author SHA1 Message Date
PCoder
63a12ffe06 Use updated get_vm_price method 2018-04-15 13:42:39 +02:00
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
3f4156ed8e Update Changelog 2018-04-13 20:52:58 +02:00
Pcoder
4cea97c5d6
Merge pull request #617 from pcoder/bugfix/load_blog_on_all_domains
Make /blog available on all domains
2018-04-13 20:48:58 +02:00
Arvind Tiwari
7d05ab5f5f
Update Changelog 2018-04-13 18:53:21 +05:30
Arvind Tiwari
00be159285
Merge pull request #621 from tiwariav/task/4376/cms_promo_section_link_color
Task/4376 cms promo link color
2018-04-13 18:44:51 +05:30
Arvind Tiwari
9cf89f6481
Merge pull request #619 from tiwariav/task/4367/dcl_email_logo_resolution
Task/4367 dcl email logo resolution
2018-04-13 18:44:20 +05:30
Arvind Tiwari
403f9b5a08 change logo in hosting emails 2018-04-13 17:55:08 +05:30
Arvind Tiwari
5b8b40f967 restore ungleich style 2018-04-13 17:49:27 +05:30
Arvind Tiwari
2536f94058 django parler config fix 2018-04-13 17:44:00 +05:30
Arvind Tiwari
ca480ce9c8 darker shade for hover 2018-04-13 16:23:17 +05:30
Arvind Tiwari
479d6fbd4f change promo link color 2018-04-13 15:45:06 +05:30
Arvind Tiwari
5679289329 replaced cms_menu with static menu 2018-04-12 22:24:50 +05:30
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
Arvind Tiwari
c0c2dc5c37 larger image used in email 2018-04-12 09:26:30 +05:30
Arvind Tiwari
ebba6d3795 cms page extension favicon 2018-04-12 08:56:24 +05:30
M.Ravi
be72b9628c Add djangocms_blog namespace and urls 2018-04-10 13:21:58 +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