Commit graph

4837 commits

Author SHA1 Message Date
0372e3d2cf Merge branch 'feature/add-userdump' into 'master'
Feature/add userdump

See merge request ungleich-public/dynamicweb!716
2019-11-04 07:16:59 +01:00
b06c4d541f Feature/add userdump 2019-11-04 07:16:59 +01:00
7e398cf7b1 Merge branch 'bugfix/stripe-amount-can-be-negative' into 'master'
Make HostingBillLineAmount accept negative values

See merge request ungleich-public/dynamicweb!715
2019-10-26 17:58:53 +02:00
PCoder
6638d376b8 Make HostingBillLineAmount accept negative values 2019-10-26 10:32:49 +05:30
PCoder
6d8782415f Fix number formatting for price in invoice details 2019-10-08 06:33:52 +05:30
PCoder
80c1f8314b Update Changelog 2019-09-24 10:38:11 +05:30
PCoder
cc03c11c4a Improve admin email logging 2019-09-24 10:34:04 +05:30
PCoder
8cd7a69162 Convert lazy loaded string to str 2019-09-24 09:44:45 +05:30
PCoder
4dd49051b4 Update Changelog for 2.6.4 2019-09-15 09:38:36 +05:30
PCoder
e4e074ea8d Add explanatory text indicating puffy username on OpenBSD VMs 2019-09-15 09:12:36 +05:30
PCoder
41692b1929 Update Changelog for 2.6.3 2019-08-28 22:13:15 +05:30
5646e370ec Merge branch '7032/bugfix_existing_key' into 'master'
7032/bugfix existing key

See merge request ungleich-public/dynamicweb!712
2019-08-28 18:36:51 +02:00
PCoder
dbd6685c43 Update Changelog 2019-08-27 14:34:26 +05:30
07db974931 Merge branch '7070/fix_opennebula_error' into 'master'
Use opennebula user credentials to find if vm belongs to user

See merge request ungleich-public/dynamicweb!713
2019-08-27 10:58:11 +02:00
PCoder
b2d597232c Use opennebula user credentials to find if vm belongs to user 2019-08-27 11:13:38 +05:30
PCoder
7684687dbc Remove commented code 2019-08-26 16:13:31 +05:30
PCoder
8b8c93d23e Filter distinct public keys only 2019-08-26 16:02:08 +05:30
PCoder
97d83abffe Comment out code that denied adding the same key 2019-08-26 16:01:34 +05:30
55f55b6885 Merge branch '7068/remove-public-prefix' into 'master'
7068/remove public prefix

See merge request ungleich-public/dynamicweb!711
2019-08-22 05:11:54 +02:00
PCoder
7bc2c8eebe Update Changelog for 2.6.2 2019-08-22 08:40:14 +05:30
PCoder
b50a543148 Remove public- prefix shown in django/node/rails hosting pages 2019-08-22 08:38:19 +05:30
PCoder
39699da8ee Update Changelog for 2.6.1 2019-07-09 21:34:00 +05:30
85978aef20 Merge branch '6941/show_card_expiry_year_month' into 'master'
6941/show card expiry year month

See merge request ungleich-public/dynamicweb!710
2019-07-09 18:00:57 +02:00
PCoder
728fd5850b Update hosting django.po -- add "Expiry" -> Gültig bis 2019-07-09 21:21:22 +05:30
PCoder
b6ec2ac95b Add missing cc expiry year month in payment page 2019-07-09 19:08:19 +05:30
PCoder
903ef48c75 Format cc month to 2 decimal places 2019-07-09 19:03:09 +05:30
PCoder
fe44908868 Add expiry year and month to get_all_cards_list 2019-07-09 18:47:54 +05:30
PCoder
59c45492a9 Add expiry year and month in the settings and order payment pages 2019-07-09 18:40:41 +05:30
PCoder
3c63f26d31 Update Changelog for 2.6 2019-07-03 20:59:48 +05:30
20a5e51cad Merge branch 'task/5509/improve-asking-ssh-key' into 'master'
Task/5509/improve asking ssh key

See merge request ungleich-public/dynamicweb!709
2019-07-03 16:56:30 +02:00
PCoder
d3e2074b16 Update DE translation
Your VM is almost ready! => Deine VM ist fast fertig!
2019-07-03 17:29:42 +05:30
PCoder
2a4fb8c8de Add DE translation
Your VM is almost ready! => Ihre VM ist fast fertig!
2019-07-03 16:57:00 +05:30
PCoder
69401a1cc6 Make messages for datacenterlight and add some DE translations 2019-07-03 16:52:08 +05:30
PCoder
b0548f4cfa Translate ssh key form title and subtitles 2019-07-03 16:51:29 +05:30
PCoder
6f49157ddd Update add_ssh_key subtitle 2019-07-03 16:27:12 +05:30
PCoder
44921014a2 Get the correct opennebula user id 2019-07-03 07:09:44 +05:30
PCoder
921d832f9e Make user in UserHostingKey model nullable 2019-07-03 06:44:31 +05:30
PCoder
dfb16f0c25 Save new user's hosting key only in that case 2019-07-03 05:13:02 +05:30
PCoder
26fab27c3f Set new_user_hosting_key_id session variable to track newly created key 2019-07-01 23:17:27 +05:30
PCoder
ddaa320628 Set user foreign key to be blank allowing null values 2019-07-01 23:11:49 +05:30
PCoder
32de20aaba Set unon authenticated user to NONE 2019-07-01 23:11:14 +05:30
PCoder
670c2b18a9 Set user_hosting_key's user to the newly created user 2019-07-01 23:09:42 +05:30
PCoder
a20dbc1f96 Cleanup new_user_hosting_key_id session variable also 2019-07-01 23:08:35 +05:30
PCoder
8efe978b23 Don't make SSHKeyCreateView with LoginRequiredMixin 2019-07-01 21:01:41 +05:30
PCoder
561178e473 Set success_url from session and call super post method 2019-07-01 20:48:34 +05:30
PCoder
c8c5bb763a Remove Add SSH key form in "Order Confirm" page related code
(not needed)
2019-07-01 20:36:13 +05:30
PCoder
d9a2c5216c Also remove order_confirm_url from session vars 2019-07-01 20:30:35 +05:30
PCoder
c285e1d9eb Set respective order_confirm_url for landing vs hosting flows
For hosting flow also take the user to add_ssh_key after payment
2019-07-01 20:30:06 +05:30
PCoder
c35bc79c5c Set success_url based on flow: hosting vs landing 2019-07-01 20:28:26 +05:30
PCoder
207c3a6c6c Skip SSH key page for generic products page 2019-07-01 08:57:39 +05:30