Commit graph

Select branches

Hide pull requests

12334-generic-products-name-in-invoice

2.10.4

5151/gdpr_modal

7147/add-explanatory-text-puffy

7169/server-error

7333/generic-product-header

7769/fix-private-key-download-firefox

7773/use-username-with-opennebula

7894/show-one-time-payment-invoices

8102/increase-vm-terminate-poll-time

8303/SCA-Charges-API

8307/exclude-vat-calculations

8393/show-SCA

8654/500-error-invoices

8773/add-captcha-contact-form

8781/set-default-card-error

HenryGBC-dcl-bug#3366-3426

branch-2.10.3

branch-2.10.3b

bug/6364/apply_discount_before_vat

bugfix-charge-invoices

bugfix/500-error-vpn

bugfix/improve_admin_mail_terminate_vm

bugfix/increase-configuration-length

bugfix/move-opennebula-code-to-celery

bugfix/serializer-vcpu

bugfix/specify-per-year

bugfix/ungleich-submenu

bugfix/update-createvm-tests

changes-settings

design_membership

feature/6561/invoices-webhook

feature/VAT_number

feature/add-vat-rates

feature/add-vm-base-price

feature/all_customers_mgmt_command

feature/blog-by-category

feature/eu-vat-for-new-vms

feature/handle_calculator_form_post

feature/introduce-dcl-dark-navbar-always

feature/new-ui-for-generic-product-pricing

feature/nosystemd

feature/old_master

feature/show-stripe-invoices-directly

feature/ungleich-add-language-menu

feature/vm_pricing

feature/yearly-subscription

handle_calculator_post

hosting_translations

introduce_base_price

ldap_integration

make-subscriptions-consistent

master

master-2.10.3b

remove-ipv6onlyhosting-net-ch

serialize

show-hosting-key-in-admin

show-one-off-payments-also

task/3530/upgrade_to_django_1.11

upgrade-cdist-version

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.3

2.5.2

2.6.2

old-2.0

Mono Color

• c4f6780a0e Add management command fix_generic_stripe_plan_product_names.py 12334-generic-products-name-in-invoice PCoder 2024-03-22 16:54:54 +05:30
• 0679a47eea Merge branch 'master' into 12334-generic-products-name-in-invoice pcoder116 2024-03-21 02:42:56 +00:00
• 8b08357d05 entrypoint: make executable Nico Schottelius 2024-02-20 17:19:05 +09:00
• 8b06c2c6e9 docker: add entrypoint and add support for dynamic config Nico Schottelius 2024-02-20 17:18:29 +09:00
• 26f3a1881d make build image only push if push is specified Nico Schottelius 2024-02-20 16:25:13 +09:00
• dee2b1a90c Merge pull request 'make-docker-build-succesful' (#19) from make-docker-build-succesful into master nico14571 2024-02-20 01:06:22 +00:00
• 9e98125b13 Use the same django-filer version being used on production PCoder 2024-02-19 20:50:10 +05:30
• 8d13629c8b Use proper library path for Pillow PCoder 2024-02-19 20:49:29 +05:30
• b6ff2b62c1 Add comment for alpine 3.14 requirement PCoder 2024-02-19 20:44:17 +05:30
• 893c816846 Add apks required for the build on alpine 3.12 PCoder 2024-02-19 20:43:33 +05:30
• f178be8395 Update .dockerignore: ignore .env PCoder 2024-02-19 20:42:34 +05:30
• 0d7f10776c [docker] push if build is ok Nico Schottelius 2024-02-17 20:49:31 +09:00
• 4eb470df16 [docker] switch to python 3.5 Nico Schottelius 2024-02-17 20:48:17 +09:00
• 6262432b7a Merge remote-tracking branch 'ungleich/master' app@dynamicweb-production 2024-02-17 11:21:58 +01:00
• bd4d81c286 Show virtual machine plan page for admin app@dynamicweb-production 2024-02-17 11:20:12 +01:00
• 169dc6b1ee Add initial script for image building Nico Schottelius 2024-02-17 18:27:44 +09:00
• fdb790bac7 Use the actual plan name instead of the generic plan id PCoder 2024-02-16 16:24:37 +05:30
• 6a374f7fa0 Rearrange PCoder 2024-02-16 16:23:19 +05:30
• 10d2c25556 Get product name from id it starts with generic otherwise use as is PCoder 2024-02-16 16:23:02 +05:30
• 5b5239d1d4 Merge branch 'master' into bugfix-charge-invoices pcoder116 2024-02-09 15:41:43 +00:00
• 41461538a3 Changes on prod app@dynamicweb-production 2024-02-09 16:38:10 +01:00
• 7afa9d2f4c Show settings view for admin app@dynamicweb-production 2024-02-09 16:37:34 +01:00
• 96af882e6d Fix mistake is obtaining the correct hosting order id bugfix-charge-invoices PCoder 2024-02-09 21:03:17 +05:30
• 2e335fc574 Merge pull request 'bugfix-vm-detail-no-invoice' (#16) from bugfix-vm-detail-no-invoice into master pcoder116 2024-01-26 03:46:11 +00:00
• 7d22086677 Merge remote-tracking branch 'mainRepo/master' PCoder 2024-01-26 09:12:34 +05:30
• 83d1e54137 Fix error when user accesses vm details and no invoices PCoder 2024-01-26 09:11:57 +05:30
• b6f9e6a706 Merge remote-tracking branch 'origin/master' PCoder 2024-01-26 08:18:41 +05:30
• 4e891ed0bb Update countries list PCoder 2023-12-29 08:50:58 +05:30
• 4d3da3387a Print case where CustomUser is not found in the datbase from Stripe customer id PCoder 2023-12-27 20:36:59 +05:30
• 94a81fc976 Fix obtaining correct CustomUSer PCoder 2023-12-27 19:49:50 +05:30
• 36b091700e Fix headers PCoder 2023-12-25 12:28:03 +05:30
• 3c48811548 Fix typo PCoder 2023-12-25 12:25:07 +05:30
• 10c167e76b Fix typo PCoder 2023-12-25 12:23:52 +05:30
• f31838dbe5 Separate fields PCoder 2023-12-25 12:22:34 +05:30
• 92e5254679 Fix customer name and vat rate PCoder 2023-12-25 12:14:48 +05:30
• a0ade926fb Fix variable name typo PCoder 2023-12-25 11:44:52 +05:30
• ea4ff961c2 add missing logging PCoder 2023-12-25 11:43:29 +05:30
• e3b816d8d7 Merge pull request 'Add management command to change ch vat' (#15) from 12224-change-ch-vat into master pcoder116 2023-12-25 05:59:37 +00:00
• 5530b48d0d Save subscriptions to be changed in a csv PCoder 2023-12-25 11:23:01 +05:30
• a38a4a86a4 Merge branch 'master' into 12224-change-ch-vat mravi 2023-12-06 10:14:28 +00:00
• a492c3de1b Add management command PCoder 2023-12-06 15:34:23 +05:30
• 325d1ffcb9 Ignore more contact f app@dynamicweb-production 2023-11-17 03:43:49 +01:00
• 3c3c614b6b Debug app@dynamicweb-production 2023-11-17 03:39:12 +01:00
• c5f8660c55 Disable all saving of contact us form and send emails app@dynamicweb-production 2023-11-17 03:29:10 +01:00
• 9f74c0286e Add installed app app@dynamicweb-production 2023-11-16 19:24:59 +01:00
• dc6f5dcc5b add recaptcha coe app@dynamicweb-production 2023-11-16 19:12:59 +01:00
• c69affc9a1 Add migration app@dynamicweb-production 2023-07-27 10:33:40 +02:00
• 33aeaf7ddb Increase max_digits for generic product price and vat app@dynamicweb-production 2023-07-27 10:32:46 +02:00
• 26d9a77ebf Update changelog app@dynamicweb-production 2023-04-14 05:07:37 +02:00
• 5f1534c152 Replace jQuery dependent code with vanilla js app@dynamicweb-production 2023-04-14 05:05:35 +02:00
• 590f7391c4 Merge remote-tracking branch 'origin/master' app 2022-05-16 11:57:16 +02:00
• 95c07fbed1 Change to dcl-orders for new vm and removing ipv6onlyhosting.{net,ch} references app@dynamicweb-production 2022-03-23 10:46:12 +01:00
• 338ff38bbb Actual po master remove-ipv6onlyhosting-net-ch Tomislav R 2022-05-16 11:37:30 +02:00
• 66f3989c23 WIP removing ipv6onlyhosting.{net,ch} references Tomislav R 2022-05-16 11:08:14 +02:00
• a21b4d6e3f Change to dcl-orders for new vm app@dynamicweb-production 2022-03-23 10:46:12 +01:00
• d739a4a50e Merge pull request 'Change admin email to dcl-orders for vm purchase' (#12) from change-email-address into master mravi 2022-02-05 03:19:01 +00:00
• 138fd519b7 Change admin email to dcl-orders for vm purchase PCoder 2022-02-05 08:30:58 +05:30
• 8179ca4d22 Add support for docker build + docker release Nico Schottelius 2021-12-17 22:21:59 +01:00
• c0333212aa Begin updating for dockerisation Nico Schottelius 2021-12-17 22:02:20 +01:00
• 4861bee9d3 Merge branch 'master' into 'master' Mondi Ravi 2021-09-30 10:32:26 +02:00
• 5ce283318a Fix poland country code in eu_countries amal 2021-09-27 09:21:24 +02:00
• 79e96715b2 Merge branch 'issue/1/user-password-update' into 'master' Mondi Ravi 2021-08-30 15:20:27 +02:00
• 47d5c63e3b Fix bad import PCoder 2021-08-30 18:38:58 +05:30
• d26f2b0f69 Normalize/convert ascii/ignore unicode characters for homeDirectory PCoder 2021-08-30 18:29:42 +05:30
• 7c2c3de1f6 Merge branch '9053/show-paid-invoices-only' into 'master' Mondi Ravi 2021-03-29 03:59:48 +02:00
• 1d48dfb93b Filter invoices by paid status PCoder 2021-03-29 07:23:58 +05:30
• 73c53a7a61 Updates 8773/add-captcha-contact-form PCoder 2021-03-03 13:54:25 +05:30
• 409405f296 Show captcha text PCoder 2021-02-11 16:21:54 +05:30
• e68e0b32f8 Add ip_address field PCoder 2021-02-11 16:21:07 +05:30
• 63821813d4 Fix translations PCoder 2021-02-07 18:05:48 +05:30
• 173c0fe9bf Update texts PCoder 2021-02-07 17:28:44 +05:30
• 6279fa4e7b Fix missing escapes PCoder 2021-02-07 16:21:02 +05:30
• 1fec2add72 Update Changelog for 3.2 PCoder 2021-02-07 16:07:23 +05:30
• d46deaa23a Do not use UserCardDetail to save card PCoder 2021-02-07 15:58:03 +05:30
• a5c83dd589 Update order confirmation text to better prepared for payment dispute PCoder 2021-02-07 15:55:47 +05:30
• e51af13a31 Change the str repr show-hosting-key-in-admin PCoder 2021-01-22 22:41:56 +05:30
• c6f05889ff Modify admin template to include table wrap styles PCoder 2021-01-22 08:08:40 +05:30
• ac139c8a99 Register UserHostingKey to admin site and add str repr PCoder 2021-01-21 20:46:12 +05:30
• af09b343c0 Update Changelog for 3.1 PCoder 2021-01-12 13:56:58 +05:30
• 3b874901bc Update using correct card details 8781/set-default-card-error PCoder 2021-01-12 13:40:03 +05:30
• 640807eb62 Don't get card from local db PCoder 2021-01-12 13:39:11 +05:30
• 21f762d6b8 Update Changelog for 3.0 PCoder 2021-01-07 16:39:00 +05:30
• 9e640d0802 Merge branch '8691/check_vm_templates' into 'master' Mondi Ravi 2021-01-07 12:06:02 +01:00
• c58302d90e Log error messages 8393/show-SCA PCoder 2021-01-07 16:30:48 +05:30
• 1e67bef4f5 Remove unwanted code/comments PCoder 2021-01-07 16:30:33 +05:30
• ec13a71866 Reformat code PCoder 2021-01-07 16:29:34 +05:30
• 6c968fdbb8 Redirect to dcl payment PCoder 2021-01-02 09:02:58 +05:30
• 44ebb71916 Also clear id_payment_method from session PCoder 2021-01-02 09:02:37 +05:30
• 1d7c3f424c Don't send admin email if IncompletePaymentIntent lookup doesn't contain a value PCoder 2021-01-01 11:17:07 +05:30
• 8deed169ca Fix redirect url PCoder 2021-01-01 11:12:56 +05:30
• 7cd485bc6d Fix issues on settings/card save/delete methods PCoder 2021-01-01 02:37:52 +05:30
• 31c5336e18 Show cards directly from Stripe and dissociate using PaymentMethod PCoder 2021-01-01 01:59:41 +05:30
• 36505db5a2 set default_payment_method PCoder 2021-01-01 01:35:59 +05:30
• e7462289f6 Just log IncompleteSubscription does not exist error PCoder 2021-01-01 01:03:05 +05:30
• 9b84461a29 Add logger messages PCoder 2021-01-01 00:58:11 +05:30
• 04003757dc Move log block to correct case PCoder 2021-01-01 00:43:28 +05:30
• e024a3a7a6 Do not create paymentintent for subscription PCoder 2021-01-01 00:34:35 +05:30
• ba3c5ddd1d Use different js code for one-time and subscriptions PCoder 2021-01-01 00:09:47 +05:30
• 2c3d00f03f Pass correct stripe_customer_id PCoder 2021-01-01 00:09:20 +05:30
• d8a674da3d Remove unwanted code + doc PCoder 2021-01-01 00:08:58 +05:30