ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity
5185 commits 13 branches 148 tags 315 MiB
Commit graph

5185 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nico Schottelius
23cd61ad54 requirements: upgrade celery (5.2.7) and friends 
Failing with:

The conflict is caused by:
    The user requested Django==1.9.4
    aldryn-boilerplates 0.7.4 depends on Django<1.9.999 and >=1.5
    aldryn-categories 1.0.3 depends on django<1.10 and >=1.6
    aldryn-newsblog 1.2.1 depends on Django<1.10 and >=1.6
    aldryn-people 1.2.0 depends on Django<1.10 and >=1.6
    aldryn-reversion 1.0.8 depends on Django<1.10 and >=1.6
    aldryn-search 0.2.11 depends on Django>=1.4
    cmsplugin-filer 1.0.1 depends on Django>=1.5
    django-appdata 0.1.5 depends on Django>=1.4.10
    django-classy-tags 0.7.2 depends on Django>1.3
    django-cms 3.2.5 depends on Django<1.10 and >=1.6.9
    django-debug-toolbar 1.4 depends on Django>=1.7
    django-filer 1.2.0 depends on Django<1.9.999 and >=1.5
    django-formtools 1.0 depends on Django>=1.7
    django-guardian 1.4.4 depends on Django>=1.7
    django-haystack 2.4.1 depends on Django
    django-model-utils 2.5 depends on Django>=1.4.2
    django-mptt 0.8.4 depends on Django>=1.8
    django-reversion 1.10.2 depends on django>=1.8
    django-standard-form 1.1.1 depends on Django>=1.3
    django-stored-messages 1.4.0 depends on Django>=1.8
    django-taggit-templatetags 0.2.5 depends on django>=1.1
    django-treebeard 4.0.1 depends on Django>=1.7
    djangocms-picture 1.0.0 depends on django>=1.6
    easy-thumbnails 2.3 depends on django>=1.4.2
    model-mommy 1.2.6 depends on Django
    django-celery-results 2.5.1 depends on Django>=3.2.18
 2023-05-23 19:20:44 +02:00
Nico Schottelius
d60032c59a requirements: update some packages to newer versions 
Fixing a lot of pip install issues
 2023-05-23 19:05:57 +02:00
Nico Schottelius
179a2e6349 [gitignore] ignore venv/ 2023-05-23 19:05:15 +02:00
PCoder
8ba6ecadf2 Library updates -- still fails on installing pillow 2023-05-23 08:10:26 +00:00
PCoder
b173d7d8a2 Fix requirements 2023-05-19 13:42:32 +00:00
app@dynamicweb-production
26d9a77ebf Update changelog 2023-04-14 05:07:37 +02:00
app@dynamicweb-production
5f1534c152 Replace jQuery dependent code with vanilla js 2023-04-14 05:05:35 +02:00
app
590f7391c4 Merge remote-tracking branch 'origin/master' 2022-05-16 11:57:16 +02:00
app@dynamicweb-production
95c07fbed1 Change to dcl-orders for new vm and removing ipv6onlyhosting.{net,ch} references 2022-05-16 11:56:05 +02:00
app@dynamicweb-production
a21b4d6e3f Change to dcl-orders for new vm 2022-03-23 10:46:12 +01:00
mravi
d739a4a50e Merge pull request 'Change admin email to dcl-orders for vm purchase' (#12) from change-email-address into master 
Reviewed-on: #12
 2022-02-05 03:19:01 +00:00
PCoder
138fd519b7 Change admin email to dcl-orders for vm purchase 2022-02-05 08:30:58 +05:30
Nico Schottelius
8179ca4d22 Add support for docker build + docker release 2021-12-17 22:21:59 +01:00
Nico Schottelius
c0333212aa Begin updating for dockerisation 2021-12-17 22:02:20 +01:00
Mondi Ravi
4861bee9d3 Merge branch 'master' into 'master' 
Fix poland country code in eu_countries

See merge request ungleich-public/dynamicweb!749
 2021-09-30 10:32:26 +02:00
amal
5ce283318a Fix poland country code in eu_countries 2021-09-27 09:21:24 +02:00
Mondi Ravi
79e96715b2 Merge branch 'issue/1/user-password-update' into 'master' 
Issue/1/user password update

See merge request ungleich-public/dynamicweb!748
 2021-08-30 15:20:27 +02:00
PCoder
47d5c63e3b Fix bad import 2021-08-30 18:38:58 +05:30
PCoder
d26f2b0f69 Normalize/convert ascii/ignore unicode characters for homeDirectory 2021-08-30 18:29:42 +05:30
Mondi Ravi
7c2c3de1f6 Merge branch '9053/show-paid-invoices-only' into 'master' 
Filter invoices by paid status

See merge request ungleich-public/dynamicweb!747
 2021-03-29 03:59:48 +02:00
PCoder
1d48dfb93b Filter invoices by paid status 2021-03-29 07:23:58 +05:30
PCoder
63821813d4 Fix translations 2021-02-07 18:05:48 +05:30
PCoder
173c0fe9bf Update texts 2021-02-07 17:28:44 +05:30
PCoder
6279fa4e7b Fix missing escapes 2021-02-07 16:21:02 +05:30
PCoder
1fec2add72 Update Changelog for 3.2 2021-02-07 16:07:23 +05:30
PCoder
d46deaa23a Do not use UserCardDetail to save card 2021-02-07 15:58:03 +05:30
PCoder
a5c83dd589 Update order confirmation text to better prepared for payment dispute 2021-02-07 15:55:47 +05:30
PCoder
af09b343c0 Update Changelog for 3.1 2021-01-12 13:56:58 +05:30
PCoder
3b874901bc Update using correct card details 2021-01-12 13:40:03 +05:30
PCoder
640807eb62 Don't get card from local db 2021-01-12 13:39:11 +05:30
PCoder
21f762d6b8 Update Changelog for 3.0 2021-01-07 16:39:00 +05:30
Mondi Ravi
9e640d0802 Merge branch '8691/check_vm_templates' into 'master' 
8691/check vm templates

See merge request ungleich-public/dynamicweb!744
 2021-01-07 12:06:02 +01:00
PCoder
c58302d90e Log error messages 2021-01-07 16:30:48 +05:30
PCoder
1e67bef4f5 Remove unwanted code/comments 2021-01-07 16:30:33 +05:30
PCoder
ec13a71866 Reformat code 2021-01-07 16:29:34 +05:30
PCoder
6c968fdbb8 Redirect to dcl payment 
We no longer seem to use hosting payment
 2021-01-02 09:03:02 +05:30
PCoder
44ebb71916 Also clear id_payment_method from session 2021-01-02 09:02:37 +05:30
PCoder
1d7c3f424c Don't send admin email if IncompletePaymentIntent lookup doesn't contain a value 2021-01-01 11:17:07 +05:30
PCoder
8deed169ca Fix redirect url 
Take user to virtual_machines page if the user ordered a VM
 2021-01-01 11:13:02 +05:30
PCoder
7cd485bc6d Fix issues on settings/card save/delete methods 2021-01-01 02:37:52 +05:30
PCoder
31c5336e18 Show cards directly from Stripe and dissociate using PaymentMethod 2021-01-01 01:59:41 +05:30
PCoder
36505db5a2 set default_payment_method 2021-01-01 01:35:59 +05:30
PCoder
e7462289f6 Just log IncompleteSubscription does not exist error 
Do not compare with db and send admin error message
 2021-01-01 01:03:08 +05:30
PCoder
9b84461a29 Add logger messages 2021-01-01 00:58:11 +05:30
PCoder
04003757dc Move log block to correct case 2021-01-01 00:43:28 +05:30
PCoder
e024a3a7a6 Do not create paymentintent for subscription 2021-01-01 00:34:35 +05:30
PCoder
ba3c5ddd1d Use different js code for one-time and subscriptions 2021-01-01 00:09:47 +05:30
PCoder
2c3d00f03f Pass correct stripe_customer_id 2021-01-01 00:09:20 +05:30
PCoder
d8a674da3d Remove unwanted code + doc 2021-01-01 00:08:58 +05:30
PCoder
9524e03762 Pass user param with request dict 2021-01-01 00:08:33 +05:30