Commit graph

4009 commits

Author SHA1 Message Date
PCoder
5748eecedb Create field for storing os_templates_to_show 2018-06-13 11:16:49 +02:00
PCoder
fae9fce5c6 Remove unnecessary code 2018-06-12 11:15:17 +02:00
PCoder
6db38d7e29 Check card_id also for order confirmation 2018-06-12 11:14:36 +02:00
PCoder
86f0526773 Reformat code 2018-06-12 11:13:10 +02:00
PCoder
23630d4473 Move csrf_token call outside the for loop 2018-06-12 11:11:37 +02:00
PCoder
7494116468 Add missing import 2018-06-12 09:36:00 +02:00
PCoder
57eda62586 Update UserCardDetail migration 2018-06-12 08:28:46 +02:00
PCoder
cf00ff6bd8 Attempt to merge master into task/3747/multiple_cards_support 2018-06-12 08:16:11 +02:00
Arvind Tiwari
ae911c8c21
Merge pull request #635 from tiwariav/patch/vm_template_patch
add vm_type option to vm_template and dcl calculator
2018-05-24 04:24:26 +05:30
Arvind Tiwari
2d1805f11d update fetchvmtemplates command 2018-05-24 04:14:53 +05:30
Arvind Tiwari
a4ca17e2ed vm template prefix 2018-05-24 03:57:01 +05:30
Arvind Tiwari
cba53e0fe3
Update Changelog 2018-05-17 01:01:50 +05:30
Arvind Tiwari
4e971c23a0
Merge pull request #632 from tiwariav/task/4559/calculator_discount
bugfix/ discount calculator styles and translation
2018-05-12 22:09:32 +05:30
Arvind Tiwari
8fb0d9a48a order detail divider lines full width 2018-05-12 21:59:06 +05:30
Arvind Tiwari
3446dcc469 calculator translation 2018-05-12 21:48:57 +05:30
Arvind Tiwari
d40977c5da
Merge pull request #629 from tiwariav/task/4559/calculator_discount
Task/4559 enable discount on calculator
2018-05-12 21:21:03 +05:30
Arvind Tiwari
b09604d30f add space befor CHF 2018-05-12 03:56:04 +05:30
Arvind Tiwari
f39f95e1f7 remove template filter from translation 2018-05-12 03:47:54 +05:30
Arvind Tiwari
20f1df8a70 blocktrans variable fix 2018-05-12 03:39:38 +05:30
Arvind Tiwari
39f7898259 edit order detail footer text 2018-05-12 03:15:07 +05:30
Arvind Tiwari
55889499df order detail style fix 2018-05-12 02:47:27 +05:30
Arvind Tiwari
8044e0c2a0 calculator discount text modified 2018-05-11 17:47:27 +05:30
Arvind Tiwari
30deae5a20 strong color fix 2018-05-11 17:25:44 +05:30
Arvind Tiwari
a14407182f font weight for discount name 2018-05-11 17:21:02 +05:30
Arvind Tiwari
73e3dce8d4 order detail page font format 2018-05-11 17:18:19 +05:30
Arvind Tiwari
f3ffbd96e5 translation fix 2018-05-10 21:26:47 +05:30
Arvind Tiwari
b351cb9aa0 translation fix 2018-05-10 21:25:38 +05:30
Arvind Tiwari
55cbe3244a fix testing error 2018-05-07 09:14:31 +05:30
Arvind Tiwari
0fdb88b8aa invoice discount amount fix 2018-05-07 07:50:32 +05:30
Arvind Tiwari
3d2ce27954 fix discount amount 2018-05-07 06:29:53 +05:30
Arvind Tiwari
eeed9b2e72 discount name in templates 2018-05-07 06:25:50 +05:30
Arvind Tiwari
2ff8c25034 exclude discount from total price 2018-05-07 06:11:44 +05:30
Arvind Tiwari
144d885fbd Merge branch 'master' into task/4559/calculator_discount 2018-05-07 05:23:50 +05:30
Arvind Tiwari
7a72cc02ab translations 2018-05-07 05:22:05 +05:30
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