Commit graph

Select branches

Hide pull requests

HenryGBC-dcl-bug#3366-3426

aatish/dynamicweb-6213_alignment_fixes

changes-settings

design_membership

feature/nosystemd

feature/old_master

feature/vm_pricing

feature/yearly-subscription

hosting_translations

master

serialize

1.0.0

1.0.1

1.0.10

1.0.11

1.0.12

1.0.13

1.0.14

1.0.15

1.0.16

1.0.17

1.0.18

1.0.19

1.0.2

1.0.20

1.0.21

1.0.22

1.0.23

1.0.24

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1

1.1.1

1.2

1.2.1

1.2.10

1.2.11

1.2.12

1.2.13

1.2.2

1.2.3

1.2.4

1.2.5

1.2.6

1.2.7

1.2.8

1.2.9

1.3

1.3.1

1.3.2

1.3.3

1.4

1.4.1

1.5

1.5.1

1.5.2

1.5.3

1.5.4

1.5.5

1.6

1.6.1

1.6.2

1.6.3

1.6.4

1.6.5

1.7

1.7.1

1.7.2

1.8

1.9

1.9.1

2.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.1

2.1.1

2.1.2

2.2

2.2.1

2.2.2

2.3

2.3.1

2.4

2.4.1

2.4.10

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.4.7

2.4.8

2.4.9

2.5

2.5.1

2.5.10

2.5.11

2.5.2

2.5.3

2.5.4

2.5.5

2.5.6

2.5.7

2.5.8

2.5.9

2.6

2.6.1

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

old-2.0

Mono Color

• 68a65b7bc7 Detect private IP correctly PCoder 2018-06-30 00:30:51 +02:00
• 5eff54cffe Fix a bug -- json not imported; use JsonResponse instead of HttpResponse M.Ravi 2018-06-27 12:34:41 +02:00
• f1e021e1e9 Improve comments M.Ravi 2018-06-27 12:24:53 +02:00
• 88e6d9d216 Separate two error messages with a period M.Ravi 2018-06-27 12:24:16 +02:00
• 2cd73b313a Merge master into task/3934/move_hosting_order_out_of_celery_task and resolve some conflicts M.Ravi 2018-06-27 12:08:48 +02:00
• a3db7f2e1a Merge branch 'master' into task/4890/ssh_key_manage_for_ipv6 PCoder 2018-06-27 09:23:48 +02:00
• 88f0d73336 Update Changelog PCoder 2018-06-27 09:21:41 +02:00
• a56b2d02c8
  Merge pull request #641 from pcoder/bugfix/flake8_error Pcoder 2018-06-27 09:17:11 +02:00
• 60260ccb08 Attempt to fix flake8 error PCoder 2018-06-27 09:06:28 +02:00
• 4a5c5f7942 Refactor getting primary ip of a vm PCoder 2018-06-27 01:06:10 +02:00
• 1ec7cb8761 Fix silly copy/paste bug PCoder 2018-06-27 00:44:17 +02:00
• 6c2eabbe6a Use the public ipv4 if it exists; otherwise use the ipv6 to do a cdist cdist ssh configure PCoder 2018-06-27 00:01:50 +02:00
• a5c42b9c44 Update Changelog for 1.9.1 1.9.1 PCoder 2018-06-24 17:05:33 +02:00
• e816f65114 Update Changelog PCoder 2018-06-24 16:00:54 +02:00
• 1522701a5e
  Merge pull request #638 from pcoder/task/4799/show_selected_vms_only_in_calculator Pcoder 2018-06-24 15:55:11 +02:00
• bf45bf1b4d Merge remote-tracking branch 'mainRepo/master' into task/4799/show_selected_vms_only_in_calculator PCoder 2018-06-24 15:14:11 +02:00
• 549e882ebe Update Changelog PCoder 2018-06-24 14:54:50 +02:00
• 78bda89b16
  Merge pull request #639 from pcoder/task/4847/add_comics_analytics_code Pcoder 2018-06-24 14:49:52 +02:00
• fb9000de90 Update Changelog PCoder 2018-06-24 14:47:05 +02:00
• 70cac38f81 Move initialization of VMTemplates out of the plugin PCoder 2018-06-24 10:28:17 +02:00
• 79e83b4480 Refactor show_vm_templates to DCLCalculatorPluginModel from VMPricing PCoder 2018-06-24 09:08:22 +02:00
• dcbb0c2d64 Add google analytics code for comic.ungleich.ch PCoder 2018-06-19 08:49:21 +02:00
• b872777bda Filter context templates also by the ids that have been set for the calculator PCoder 2018-06-13 11:53:43 +02:00
• 94f520be35 Add migration PCoder 2018-06-13 11:17:18 +02:00
• 5748eecedb Create field for storing os_templates_to_show PCoder 2018-06-13 11:16:49 +02:00
• fae9fce5c6 Remove unnecessary code PCoder 2018-06-12 11:15:17 +02:00
• 6db38d7e29 Check card_id also for order confirmation PCoder 2018-06-12 11:14:36 +02:00
• 86f0526773 Reformat code PCoder 2018-06-12 11:13:10 +02:00
• 23630d4473 Move csrf_token call outside the for loop PCoder 2018-06-12 11:11:37 +02:00
• 7494116468 Add missing import PCoder 2018-06-12 09:36:00 +02:00
• 57eda62586 Update UserCardDetail migration PCoder 2018-06-12 08:28:46 +02:00
• cf00ff6bd8 Attempt to merge master into task/3747/multiple_cards_support PCoder 2018-06-12 08:13:48 +02:00
• ae911c8c21
  Merge pull request #635 from tiwariav/patch/vm_template_patch Arvind Tiwari 2018-05-24 04:24:26 +05:30
• 2d1805f11d update fetchvmtemplates command Arvind Tiwari 2018-05-24 04:14:53 +05:30
• a4ca17e2ed vm template prefix Arvind Tiwari 2018-05-24 03:57:01 +05:30
• cba53e0fe3
  Update Changelog 1.9 Arvind Tiwari 2018-05-17 01:01:50 +05:30
• 4e971c23a0
  Merge pull request #632 from tiwariav/task/4559/calculator_discount Arvind Tiwari 2018-05-12 22:09:32 +05:30
• 8fb0d9a48a order detail divider lines full width Arvind Tiwari 2018-05-12 21:59:06 +05:30
• 3446dcc469 calculator translation Arvind Tiwari 2018-05-12 21:47:58 +05:30
• d40977c5da
  Merge pull request #629 from tiwariav/task/4559/calculator_discount Arvind Tiwari 2018-05-12 21:21:03 +05:30
• b09604d30f add space befor CHF Arvind Tiwari 2018-05-12 03:56:04 +05:30
• f39f95e1f7 remove template filter from translation Arvind Tiwari 2018-05-12 03:47:54 +05:30
• 20f1df8a70 blocktrans variable fix Arvind Tiwari 2018-05-12 03:39:38 +05:30
• 39f7898259 edit order detail footer text Arvind Tiwari 2018-05-12 03:15:07 +05:30
• 55889499df order detail style fix Arvind Tiwari 2018-05-12 02:47:27 +05:30
• 8044e0c2a0 calculator discount text modified Arvind Tiwari 2018-05-11 17:47:27 +05:30
• 30deae5a20 strong color fix Arvind Tiwari 2018-05-11 17:25:44 +05:30
• a14407182f font weight for discount name Arvind Tiwari 2018-05-11 17:21:02 +05:30
• 73e3dce8d4 order detail page font format Arvind Tiwari 2018-05-11 17:18:19 +05:30
• f3ffbd96e5 translation fix Arvind Tiwari 2018-05-10 21:26:47 +05:30
• b351cb9aa0 translation fix Arvind Tiwari 2018-05-10 21:25:38 +05:30
• 55cbe3244a fix testing error Arvind Tiwari 2018-05-07 09:14:31 +05:30
• 0fdb88b8aa invoice discount amount fix Arvind Tiwari 2018-05-07 07:50:32 +05:30
• 3d2ce27954 fix discount amount Arvind Tiwari 2018-05-07 06:29:53 +05:30
• eeed9b2e72 discount name in templates Arvind Tiwari 2018-05-07 06:25:50 +05:30
• 2ff8c25034 exclude discount from total price Arvind Tiwari 2018-05-07 06:11:44 +05:30
• 144d885fbd Merge branch 'master' into task/4559/calculator_discount Arvind Tiwari 2018-05-07 05:23:50 +05:30
• 7a72cc02ab translations Arvind Tiwari 2018-05-07 05:22:05 +05:30
• f8dc2c6bbe discount option added to calculator Arvind Tiwari 2018-05-07 05:07:58 +05:30
• 25ef657c62
  Update cms_plugins.py Arvind Tiwari 2018-05-01 18:15:56 +05:30
• 4d2d337651
  Release 1.8 1.8 Arvind Tiwari 2018-05-01 16:44:15 +05:30
• ccf55acbaf
  Update navbar_dropdown.html Arvind Tiwari 2018-05-01 04:36:29 +05:30
• 6ff03d8f48
  Merge pull request #627 from tiwariav/task/dcl_calculator_on_non_cms_pages Arvind Tiwari 2018-05-01 02:35:22 +05:30
• d6db984156
  Update ungleich.css Arvind Tiwari 2018-05-01 00:48:31 +05:30
• 35fb872dc1
  Update Changelog 1.7.2 Arvind Tiwari 2018-05-01 00:00:05 +05:30
• 86188b1fb0
  Merge pull request #626 from tiwariav/task/4474/slider_padding Arvind Tiwari 2018-04-30 23:52:23 +05:30
• 6bb65d8e8d
  Merge pull request #628 from tiwariav/bugfix/unglieich_cms_template_favicon Arvind Tiwari 2018-04-30 21:20:41 +05:30
• 34df86fb90 add favicon extension to ungleich_template Arvind Tiwari 2018-04-28 00:56:11 +05:30
• 89ed869780 hosting calculator styles Arvind Tiwari 2018-04-25 23:31:27 +05:30
• 0c4c945ec3 flake8 fix Arvind Tiwari 2018-04-25 17:51:36 +05:30
• 14548b2f01 flake8 refacoring Arvind Tiwari 2018-04-25 17:26:31 +05:30
• 91a65e88ec hosting vm payment price fix Arvind Tiwari 2018-04-25 16:08:05 +05:30
• f66d768ecb hosting payment page Arvind Tiwari 2018-04-25 15:55:58 +05:30
• 3b3b73a2ce alignment calculator plugin Arvind Tiwari 2018-04-25 15:08:28 +05:30
• 3bf064a017 add calculator placeholder to cms_integration Arvind Tiwari 2018-04-25 14:52:25 +05:30
• 91f1c1ef06
  Update Changelog Arvind Tiwari 2018-04-21 23:05:23 +05:30
• 67a6c8f2c2
  Update Changelog 1.7.1 Arvind Tiwari 2018-04-21 22:59:00 +05:30
• 49c0406296
  Merge pull request #625 from pcoder/bugfix/4481/fix_DE_blog_pages_500_error Arvind Tiwari 2018-04-21 22:54:18 +05:30
• 526426c6c0
  Merge pull request #623 from pcoder/task/4370/ungleich_comic Arvind Tiwari 2018-04-21 22:47:08 +05:30
• 1a692bc88f merge master Arvind Tiwari 2018-04-21 22:39:44 +05:30
• 3b6c2b9d4e fix vm_id default Arvind Tiwari 2018-04-21 22:27:43 +05:30
• a5bd8347e8 merged master Arvind Tiwari 2018-04-21 21:01:42 +05:30
• 45bd853a20
  Update Changelog 1.7 Arvind Tiwari 2018-04-20 21:09:16 +05:30
• d21e2a8abe
  Merge pull request #618 from tiwariav/task/4297/cms_favicon Arvind Tiwari 2018-04-20 20:59:17 +05:30
• 3d0505330c
  Merge pull request #620 from tiwariav/bugfix/blog_top_menu Arvind Tiwari 2018-04-20 20:58:59 +05:30
• b660ac5ed4 merge master Arvind Tiwari 2018-04-20 20:37:34 +05:30
• 564f7a5be8 merge migrations Arvind Tiwari 2018-04-20 20:36:28 +05:30
• 275ea47e41 merge master Arvind Tiwari 2018-04-20 20:30:45 +05:30
• 71a37972d3 Merge remote-tracking branch 'ungleich/master' Arvind Tiwari 2018-04-20 20:29:09 +05:30
• 736253feda refactor imports Arvind Tiwari 2018-04-20 20:27:26 +05:30
• 3debf34118 remove vm creation to util function Arvind Tiwari 2018-04-20 20:25:24 +05:30
• 74554f1c24
  Merge pull request #622 from pcoder/task/4379/price_without_vat Arvind Tiwari 2018-04-20 19:04:10 +05:30
• 8f6260b063
  Update _calculator_form.html Arvind Tiwari 2018-04-20 17:54:23 +05:30
• 1e97d0ba38
  Update cms_plugins.py Arvind Tiwari 2018-04-20 17:51:46 +05:30
• a25bcc807f change header slider to container fluid Arvind Tiwari 2018-04-20 17:04:02 +05:30
• da13903ba2 remove padding Arvind Tiwari 2018-04-20 16:42:50 +05:30
• 0b97ae69f5 Cleanup and reformat some code M.Ravi 2018-04-19 09:23:22 +02:00
• a7f1f14dc7 Raise Http404 when we do not have a post for a given language M.Ravi 2018-04-19 09:12:54 +02:00
• fae1c7fbeb Update hosting_order in a pythonic way M.Ravi 2018-04-19 07:26:34 +02:00
• 80c3ac5346 Improve create_vm_task test PCoder 2018-04-19 01:09:25 +02:00