Commit graph

3865 commits

Author SHA1 Message Date
Arvind Tiwari
f8dc2c6bbe discount option added to calculator 2018-05-07 05:07:58 +05:30
Arvind Tiwari
25ef657c62
Update cms_plugins.py 2018-05-01 18:15:56 +05:30
Arvind Tiwari
4d2d337651
Release 1.8 2018-05-01 16:44:15 +05:30
Arvind Tiwari
ccf55acbaf
Update navbar_dropdown.html 2018-05-01 04:36:29 +05:30
Arvind Tiwari
6ff03d8f48
Merge pull request #627 from tiwariav/task/dcl_calculator_on_non_cms_pages
Task/4527 dcl calculator on non-cms pages
2018-05-01 02:35:22 +05:30
Arvind Tiwari
d6db984156
Update ungleich.css 2018-05-01 00:48:31 +05:30
Arvind Tiwari
35fb872dc1
Update Changelog 2018-05-01 00:00:05 +05:30
Arvind Tiwari
86188b1fb0
Merge pull request #626 from tiwariav/task/4474/slider_padding
Task/4474 cms header slider padding
2018-04-30 23:52:23 +05:30
Arvind Tiwari
6bb65d8e8d
Merge pull request #628 from tiwariav/bugfix/unglieich_cms_template_favicon
bugfix/ add favicon extension to ungleich cms template
2018-04-30 21:20:41 +05:30
Arvind Tiwari
34df86fb90 add favicon extension to ungleich_template 2018-04-28 00:56:11 +05:30
Arvind Tiwari
89ed869780 hosting calculator styles 2018-04-25 23:31:27 +05:30
Arvind Tiwari
0c4c945ec3 flake8 fix 2018-04-25 17:51:36 +05:30
Arvind Tiwari
14548b2f01 flake8 refacoring 2018-04-25 17:26:31 +05:30
Arvind Tiwari
91a65e88ec hosting vm payment price fix 2018-04-25 16:08:05 +05:30
Arvind Tiwari
f66d768ecb hosting payment page 2018-04-25 15:55:58 +05:30
Arvind Tiwari
3b3b73a2ce alignment calculator plugin 2018-04-25 15:08:28 +05:30
Arvind Tiwari
3bf064a017 add calculator placeholder to cms_integration 2018-04-25 14:52:25 +05:30
Arvind Tiwari
91f1c1ef06
Update Changelog 2018-04-21 23:05:23 +05:30
Arvind Tiwari
67a6c8f2c2
Update Changelog 2018-04-21 22:59:00 +05:30
Arvind Tiwari
49c0406296
Merge pull request #625 from pcoder/bugfix/4481/fix_DE_blog_pages_500_error
Bugfix/4481/fix de blog pages 500 error
2018-04-21 22:54:18 +05:30
Arvind Tiwari
526426c6c0
Merge pull request #623 from pcoder/task/4370/ungleich_comic
Task/4370/ungleich comic
2018-04-21 22:47:08 +05:30
Arvind Tiwari
1a692bc88f merge master 2018-04-21 22:39:44 +05:30
Arvind Tiwari
45bd853a20
Update Changelog 2018-04-20 21:09:16 +05:30
Arvind Tiwari
d21e2a8abe
Merge pull request #618 from tiwariav/task/4297/cms_favicon
Task/4297 dcl cms favicon as page attribute
2018-04-20 20:59:17 +05:30
Arvind Tiwari
3d0505330c
Merge pull request #620 from tiwariav/bugfix/blog_top_menu
bugfix/ cms blog top menu
2018-04-20 20:58:59 +05:30
Arvind Tiwari
b660ac5ed4 merge master 2018-04-20 20:37:34 +05:30
Arvind Tiwari
564f7a5be8 merge migrations 2018-04-20 20:36:28 +05:30
Arvind Tiwari
275ea47e41 merge master 2018-04-20 20:30:45 +05:30
Arvind Tiwari
71a37972d3 Merge remote-tracking branch 'ungleich/master' 2018-04-20 20:29:09 +05:30
Arvind Tiwari
74554f1c24
Merge pull request #622 from pcoder/task/4379/price_without_vat
Task/4379/Price without VAT
2018-04-20 19:04:10 +05:30
Arvind Tiwari
8f6260b063
Update _calculator_form.html 2018-04-20 17:54:23 +05:30
Arvind Tiwari
1e97d0ba38
Update cms_plugins.py 2018-04-20 17:51:46 +05:30
Arvind Tiwari
a25bcc807f change header slider to container fluid 2018-04-20 17:04:02 +05:30
Arvind Tiwari
da13903ba2 remove padding 2018-04-20 16:42:50 +05:30
M.Ravi
0b97ae69f5 Cleanup and reformat some code 2018-04-19 09:23:22 +02:00
M.Ravi
a7f1f14dc7 Raise Http404 when we do not have a post for a given language 2018-04-19 09:12:54 +02:00
PCoder
4e3211b62f Make total and subtotal texts bold 2018-04-18 21:37:12 +02:00
PCoder
36c0b9a0a6 Differentiate price and total_price in hosting order_detail 2018-04-17 22:23:46 +02:00
PCoder
2ac1ac7d97 Add subtotal and VAT to hosting order detail too 2018-04-17 22:20:36 +02:00
PCoder
4c21110c00 Remove fuzzy and python-format 2018-04-17 21:47:02 +02:00
PCoder
a454cd2522 Update datacenterlight's django.po 2018-04-17 21:38:53 +02:00
PCoder
c2513dc7c3 Show vat_percent and subtotal for vat exclusive case 2018-04-17 21:38:28 +02:00
PCoder
a50fa77c8a Update get_vm_price_with_vat: Return vat_percentage also 2018-04-17 21:36:08 +02:00
PCoder
e4e7d93275 Fix flake8 errors 2018-04-17 20:50:41 +02:00
M.Ravi
b3d36c1be3 Reformat code 2018-04-17 18:12:45 +02:00
M.Ravi
d15a4da840 Check if child plugin instances exist before looping over them 2018-04-17 18:03:14 +02:00
M.Ravi
8b5b353e59 Reformat code and give proper name to comic urlconf 2018-04-17 17:15:55 +02:00
M.Ravi
80a568b2b3 Remove unwanted /comic/... urlconf 2018-04-17 17:14:39 +02:00
M.Ravi
7d211b3333 Modify PostListViewUngleich: Filter posts by category if specified 2018-04-17 16:17:46 +02:00
M.Ravi
ff1d4f1a6f Rename tags to category, because thats how we filter posts by 2018-04-17 16:15:49 +02:00