Commit graph

4616 commits

Author SHA1 Message Date
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
PCoder
2c74eae3f9 Remove commented code 2019-07-01 08:56:43 +05:30
PCoder
79eba3b70c Remove add SSH key form in order confirmation related code 2019-07-01 08:28:28 +05:30
PCoder
5fcd0d6b18 Remove add SSH key form in the order confirmation 2019-07-01 08:18:10 +05:30
PCoder
9b73fa71dc Add datacenterlight add_ssh_key.html template file 2019-07-01 08:10:37 +05:30
PCoder
47fd9a8f28 Adjust urls in datacenterlight/hosting apps urls/views after refactor 2019-07-01 08:09:37 +05:30
PCoder
b6eb72af7d Refactor SSHKeyCreateView to utils
Common between hosting/datacenterlight apps
2019-07-01 08:08:43 +05:30
PCoder
f502e53845 Add basic implementation of AskSSHKeyView 2019-07-01 06:45:48 +05:30
PCoder
d5d90e0790 Add datacenterlight url: /add-ssh-key 2019-07-01 06:43:49 +05:30
59a78dd8bb Merge branch 'task/5509/add-keys-to-opennebula-user' into 'master'
Save user's key in opennebula

See merge request ungleich-public/dynamicweb!704
2019-06-25 14:00:44 +02:00
PCoder
feeb102f92 Do SSH key validation only if the user doesn't have an existing key and
the user has input some value in the add ssh key field
2019-06-25 03:48:29 +02:00
PCoder
34c917acc2 Add SSH form to hosting VM buy flow also 2019-06-25 03:10:50 +02:00
PCoder
85f7d73442 Code cleanup: Remove ssh_key_added_to_vm email templates 2019-06-25 02:32:19 +02:00
PCoder
6d3b5f40c0 Merge remote-tracking branch 'mainRepo/master' into task/5509/add-keys-to-opennebula-user 2019-06-25 02:29:15 +02:00
PCoder
9ee1b7c124 Make public_key form params mandatory only if existing keys do not exist 2019-06-25 02:25:17 +02:00
PCoder
0cf5e541cc Code cleanup: remove VM poweroff/resume methods + styles + html code 2019-06-25 02:24:14 +02:00
PCoder
08608c726f Code cleanup: remove updating ssh keys on live VMs 2019-06-25 02:11:57 +02:00
PCoder
39549d5e36 Close div 2019-06-24 19:07:11 +02:00
PCoder
a330dee9a1 Modify style 2019-06-24 18:58:44 +02:00
PCoder
ba7ff9e409 Adjust textarea styles 2019-06-24 18:39:25 +02:00
PCoder
04f1112b09 Add key in the text area 2019-06-24 18:26:45 +02:00
PCoder
ecc26d14e5 Show previous keys if exist in order confirmation 2019-06-24 17:24:35 +02:00