Commit graph

3865 commits

Author SHA1 Message Date
PCoder
c13af95017 Refactor code: get_primary_ip -> get_ipv6 and remove unwanted code 2018-07-01 11:07:39 +02:00
PCoder
8993a7bde1 Reorganize imports + format code 2018-07-01 11:05:23 +02:00
PCoder
52e53d479e Rename a variable: ipv6s -> ipv6_list 2018-07-01 07:57:15 +02:00
PCoder
68a65b7bc7 Detect private IP correctly 2018-06-30 00:30:51 +02:00
PCoder
a3db7f2e1a Merge branch 'master' into task/4890/ssh_key_manage_for_ipv6 2018-06-27 09:23:48 +02:00
PCoder
88f0d73336 Update Changelog 2018-06-27 09:21:41 +02:00
Pcoder
a56b2d02c8
Merge pull request #641 from pcoder/bugfix/flake8_error
Attempt to fix flake8 error
2018-06-27 09:17:11 +02:00
PCoder
60260ccb08 Attempt to fix flake8 error 2018-06-27 09:06:28 +02:00
PCoder
4a5c5f7942 Refactor getting primary ip of a vm 2018-06-27 01:06:27 +02:00
PCoder
1ec7cb8761 Fix silly copy/paste bug 2018-06-27 00:44:17 +02:00
PCoder
6c2eabbe6a Use the public ipv4 if it exists; otherwise use the ipv6 to do a
cdist cdist ssh configure
2018-06-27 00:01:55 +02:00
PCoder
a5c42b9c44 Update Changelog for 1.9.1 2018-06-24 17:05:33 +02:00
PCoder
e816f65114 Update Changelog 2018-06-24 16:00:54 +02:00
Pcoder
1522701a5e
Merge pull request #638 from pcoder/task/4799/show_selected_vms_only_in_calculator
Task/4799/show selected vms only in calculator
2018-06-24 15:55:11 +02:00
PCoder
bf45bf1b4d Merge remote-tracking branch 'mainRepo/master' into task/4799/show_selected_vms_only_in_calculator 2018-06-24 15:14:11 +02:00
PCoder
549e882ebe Update Changelog 2018-06-24 14:54:50 +02:00
Pcoder
78bda89b16
Merge pull request #639 from pcoder/task/4847/add_comics_analytics_code
Add google analytics code for comic.ungleich.ch
2018-06-24 14:49:52 +02:00
PCoder
fb9000de90 Update Changelog 2018-06-24 14:47:05 +02:00
PCoder
70cac38f81 Move initialization of VMTemplates out of the plugin 2018-06-24 10:29:07 +02:00
PCoder
79e83b4480 Refactor show_vm_templates to DCLCalculatorPluginModel from VMPricing 2018-06-24 09:08:22 +02:00
PCoder
dcbb0c2d64 Add google analytics code for comic.ungleich.ch 2018-06-19 08:49:21 +02:00
PCoder
b872777bda Filter context templates also by the ids that have been set for the calculator 2018-06-13 11:55:30 +02:00
PCoder
94f520be35 Add migration 2018-06-13 11:17:18 +02:00
PCoder
5748eecedb Create field for storing os_templates_to_show 2018-06-13 11:16:49 +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