PCoder
|
96de92d312
|
Reorganize code
|
2017-12-20 20:59:46 +01:00 |
|
PCoder
|
7d683e1257
|
Move Stripe subscription cancelation before deleting vm
|
2017-12-17 20:20:42 +01:00 |
|
PCoder
|
a04aa8542d
|
Add some logger debug messages
|
2017-12-12 22:55:30 +01:00 |
|
PCoder
|
1306dbe46a
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-12-12 20:23:25 +01:00 |
|
M.Ravi
|
88afdc1dd1
|
Removed unwanted logger debug msg
|
2017-12-12 16:49:50 +01:00 |
|
M.Ravi
|
24d85d5086
|
Check has_perm only for invoices
|
2017-12-12 15:43:25 +01:00 |
|
M.Ravi
|
091b277f7d
|
Correct call to has_perm
|
2017-12-12 12:42:40 +01:00 |
|
M.Ravi
|
57311eda73
|
Improve debug logs
|
2017-12-12 12:14:39 +01:00 |
|
PCoder
|
79b4b449d1
|
Add some logger messages
|
2017-12-12 09:53:19 +01:00 |
|
PCoder
|
beefeb62cb
|
Raise 404 for HostingOrder not belonging to user
|
2017-12-12 09:38:08 +01:00 |
|
PCoder
|
5e2c40f1a5
|
Fix flake8 warnings
|
2017-11-27 08:03:59 +01:00 |
|
PCoder
|
2102a89cdc
|
Test if PEP8 warnings can be detected in travis build
|
2017-11-27 07:56:28 +01:00 |
|
PCoder
|
a2a35a9475
|
Fix error accessing stripecustomer for user when it doesn't exist
|
2017-10-30 08:26:35 +01:00 |
|
PCoder
|
16b6ecb38c
|
Clear session variables on payment error
|
2017-10-29 23:48:33 +01:00 |
|
PCoder
|
63eb7fc0e2
|
Rename contains to get_user_card_details
|
2017-10-29 21:31:11 +01:00 |
|
PCoder
|
bea3477d84
|
Handle errors related to payment by redirecting to payment page
|
2017-10-29 14:45:14 +01:00 |
|
PCoder
|
cac00d4b9e
|
Implement select default card functionality
|
2017-10-28 22:19:53 +02:00 |
|
PCoder
|
d2ae94327a
|
Associate card only if it has not already been done
|
2017-10-28 18:29:19 +02:00 |
|
PCoder
|
4be105a0a9
|
Set default card for newly added card in hosting flow
|
2017-10-28 16:48:03 +02:00 |
|
PCoder
|
b6d1e8df6b
|
Set preferred for the card that's used for a subscription
|
2017-10-28 15:45:05 +02:00 |
|
PCoder
|
6212c9df50
|
Manage token and card_id properly in hosting flow
|
2017-10-28 15:30:42 +02:00 |
|
PCoder
|
38168e8f8f
|
Allow use of previous cards in hosting flow
|
2017-10-27 00:45:26 +02:00 |
|
M.Ravi
|
4dd407da67
|
Use card_id as session variable instead of token and customer
|
2017-10-26 17:57:11 +02:00 |
|
M.Ravi
|
692f82cba4
|
Code rearrange
|
2017-10-26 15:15:27 +02:00 |
|
M.Ravi
|
ef9dc446db
|
Use hasattr to check if a user already has a stripecustomer object
|
2017-10-26 15:00:54 +02:00 |
|
M.Ravi
|
8d2c120b43
|
Associate newly added card with customer from hosting
|
2017-10-26 12:29:16 +02:00 |
|
PCoder
|
8351b1bf8b
|
Use refactored get_all_cards_list function
|
2017-10-21 23:14:55 +02:00 |
|
PCoder
|
14c7d6ac0e
|
Refactor getting all cards to UserCardDetail.get_all_cards_list()
|
2017-10-21 21:27:21 +02:00 |
|
PCoder
|
8df72620d6
|
Add 'billing address updated' message in that case
|
2017-10-21 20:58:54 +02:00 |
|
PCoder
|
75e90dbacd
|
Refactor and add messages
|
2017-10-21 20:37:50 +02:00 |
|
PCoder
|
be8181ec42
|
Add _messages template to hosting/settings.html
|
2017-10-21 17:02:24 +02:00 |
|
PCoder
|
70b6bbdf2f
|
Save card id as a parameter and use it to delete a source
|
2017-10-21 13:27:35 +02:00 |
|
PCoder
|
c664b44f2c
|
Add functionality to delete user card
|
2017-10-21 00:02:35 +02:00 |
|
M.Ravi
|
c939106a35
|
Prepare to handle delete card
|
2017-10-16 16:29:09 +02:00 |
|
M.Ravi
|
bff37d6246
|
Add card id param to card details
|
2017-10-16 16:20:03 +02:00 |
|
M.Ravi
|
619f37829e
|
Now showing cards from UserCardDetails
|
2017-10-15 23:57:15 +02:00 |
|
M.Ravi
|
3f9c1a68d1
|
Remove unused code
|
2017-10-15 23:38:18 +02:00 |
|
M.Ravi
|
74a1f82c30
|
Refactor handling post for settings card input form
|
2017-10-15 23:37:01 +02:00 |
|
M.Ravi
|
6420a9869b
|
Add functionality to save UserCardDetail
|
2017-10-15 19:55:37 +02:00 |
|
M.Ravi
|
e6f92d9ae4
|
Manual merge
|
2017-10-15 16:14:33 +02:00 |
|
Arvind Tiwari
|
1c50eb45e9
|
Merge pull request #509 from tiwariav/task/3828/invoice_period
task/3828 invoice period
|
2017-10-15 01:27:02 +05:30 |
|
Arvind Tiwari
|
7b71ba1749
|
merged master
|
2017-10-15 00:10:02 +05:30 |
|
Arvind Tiwari
|
4dbf08f995
|
Merge branch 'master' into task/3828/invoice_period
|
2017-10-06 02:39:07 +05:30 |
|
Arvind Tiwari
|
ba8eaa2937
|
new card details option added
|
2017-10-06 01:59:18 +05:30 |
|
Arvind Tiwari
|
6536991209
|
list all cards, card_input template
|
2017-10-06 01:17:35 +05:30 |
|
M.Ravi
|
f0be6d6d7f
|
Merge remote-tracking branch 'mainRepo/master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-10-04 19:32:02 +02:00 |
|
Arvind Tiwari
|
242f4edf8c
|
Merge pull request #513 from tiwariav/bugfix/stripe_customer_id
bugfix/stripe_customer_id
|
2017-10-04 00:05:27 +05:30 |
|
Arvind Tiwari
|
1990c4758e
|
merged master
|
2017-10-03 23:49:26 +05:30 |
|
Arvind Tiwari
|
eb7b1a4ea0
|
Merge remote-tracking branch 'ungleich/master'
|
2017-10-03 21:46:23 +05:30 |
|
Arvind Tiwari
|
c410e2cbc5
|
stripe_customer_id retrieved from request.user relation
|
2017-10-03 21:35:08 +05:30 |
|
Arvind Tiwari
|
315ce92a78
|
post request attributes changed
|
2017-10-03 21:24:35 +05:30 |
|
Arvind Tiwari
|
0263964705
|
stripe_id used instead of id
|
2017-10-03 21:04:25 +05:30 |
|
Arvind Tiwari
|
6802e2fdbc
|
merged master
|
2017-10-03 18:54:47 +05:30 |
|
Arvind Tiwari
|
734a41a371
|
merged master
|
2017-10-03 18:42:00 +05:30 |
|
Arvind Tiwari
|
e4837b063c
|
alignment fix
|
2017-10-03 18:18:18 +05:30 |
|
M.Ravi
|
777aab7115
|
Add cancel subscription code on VM cancel
|
2017-10-03 13:07:41 +02:00 |
|
M.Ravi
|
60b233f082
|
Fix flake8 warnings
|
2017-10-03 00:26:50 +02:00 |
|
M.Ravi
|
44b5d9bb3a
|
hosting order: Add price to vm context
|
2017-10-02 23:17:37 +02:00 |
|
M.Ravi
|
68cbfdd393
|
Update translation and fix loginmixin required for dashboard view
|
2017-10-01 23:06:51 +02:00 |
|
M.Ravi
|
06b1ce9e72
|
Update error message
|
2017-10-01 20:32:51 +02:00 |
|
M.Ravi
|
167eaf2a0c
|
Add forbidden_view method adds the message and redirects to the same path
|
2017-10-01 20:17:03 +02:00 |
|
Arvind Tiwari
|
bd91883369
|
end_date added
|
2017-09-30 17:55:49 +05:30 |
|
M.Ravi
|
6ef8a03de7
|
Respond with JSON
|
2017-09-30 01:02:59 +02:00 |
|
M.Ravi
|
1dfe1d7cf8
|
Redirect to my virtual machines page if any error
|
2017-09-29 21:53:02 +02:00 |
|
M.Ravi
|
4b8d68fc8e
|
Reuse price parameter
|
2017-09-29 09:35:45 +02:00 |
|
M.Ravi
|
5c99dd4da7
|
hosting/views: remove billing_address_id in call to create_vm_task
|
2017-09-29 09:07:38 +02:00 |
|
M.Ravi
|
ac37349aef
|
Refactor code and pass subscription_id instead of obj
|
2017-09-29 08:50:03 +02:00 |
|
Arvind Tiwari
|
ba366eed77
|
merge master
|
2017-09-28 18:37:33 +05:30 |
|
PCoder
|
06ef940b01
|
Merge upstream
|
2017-09-28 03:33:43 +05:30 |
|
PCoder
|
4e080c9afc
|
Invoice: Get VM name from id and configuration
|
2017-09-28 02:36:49 +05:30 |
|
PCoder
|
5a2a134070
|
Merge upstream master
|
2017-09-28 01:35:09 +05:30 |
|
Arvind Tiwari
|
7a07785a94
|
vm cancel email subject changed
|
2017-09-28 01:11:39 +05:30 |
|
Arvind Tiwari
|
937cd2cd82
|
minor fix
|
2017-09-27 03:41:18 +05:30 |
|
Arvind Tiwari
|
45df525a37
|
vm cancel name fix
|
2017-09-27 03:38:39 +05:30 |
|
Arvind Tiwari
|
f4b6b38522
|
minor fix
|
2017-09-27 03:28:06 +05:30 |
|
Arvind Tiwari
|
5747468c21
|
outline removed
|
2017-09-27 03:09:43 +05:30 |
|
Arvind Tiwari
|
d888b260ee
|
welcome user mail
|
2017-09-27 02:45:24 +05:30 |
|
Arvind Tiwari
|
21660f8d00
|
font-size reduced, vm cancel and vm create email data fixed
|
2017-09-27 02:07:52 +05:30 |
|
PCoder
|
e33e9cd1ae
|
Merge branch 'master' into tiwariav-task/3756/landing_billing_page
|
2017-09-26 12:20:56 +05:30 |
|
PCoder
|
c17604e5c1
|
Merge master into task/3730/refactor_price_parameter
|
2017-09-26 12:16:50 +05:30 |
|
PCoder
|
a9e8d8bb34
|
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
|
2017-09-26 12:09:09 +05:30 |
|
Arvind Tiwari
|
050f750322
|
merged master
|
2017-09-26 03:06:12 +05:30 |
|
PCoder
|
3b55e331ed
|
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
|
2017-09-26 01:58:42 +05:30 |
|
PCoder
|
81bc5d5555
|
Merge branch 'master' into task/3781/resend_activation_mail
|
2017-09-26 01:18:02 +05:30 |
|
PCoder
|
78abc0c740
|
Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset
|
2017-09-25 23:55:20 +05:30 |
|
PCoder
|
bb8c1a72fd
|
Add missing import get_language
|
2017-09-25 23:52:47 +05:30 |
|
M.Ravi
|
a73bcaef05
|
Store hash
|
2017-09-25 09:35:18 +02:00 |
|
PCoder
|
7fcece40c1
|
Using VMDetail model to show order details
|
2017-09-25 01:49:00 +05:30 |
|
PCoder
|
f2213305f6
|
Reformatted hosting views.py
|
2017-09-25 00:46:39 +05:30 |
|
PCoder
|
f2f2fc22df
|
Update VMDetail's terminated_at on delete of a vm
|
2017-09-25 00:30:28 +05:30 |
|
PCoder
|
f4899ffc18
|
Added missing get_language import
|
2017-09-25 00:01:48 +05:30 |
|
PCoder
|
afc368e9dd
|
Added ResendActivationEmailView
|
2017-09-24 15:52:17 +05:30 |
|
M.Ravi
|
0974376e9f
|
Reformatted code
|
2017-09-24 09:34:30 +02:00 |
|
PCoder
|
39a2455817
|
Merged upstream master into task/3730/refactor_price_parameter
|
2017-09-24 04:20:41 +05:30 |
|
PCoder
|
9491bb81a2
|
Added missing import after merge
|
2017-09-24 02:03:48 +05:30 |
|
PCoder
|
656e7563fd
|
Merged upstream master into tiwariav-task/3756/landing_billing_page
|
2017-09-24 01:31:57 +05:30 |
|
PCoder
|
300997699a
|
Redirecting new user to my virtual machines page and not forcing ssh key for creating a vm
|
2017-09-24 01:08:15 +05:30 |
|
Arvind Tiwari
|
7456baac16
|
merged master
|
2017-09-23 23:05:10 +05:30 |
|
Arvind Tiwari
|
363017d85f
|
Merge pull request #488 from tiwariav/task/3777/hosting_calculator
Task/3777 hosting create vm calculator
|
2017-09-23 22:50:25 +05:30 |
|
PCoder
|
83b52d95ae
|
Merge branch 'master' into task/3730/refactor_price_parameter
|
2017-09-23 21:18:54 +05:30 |
|
Arvind Tiwari
|
be0c50aa2f
|
error msgs translation
|
2017-09-23 19:01:22 +05:30 |
|
PCoder
|
99e5cf5587
|
Using refactored get_vm_price and get_vm_plan_name functions
|
2017-09-23 03:18:05 +05:30 |
|
Arvind Tiwari
|
6004a7ede4
|
new welcome email
|
2017-09-23 01:03:43 +05:30 |
|
Arvind Tiwari
|
1c0f0da96e
|
conditional texts
|
2017-09-21 19:32:22 +05:30 |
|
Arvind Tiwari
|
a16dbb50d8
|
design fixes
|
2017-09-21 19:17:10 +05:30 |
|
Arvind Tiwari
|
db3955ab94
|
error 500 fixed
|
2017-09-21 17:45:12 +05:30 |
|
Arvind Tiwari
|
a792911dea
|
hosting view fix
|
2017-09-21 17:22:02 +05:30 |
|
Arvind Tiwari
|
5d8fb71215
|
removed redirects form get_context() to get()
|
2017-09-21 16:38:54 +05:30 |
|
Arvind Tiwari
|
2c4390767d
|
minor fixes
|
2017-09-21 15:14:15 +05:30 |
|
Arvind Tiwari
|
6c381dd3fb
|
invoice page redesigned
|
2017-09-21 15:03:00 +05:30 |
|
Arvind Tiwari
|
1eff51099c
|
exception handling fix
|
2017-09-21 02:26:42 +05:30 |
|
Arvind Tiwari
|
65618bb2aa
|
merged master
|
2017-09-20 23:24:20 +05:30 |
|
Arvind Tiwari
|
f4766c7d7c
|
merged master
|
2017-09-20 23:19:32 +05:30 |
|
Arvind Tiwari
|
3ef07758ef
|
translation and text fix
|
2017-09-19 01:08:27 +05:30 |
|
Arvind Tiwari
|
78423c83e3
|
removed error details from error msg
|
2017-09-19 00:59:51 +05:30 |
|
Arvind Tiwari
|
61bf158238
|
fix
|
2017-09-19 00:25:38 +05:30 |
|
Arvind Tiwari
|
8db7ead9e2
|
checking VM termination error
|
2017-09-19 00:24:06 +05:30 |
|
Arvind Tiwari
|
226f744bae
|
success modal added
|
2017-09-18 21:52:59 +05:30 |
|
PCoder
|
0cf8e237b5
|
Now passing user's language to celery task
|
2017-09-16 20:55:37 +05:30 |
|
PCoder
|
acb739944b
|
Added sending email to user on create vm
|
2017-09-16 19:30:31 +05:30 |
|
PCoder
|
f2ee0ea657
|
Converting ugettext_lazy proxy to string
|
2017-09-16 17:54:05 +05:30 |
|
PCoder
|
c9fd741c89
|
Added encode method for ugettext_lazy strings
|
2017-09-16 17:22:37 +05:30 |
|
PCoder
|
40f13784ac
|
Reverted back to ugettext_lazy in hosting/views
|
2017-09-16 16:50:14 +05:30 |
|
M.Ravi
|
8c2fd03082
|
Now responding json HttpResponse for modal on vm create in hosting.
Important: Using ugettext instead of ugettext_lazy in hosting/views.py
|
2017-09-15 17:34:23 +02:00 |
|
Arvind Tiwari
|
556ed75262
|
translations
|
2017-09-15 20:14:32 +05:30 |
|
Arvind Tiwari
|
87327d028a
|
hosting form view modified
|
2017-09-15 20:03:52 +05:30 |
|
Arvind Tiwari
|
d49e90bd20
|
catching WrongIdError
|
2017-09-15 18:15:06 +05:30 |
|
Arvind Tiwari
|
bbb1919404
|
error msg fix
|
2017-09-15 17:38:52 +05:30 |
|
Arvind Tiwari
|
77f2454e3c
|
remove error msg on successful termination
|
2017-09-15 17:20:42 +05:30 |
|
Arvind Tiwari
|
fdb5039c02
|
minor adjustments
|
2017-09-15 16:57:17 +05:30 |
|
Arvind Tiwari
|
6136a48961
|
edge cases handled
|
2017-09-15 16:46:56 +05:30 |
|
Arvind Tiwari
|
852c1228ba
|
minor fix
|
2017-09-15 14:48:11 +05:30 |
|
PCoder
|
805f1129e8
|
Merged upstream master into task/3772/hosting_billing_monthly_subscription
|
2017-09-15 03:34:50 +05:30 |
|
Arvind Tiwari
|
a935871722
|
code reformating
|
2017-09-15 00:57:59 +05:30 |
|
Arvind Tiwari
|
8402fd4fd3
|
merge master
|
2017-09-15 00:19:01 +05:30 |
|
Arvind Tiwari
|
a1a90ed5d0
|
while loop code formating
|
2017-09-15 00:14:09 +05:30 |
|
Arvind Tiwari
|
8393afe141
|
translations and test methods removed
|
2017-09-14 02:59:08 +05:30 |
|
Arvind Tiwari
|
e045caebbe
|
redirect on success
|
2017-09-14 02:52:37 +05:30 |
|
Arvind Tiwari
|
a808f3bf7e
|
error fix on termination
|
2017-09-14 02:48:56 +05:30 |
|
Arvind Tiwari
|
abc290de61
|
added error msg
|
2017-09-14 02:43:01 +05:30 |
|
Arvind Tiwari
|
07a464231d
|
animation added to vm termination
|
2017-09-14 02:24:10 +05:30 |
|
M.Ravi
|
86ed0e5319
|
Removed code related removing keys from known_hosts
|
2017-09-13 14:32:33 +02:00 |
|
PCoder
|
94a5987985
|
Removed an unwanted print
|
2017-09-13 06:35:07 +05:30 |
|
PCoder
|
612e11736e
|
Corrected obtaining values from vm_data dict
|
2017-09-13 05:37:26 +05:30 |
|
PCoder
|
f94ed011e5
|
Remove keys from known_hosts on delete of a vm
|
2017-09-13 05:30:05 +05:30 |
|
PCoder
|
1836d315cd
|
Added query param to distinguish confirm order from invoice
|
2017-09-10 12:22:32 +05:30 |
|
PCoder
|
b1589e9c68
|
Reorganized imports hosting/views.py
|
2017-09-09 21:41:20 +05:30 |
|
PCoder
|
c1a8689199
|
Merged upstream master into task/3772/hosting_billing_monthly_subscription
|
2017-09-09 21:40:37 +05:30 |
|
PCoder
|
d96d2907bc
|
Passing pass as parameter to celery task
|
2017-09-09 20:46:43 +05:30 |
|
PCoder
|
1a43f4f810
|
Merged upstream master into task/3731/cdist_ssh_key_handler
|
2017-09-09 20:30:50 +05:30 |
|
M.Ravi
|
e135bc9e8c
|
hosting: Overriden get_object method in OrderHostingDetail and cleared
session on completion of creation of VM
|
2017-09-09 13:27:17 +02:00 |
|
M.Ravi
|
c8baf3d4c1
|
Implemented post method for hosting OrderDetailView
|
2017-09-09 12:06:29 +02:00 |
|
PCoder
|
f9abdfe1bc
|
Merged upstream master into task/3731/cdist_ssh_key_handler
|
2017-09-09 13:44:46 +05:30 |
|
PCoder
|
1d5f92f7e1
|
Getting VM name for serializer data, hence fixing the problem of public- appearing in VM cancellation email
|
2017-09-09 12:12:56 +05:30 |
|
PCoder
|
e9b5e052ac
|
Merged upstream master into task/3484/email_refactoring
|
2017-09-09 11:38:57 +05:30 |
|
Arvind Tiwari
|
d5c0fef965
|
Merge pull request #483 from tiwariav/task/3775/hosting_default_page
Task/3775 hosting/dashboard as default page
|
2017-09-08 02:03:08 +05:30 |
|
Arvind Tiwari
|
e26b6ac416
|
default page for hosting changed from /hosting/my-virtual-machines -> /hosting/dashboard
|
2017-09-07 22:24:03 +05:30 |
|
M.Ravi
|
0fc0b0630c
|
hosting: Updated OrdersHostingDetailView for stripe charging in this view
|
2017-09-06 23:52:02 +02:00 |
|
PCoder
|
2a9b208719
|
hosting: Moving the stripe charge to order confirmation page (still incomplete)
|
2017-09-06 13:25:18 +05:30 |
|
PCoder
|
f84b95e385
|
Added some translations
|
2017-09-04 22:27:59 +05:30 |
|
M.Ravi
|
43e4c021a7
|
Removed order id from cancel vm email templates
|
2017-09-03 17:13:49 +02:00 |
|
M.Ravi
|
a32c8ea467
|
Corrected VM cancellation email templates
|
2017-09-03 13:20:30 +02:00 |
|
PCoder
|
f041a4047d
|
Started with VM cancellation template
|
2017-09-03 02:33:05 +05:30 |
|
M.Ravi
|
8f2655bda2
|
Getting vm name properly in hosting views
|
2017-09-02 21:35:57 +02:00 |
|
M.Ravi
|
50431542f8
|
Corrected getting VM name in template
|
2017-09-02 20:42:58 +02:00 |
|
PCoder
|
b5120040d3
|
Fixed an error and from address in new vm email template
|
2017-09-02 22:47:31 +05:30 |
|
PCoder
|
e38df305c4
|
New VM email template updated
|
2017-09-02 22:08:25 +05:30 |
|
PCoder
|
7d12eff9be
|
Added translations and reformatted code
|
2017-09-02 16:50:09 +05:30 |
|
M.Ravi
|
5a46cea307
|
Added functionality to add keys on creating a new vm
|
2017-08-31 18:20:02 +02:00 |
|
Arvind Tiwari
|
a07922e4d4
|
style and translations fix
|
2017-08-31 15:54:01 +05:30 |
|
PCoder
|
46642d816a
|
Merged master into task/3731/cdist_ssh_key_handler
|
2017-08-31 01:09:12 +05:30 |
|
Arvind Tiwari
|
43ceea948e
|
merged master
|
2017-08-30 19:38:19 +05:30 |
|
M.Ravi
|
51b1ee2013
|
Added call to manage_public_key task when generating dcl generated keys
and reorganized imports
|
2017-08-30 12:02:53 +02:00 |
|
M.Ravi
|
92e47b6f90
|
Added manage_public_key when deleting a key (However, this does not seem to work in cdist)
|
2017-08-30 09:42:56 +02:00 |
|
M.Ravi
|
34580b6514
|
Refactored saving public key functionality to opennebula_api.models.save_public_key. Also, now creating hosting VMs loaded by default with ONEADMIN_USER_SSH_PUBLIC_KEY
|
2017-08-29 17:53:25 +02:00 |
|
Arvind Tiwari
|
ce1d346bc1
|
billing form in settings page
|
2017-08-29 17:42:35 +05:30 |
|
PCoder
|
12255364b2
|
Attempted to get hosts for adding ssh keys (to be tested)
|
2017-08-29 13:31:05 +05:30 |
|
Arvind Tiwari
|
daa50d4672
|
settings page design
|
2017-08-24 22:11:15 +05:30 |
|
Arvind Tiwari
|
c87e2cd36b
|
hosting settings url, view and template added
|
2017-08-24 20:28:02 +05:30 |
|
Arvind Tiwari
|
23bf602a16
|
merged master, fixed translation
|
2017-08-24 20:16:26 +05:30 |
|
Pcoder
|
a77b7b0ab5
|
Merge pull request #460 from pcoder/add_test_create_vm_celery_task
Added test for create vm celery task
|
2017-08-23 23:24:49 +02:00 |
|
PCoder
|
6484684ac5
|
Removed unncessary check for error for make_charge
|
2017-08-24 02:29:24 +05:30 |
|
Arvind Tiwari
|
6890c82122
|
dashboard url, view,template and css added
|
2017-08-22 20:45:18 +05:30 |
|
Arvind Tiwari
|
653b3654b8
|
merged master
|
2017-08-20 22:04:48 +05:30 |
|
Arvind Tiwari
|
de481e8114
|
invoice link fixed
|
2017-08-19 02:32:37 +05:30 |
|
Arvind Tiwari
|
377f82319d
|
buttons made to work
|
2017-08-19 02:21:34 +05:30 |
|
Pcoder
|
a80b0668a2
|
Merge pull request #432 from siarheipuhach/feature/task3637
task/3637/Added stripe failed payment error handler
|
2017-08-17 20:50:18 +02:00 |
|
Siarhei Puhach
|
72ddfd96ab
|
Payment error was unified
|
2017-08-07 17:23:58 +03:00 |
|
Siarhei Puhach
|
a71ccbc566
|
Added error hash in url, added payment error handler to hosting/views
|
2017-08-07 17:02:47 +03:00 |
|
M.Ravi
|
d85afd56e0
|
Fixed an issue
- Changed owner -> user
- Reformatted code
|
2017-08-04 17:49:55 +02:00 |
|
PCoder
|
c6b23f6aa0
|
Added get_object method to verify if the user is the owner of the ssh key
|
2017-08-04 20:54:28 +05:30 |
|
Pcoder
|
5b8e73984e
|
Merge pull request #425 from pcoder/bug/3623/hosting_my_orders_header_fix
Bug/3623/hosting my orders header fix
|
2017-08-03 23:38:22 +02:00 |
|
M.Ravi
|
8ec692e51b
|
Reformatted code
|
2017-07-30 18:03:16 +02:00 |
|
PCoder
|
4883294acf
|
Added condition to show Confirm Order only when ordering a VM, and Invoice when order details page
|
2017-07-30 20:41:11 +05:30 |
|
ARvind Tiwari
|
925252f1c9
|
merged master
|
2017-07-28 16:45:34 +05:30 |
|
ARvind Tiwari
|
c6a3928638
|
decoding error fixed
|
2017-07-27 19:45:55 +05:30 |
|
ARvind Tiwari
|
4216d9911a
|
add ssh key form input shadows removed
|
2017-07-26 16:45:49 +05:30 |
|
PCoder
|
97acd76b51
|
Added card holders name for initialization
|
2017-07-16 22:33:52 +05:30 |
|
Siarhei Puhach
|
062ca69d9d
|
Update views.py
|
2017-07-12 08:21:43 +03:00 |
|
Siarhei Puhach
|
1279d4efbb
|
Merge branch 'master' into feature/ssh_keys
|
2017-07-07 17:49:22 +03:00 |
|
PCoder
|
cfc1210a9a
|
We probably need creating HostingBill
|
2017-07-07 00:12:29 +05:30 |
|
Siarhei Puhach
|
d2d96e9951
|
Added private_key field to UserHostingkey model, some html updates
|
2017-07-06 14:18:22 +03:00 |
|
Siarhei Puhach
|
8986aa6550
|
Added generation button with no field input required (generate ssh key name)
|
2017-07-06 11:47:12 +03:00 |
|
Siarhei Puhach
|
7cc70a95ac
|
Added new page(Choice ssh key generate/upload), changed design of generate ssh form
|
2017-07-05 16:57:49 +03:00 |
|
siarheipuhach
|
a9c9f74aed
|
Fixed PEP8 violations
|
2017-06-29 19:23:25 +03:00 |
|
Siarhei Puhach
|
fcc109b8f5
|
Merge branch 'master' into feature/flake8
|
2017-06-29 18:56:50 +03:00 |
|
Siarhei Puhach
|
edcfd3e9f4
|
Added Flake8 lib and fixed PEP8 violations
|
2017-06-29 17:34:40 +03:00 |
|
M.Ravi
|
0a6275bcef
|
Merge branch 'master' into task/3379/text_style_activation
|
2017-06-19 12:37:09 +05:30 |
|
M.Ravi
|
ab50e58a72
|
Updated signup and email confirmation views to work with translation
|
2017-06-17 19:38:43 +05:30 |
|
M.Ravi
|
bf99bd5edb
|
Fixed redirecting user to list vm page, if he requests for details of a vm whose id does not belong to him
|
2017-06-17 14:46:11 +05:30 |
|
Levi Velázquez
|
5271591cf3
|
Merge pull request #324 from pcoder/feature/3296/confirm_emails
Feature/3296/confirm emails
|
2017-06-15 15:22:00 -05:00 |
|
Pcoder
|
ebaadb4d07
|
Merge pull request #330 from pcoder/bug/3313/pwd_reset_email_from_dcl_support
Bug/3313/pwd reset email from dcl support
|
2017-06-15 21:04:03 +02:00 |
|
Levi Velázquez
|
657e93862d
|
Merge branch 'master' into bug/3313/pwd_reset_email_from_dcl_support
|
2017-06-15 01:17:14 -05:00 |
|
M.Ravi
|
5b4e9b733d
|
Tentative fix for error 500 on order details page
|
2017-06-15 07:30:47 +05:30 |
|
M.Ravi
|
a2a3cc1f5a
|
Small code formatting
|
2017-06-12 20:51:48 +05:30 |
|
M.Ravi
|
d84496b0de
|
Added 'site' parameter to PasswordResetViewMixin so that we can differentiate from which site we have requested a password reset.
|
2017-06-12 20:42:17 +05:30 |
|
Levi
|
817f800fbd
|
fixed #3350
|
2017-06-11 11:44:14 -05:00 |
|
M.Ravi
|
c989017a8f
|
Added SignupValidateView and SignupValidatedView classes to handle respective views
|
2017-06-11 05:18:06 +05:30 |
|
Levi
|
d43855adda
|
fixed #3350, #3328, #3316, #3339
|
2017-06-09 15:36:14 -05:00 |
|
Modulos
|
346733fbcd
|
Allow users to delete ssh keys
|
2017-06-03 15:03:55 +02:00 |
|
modulos
|
ab29b138c3
|
Add delete ssh key modal
|
2017-06-03 13:33:05 +02:00 |
|
modulos
|
715d092b96
|
Add ssh key to new vm
Create_vm now stes to public key correctly
|
2017-06-02 00:53:22 +02:00 |
|
modulos
|
d229d124e9
|
Merge branch 'develop' into api/cleanup
|
2017-06-01 21:51:15 +02:00 |
|
Levi Velázquez
|
211e1be0fb
|
Merge pull request #279 from levivm/develop
Develop
|
2017-05-25 13:05:48 -05:00 |
|
Levi
|
d9d8ddc9e1
|
removed import pdb
|
2017-05-25 13:05:32 -05:00 |
|
Levi
|
9a93a3e315
|
fixed vm pricing error
|
2017-05-25 13:04:29 -05:00 |
|
modulos
|
d395735219
|
Redirect new user to key generation view
|
2017-05-25 16:23:31 +02:00 |
|
modulos
|
35f129a4c7
|
Add user generated public ssh keys as well
|
2017-05-25 15:54:32 +02:00 |
|
modulos
|
9753dfd2fc
|
Add UserHosting public key to opennebula user
|
2017-05-25 11:27:49 +02:00 |
|
Levi
|
ee80181a55
|
added redirect after create vm ssh key
|
2017-05-24 10:58:16 -05:00 |
|
Levi
|
34d596f2ba
|
added next url to ssh create key view
|
2017-05-21 22:46:31 -05:00 |
|
Levi
|
05bf8db38a
|
added next url to ssh create key view
|
2017-05-21 22:39:47 -05:00 |
|
Levi
|
02a2ac31c6
|
added next url to ssh create key view
|
2017-05-21 22:35:43 -05:00 |
|
Levi
|
3f198bb4de
|
Fixed djangohosting, railshosting and nodehosting page. Fixed payment erro
|
2017-05-21 22:01:26 -05:00 |
|
Levi
|
03ec8ef674
|
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
|
2017-05-20 11:20:30 -05:00 |
|
Levi
|
5dd54f4219
|
added redirect
|
2017-05-20 11:06:10 -05:00 |
|
Modulos
|
1e2b8b1652
|
Add connection error handling
|
2017-05-14 12:22:10 +02:00 |
|
Levi
|
bcc32174b2
|
added permissions to hosting bill view
|
2017-05-13 20:19:09 -05:00 |
|
Levi
|
e6ec14dfe7
|
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
|
2017-05-13 12:22:21 -05:00 |
|
Modulos
|
752e11bcea
|
Readded hostingplans
|
2017-05-13 13:47:53 +02:00 |
|
Modulos
|
8017fbb90f
|
Work on configuration
|
2017-05-13 10:00:07 +02:00 |
|
Levi
|
d8c8804cc4
|
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
|
2017-05-13 00:31:33 -05:00 |
|
Levi
|
07dc04018f
|
cleaned code
|
2017-05-13 00:31:29 -05:00 |
|
Modulos
|
75d93b2aad
|
Add images as configuration
|
2017-05-13 06:59:57 +02:00 |
|
Modulos
|
cfaf201064
|
Handle ConnectionException, add change_user_password
|
2017-05-13 05:50:56 +02:00 |
|
Levi
|
8980f6b2fc
|
merged opnnebula api changes
|
2017-05-12 12:13:18 -05:00 |
|
Modulos
|
130c00c8ee
|
API Integration
Please review carefully.
|
2017-05-12 12:07:05 +02:00 |
|
Levi
|
3873540849
|
Force user to generate ssh key in order to create a VM #3147. As user I want to terminate a VM using web interface #3148. Change password in opennebula when user change his password on hosting app #3149
|
2017-05-12 00:56:35 -05:00 |
|
Levi
|
1f10f04a9d
|
Fixed ssh key error, Now an existing user is not ask for his credit card again
|
2017-05-11 00:11:33 -05:00 |
|
Modulos
|
d0fc0144e5
|
Merge branch 'opennebula-integration' into vm_bill
|
2017-05-09 04:56:03 +02:00 |
|