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 |
|
PCoder
|
255c8a1d80
|
Add UserCardDetail create method that assigns appropriate object permission
|
2017-10-21 00:00:21 +02:00 |
|
M.Ravi
|
60cfc24319
|
Merge branch task/3766/credit_card_options from tiwariav into task/3747/multiple_cards_support
|
2017-10-19 20:24:28 +02:00 |
|
M.Ravi
|
68a34762b9
|
Merge branch 'master' into task/3747/multiple_cards_support
|
2017-10-19 20:17:39 +02:00 |
|
Arvind Tiwari
|
1839a1c27c
|
translation re compilation
|
2017-10-17 00:35:51 +05:30 |
|
Arvind Tiwari
|
2a71be354b
|
conflicts resolved
|
2017-10-17 00:27:50 +05:30 |
|
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
|
3d50868c6a
|
Add url for card delete
|
2017-10-16 16:18:39 +02:00 |
|
M.Ravi
|
de275c23ac
|
Add modal for card delete
|
2017-10-16 16:18:17 +02:00 |
|
M.Ravi
|
619f37829e
|
Now showing cards from UserCardDetails
|
2017-10-15 23:57:15 +02:00 |
|
M.Ravi
|
52791f5e48
|
Refactor cc_brand to brand
|
2017-10-15 23:56:38 +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 |
|
Arvind Tiwari
|
88be7be180
|
translation fix
|
2017-10-16 01:07:54 +05:30 |
|
Arvind Tiwari
|
9bc86255c4
|
user account details added and translation fix
|
2017-10-16 01:04:49 +05:30 |
|
M.Ravi
|
167e3589d4
|
Rename user to stripe_customer
|
2017-10-15 21:21:36 +02:00 |
|
M.Ravi
|
a1d7b07e0c
|
Relate UserCardDetail with StripeCustomer and add more fields to uniquely identify if a user already has a card
|
2017-10-15 21:19:13 +02:00 |
|
M.Ravi
|
9a9a764023
|
Add preferred card field to UserCardDetail
|
2017-10-15 20:06:56 +02:00 |
|
M.Ravi
|
f3ca9110e1
|
Add UserCardDetail migration
|
2017-10-15 19:56:40 +02:00 |
|
M.Ravi
|
6420a9869b
|
Add functionality to save UserCardDetail
|
2017-10-15 19:55:37 +02:00 |
|
M.Ravi
|
f71c8e553d
|
Add name to user details form button name
|
2017-10-15 19:54:01 +02:00 |
|
M.Ravi
|
1a25bbf11e
|
Add name to card form button name
|
2017-10-15 19:51:58 +02:00 |
|
M.Ravi
|
a4b63e220a
|
Relate UserCardDetail to CustomUser and rename some fields
|
2017-10-15 19:49:44 +02:00 |
|
M.Ravi
|
707f1a8768
|
Add UserCardDetail model + Reorganize imports
|
2017-10-15 18:00:43 +02:00 |
|
M.Ravi
|
e6f92d9ae4
|
Manual merge
|
2017-10-15 16:14:33 +02:00 |
|
Arvind Tiwari
|
3370f06bff
|
msg fix
|
2017-10-15 02:30:42 +05:30 |
|
Arvind Tiwari
|
c60d45c292
|
merge master
|
2017-10-15 01:52:29 +05:30 |
|
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
|
ed1f1451ce
|
[] removed around the vm name
|
2017-10-15 00:41:31 +05:30 |
|
Arvind Tiwari
|
2cd1850f02
|
password reset email fix
|
2017-10-15 00:30:52 +05:30 |
|
Arvind Tiwari
|
7b71ba1749
|
merged master
|
2017-10-15 00:10:02 +05:30 |
|
M.Ravi
|
ed05411dac
|
Return if the form already contains error
|
2017-10-14 12:52:18 +02:00 |
|
Arvind Tiwari
|
606a687bc7
|
conflicts resolved
|
2017-10-13 02:08:28 +05:30 |
|
M.Ravi
|
764a51c0e7
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-10-12 19:32:00 +02:00 |
|
M.Ravi
|
859ccd54a6
|
Remove some more commented code and console logs
|
2017-10-12 19:06:26 +02:00 |
|
M.Ravi
|
1b14598cc9
|
Create Stripe elements only stripe key is defined
|
2017-10-12 00:43:55 +02:00 |
|
M.Ravi
|
a03040b449
|
Merge branch 'master' into task/3774/update_stripe_subscription_on_vm_delete
|
2017-10-11 21:25:52 +02:00 |
|
Arvind Tiwari
|
3e6084a1b1
|
translation fix
|
2017-10-11 00:30:32 +05:30 |
|
Arvind Tiwari
|
452089e103
|
translation fix
|
2017-10-10 21:38:49 +05:30 |
|
Arvind Tiwari
|
6cdca621b2
|
original pattern.jpg added
|
2017-10-07 23:35:13 +05:30 |
|
Arvind Tiwari
|
25e3980b20
|
pattern.jpg compressed
|
2017-10-07 23:33:08 +05:30 |
|
Arvind Tiwari
|
c400fdb02e
|
width adjusted
|
2017-10-07 23:17:57 +05:30 |
|
Arvind Tiwari
|
2dd2945ee9
|
wider auth box
|
2017-10-07 17:51:18 +05:30 |
|
Arvind Tiwari
|
d0003ce9f3
|
style fixes
|
2017-10-07 17:35:10 +05:30 |
|
Arvind Tiwari
|
f3832c1db9
|
content-dashboard removed for unregistered pages
|
2017-10-07 17:06:55 +05:30 |
|
Arvind Tiwari
|
1dc374e09d
|
footer links color changed
|
2017-10-07 16:23:04 +05:30 |
|
Arvind Tiwari
|
7d7b8661ea
|
translations
|
2017-10-07 16:19:53 +05:30 |
|
Arvind Tiwari
|
769396d95e
|
login pages restyled and footer included
|
2017-10-07 14:38:48 +05:30 |
|
Arvind Tiwari
|
88781e992c
|
24 hr fix
|
2017-10-06 04:20:38 +05:30 |
|
Arvind Tiwari
|
d3d57ade37
|
formats fixed
|
2017-10-06 04:16:58 +05:30 |
|
Arvind Tiwari
|
8e5654bdb5
|
date time converted to locale
|
2017-10-06 04:11:40 +05:30 |
|
Arvind Tiwari
|
4dbf08f995
|
Merge branch 'master' into task/3828/invoice_period
|
2017-10-06 02:39:07 +05:30 |
|
Arvind Tiwari
|
cc2e08aff5
|
translations
|
2017-10-06 02:02:22 +05:30 |
|
Arvind Tiwari
|
ba8eaa2937
|
new card details option added
|
2017-10-06 01:59:18 +05:30 |
|
Arvind Tiwari
|
bd3c59eb3e
|
card_input template
|
2017-10-06 01:17:50 +05:30 |
|
Arvind Tiwari
|
6536991209
|
list all cards, card_input template
|
2017-10-06 01:17:35 +05:30 |
|
Arvind Tiwari
|
5e8b34d39c
|
Update hosting favicon to dcl favicon
|
2017-10-06 01:02:14 +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
|
fc68715bcb
|
Merge pull request #507 from tiwariav/task/3811/create_vm_page_text
task/3811 create vm page lead text added
|
2017-10-04 01:00:03 +05:30 |
|
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
|
e7545247c9
|
Merge remote-tracking branch 'ungleich/master'
|
2017-10-03 23:46:43 +05:30 |
|
Arvind Tiwari
|
0ba6bca06b
|
Merge pull request #508 from tiwariav/task/3823/hosting_favicon
task/3823 hosting favicon link fixed
|
2017-10-03 23:42:57 +05:30 |
|
Arvind Tiwari
|
618a82fc66
|
Merge remote-tracking branch 'ungleich/master'
|
2017-10-03 21:51:28 +05:30 |
|
Arvind Tiwari
|
7e380267b7
|
Update payment.css
|
2017-10-03 21:49:51 +05:30 |
|
Arvind Tiwari
|
eb7b1a4ea0
|
Merge remote-tracking branch 'ungleich/master'
|
2017-10-03 21:46:23 +05:30 |
|
Arvind Tiwari
|
96d8f8358f
|
Merge pull request #512 from tiwariav/bugfix/card_input
Bugfix/hosting_card_input
|
2017-10-03 21:39:44 +05:30 |
|
Arvind Tiwari
|
c410e2cbc5
|
stripe_customer_id retrieved from request.user relation
|
2017-10-03 21:35:08 +05:30 |
|
Arvind Tiwari
|
bfbf4d87cc
|
Merge pull request #503 from tiwariav/task/3785/my_bills_page
Task/3785 update my bills page
|
2017-10-03 21:31:27 +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
|
2e34d404ea
|
translation
|
2017-10-03 18:25:32 +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
|
7680e5aa25
|
Update hosting django.po
|
2017-10-02 00:13:28 +02:00 |
|
M.Ravi
|
22af001489
|
Merge upstream master
|
2017-10-02 00:09:38 +02:00 |
|
M.Ravi
|
68cbfdd393
|
Update translation and fix loginmixin required for dashboard view
|
2017-10-01 23:06:51 +02:00 |
|
M.Ravi
|
cf45a9ac75
|
Add messages to some hosting templates
|
2017-10-01 20:39:55 +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 |
|
M.Ravi
|
9e8d930a3b
|
Refactor messages to includes/_messages.html
|
2017-10-01 20:16:05 +02:00 |
|
Arvind Tiwari
|
df93dfe047
|
day set to one before
|
2017-09-30 18:10:34 +05:30 |
|
Arvind Tiwari
|
1f09bab3e4
|
minimum month diff set to 1
|
2017-09-30 18:08:02 +05:30 |
|
Arvind Tiwari
|
3701899304
|
timezone aware
|
2017-09-30 18:06:50 +05:30 |
|
Arvind Tiwari
|
f1790445cd
|
timezone aware
|
2017-09-30 18:05:02 +05:30 |
|
Arvind Tiwari
|
bd91883369
|
end_date added
|
2017-09-30 17:55:49 +05:30 |
|
Arvind Tiwari
|
1fb7511292
|
favicon link changed
|
2017-09-30 17:08:40 +05:30 |
|
Arvind Tiwari
|
c6173ed2e6
|
lead text added
|
2017-09-30 16:53:44 +05:30 |
|
M.Ravi
|
6ef8a03de7
|
Respond with JSON
|
2017-09-30 01:02:59 +02:00 |
|
M.Ravi
|
43e6fc45e2
|
Add de translations
|
2017-09-29 22:19:26 +02:00 |
|
M.Ravi
|
b04f9ea1ec
|
Update hosting django.po
|
2017-09-29 22:12:02 +02:00 |
|
M.Ravi
|
00341e014c
|
Update hosting django.po
|
2017-09-29 22:02:53 +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 |
|
M.Ravi
|
313ba9d502
|
Refactor set_subscription_id - use stripe subscription id instead of obj
|
2017-09-29 08:42:17 +02:00 |
|
M.Ravi
|
4ce1ff073a
|
Some more modal styles
|
2017-09-28 23:31:29 +02:00 |
|
M.Ravi
|
f60a2c3482
|
Make correct icons load on dcl createvm error modal
|
2017-09-28 23:20:43 +02:00 |
|
M.Ravi
|
9cab43f051
|
Update modal with html from server
|
2017-09-28 23:03:22 +02:00 |
|
PCoder
|
4efc1b4943
|
Merge branch 'master' into bugfix/stripe_error
|
2017-09-28 23:43:21 +05:30 |
|
M.Ravi
|
03442398c2
|
Handle message create vm request in js
|
2017-09-28 17:31:29 +02:00 |
|
Arvind Tiwari
|
9c69c4cb25
|
Update landing-page.css
|
2017-09-28 19:14:13 +05:30 |
|
Arvind Tiwari
|
d751aa6d63
|
padding fix
|
2017-09-28 18:48:21 +05:30 |
|
Arvind Tiwari
|
7bd61f708c
|
Merge branch 'master' into task/3785/my_bills_page
|
2017-09-28 18:38:49 +05:30 |
|
Arvind Tiwari
|
ba366eed77
|
merge master
|
2017-09-28 18:37:33 +05:30 |
|
Arvind Tiwari
|
b65bc3f1f5
|
merge master
|
2017-09-28 18:23:48 +05:30 |
|
PCoder
|
06ef940b01
|
Merge upstream
|
2017-09-28 03:33:43 +05:30 |
|
Arvind Tiwari
|
f0a49ef075
|
translations
|
2017-09-28 03:12:03 +05:30 |
|
Arvind Tiwari
|
88706b0088
|
merged master
|
2017-09-28 03:06:47 +05:30 |
|
Arvind Tiwari
|
4379cebbed
|
default 'card' translated
|
2017-09-28 03:05:47 +05:30 |
|
Pcoder
|
e0c9764e4e
|
Merge pull request #505 from tiwariav/bugfix/order_details
Bugfix/ order details page
|
2017-09-27 21:26:36 +00:00 |
|
Arvind Tiwari
|
3ba1f191a3
|
show period if dates exist
|
2017-09-28 02:47:58 +05:30 |
|
Arvind Tiwari
|
df67fa3333
|
period added
|
2017-09-28 02:39:55 +05:30 |
|
PCoder
|
4e080c9afc
|
Invoice: Get VM name from id and configuration
|
2017-09-28 02:36:49 +05:30 |
|
Arvind Tiwari
|
858fdd5e3f
|
Update order_detail.html
|
2017-09-28 02:11:11 +05:30 |
|
Arvind Tiwari
|
7039ccd3b9
|
modal btn color changed
|
2017-09-28 02:09:03 +05:30 |
|
PCoder
|
5a2a134070
|
Merge upstream master
|
2017-09-28 01:35:09 +05:30 |
|
PCoder
|
3bc82907a9
|
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
|
2017-09-28 01:14:37 +05:30 |
|
Arvind Tiwari
|
7a07785a94
|
vm cancel email subject changed
|
2017-09-28 01:11:39 +05:30 |
|
Arvind Tiwari
|
8b9935f677
|
padding fix
|
2017-09-28 00:59:49 +05:30 |
|
Arvind Tiwari
|
77b2684217
|
mobile alignment fix for btn
|
2017-09-28 00:50:38 +05:30 |
|
Arvind Tiwari
|
4194a7c2d7
|
table header fixed
|
2017-09-27 22:50:42 +05:30 |
|
M.Ravi
|
13556ef672
|
Merge branch 'master' into task/3672/cleaning_existing_tests
|
2017-09-27 14:18:14 +02:00 |
|
Arvind Tiwari
|
11c1781839
|
fix for gmail autoformatiing
|
2017-09-27 04:37:02 +05:30 |
|
Arvind Tiwari
|
313b32e098
|
vm name bold in email
|
2017-09-27 04:24:22 +05:30 |
|
Arvind Tiwari
|
06bc37a977
|
paddings changed
|
2017-09-27 04:13:04 +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
|
2d06173edb
|
logo padding
|
2017-09-27 02:50:59 +05:30 |
|
Arvind Tiwari
|
d888b260ee
|
welcome user mail
|
2017-09-27 02:45:24 +05:30 |
|
Arvind Tiwari
|
8307636b9b
|
Merge branch 'master' into task/3794/update_email_styles
|
2017-09-27 02:16:09 +05:30 |
|
Arvind Tiwari
|
d3f2fd2aa0
|
dcl logo changed to png
|
2017-09-27 02:14:20 +05:30 |
|
Arvind Tiwari
|
21660f8d00
|
font-size reduced, vm cancel and vm create email data fixed
|
2017-09-27 02:07:52 +05:30 |
|
Arvind Tiwari
|
ce63d397be
|
Merge pull request #504 from tiwariav/task/3812/modal_weight_fix
Task/3812 modal font size and check icon weight fix
|
2017-09-27 00:42:37 +05:30 |
|
Arvind Tiwari
|
6ef5d2f777
|
typo fix
|
2017-09-27 00:08:14 +05:30 |
|
Arvind Tiwari
|
42985c28f1
|
using data.redirect to set redirect path on success
|
2017-09-26 22:58:56 +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
|
2dbaa1c693
|
template name
|
2017-09-26 03:57:07 +05:30 |
|
Arvind Tiwari
|
2a99d053dc
|
text fixes
|
2017-09-26 03:42:10 +05:30 |
|
Arvind Tiwari
|
3cf28c793c
|
form method fix
|
2017-09-26 03:29:38 +05:30 |
|
Arvind Tiwari
|
3c32abbf8e
|
dcl form added
|
2017-09-26 03:18:19 +05:30 |
|
Arvind Tiwari
|
050f750322
|
merged master
|
2017-09-26 03:06:12 +05:30 |
|
Arvind Tiwari
|
a37c734c94
|
translation fix
|
2017-09-26 02:53:09 +05:30 |
|
Arvind Tiwari
|
f35c3dbc10
|
modal check icon thinner, terminate modal text smaller
|
2017-09-26 02:38:31 +05:30 |
|
PCoder
|
3b55e331ed
|
Merge branch 'master' into task/3764/show_cancelled_vms_my_orders
|
2017-09-26 01:58:42 +05:30 |
|
Arvind Tiwari
|
1fdc533f4d
|
bills list page updated
|
2017-09-26 01:18:39 +05:30 |
|
PCoder
|
81bc5d5555
|
Merge branch 'master' into task/3781/resend_activation_mail
|
2017-09-26 01:18:02 +05:30 |
|
Arvind Tiwari
|
230866e563
|
Merge branch 'master' into task/3808/dcl_order_confirm
|
2017-09-26 01:10:16 +05:30 |
|
Arvind Tiwari
|
63ea7dac37
|
datacenterlight invoice redesigned
|
2017-09-26 01:04:38 +05:30 |
|
PCoder
|
6321f44c08
|
Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset
|
2017-09-26 00:54:33 +05:30 |
|
PCoder
|
177c4719e1
|
Merge remote-tracking branch 'mainRepo/master'
|
2017-09-26 00:53:58 +05:30 |
|
verysanghee
|
f35663b5ac
|
Update django.po
|
2017-09-25 21:18:46 +02:00 |
|
verysanghee
|
e85a7c9e2a
|
Update django.po
|
2017-09-25 21:14:19 +02:00 |
|
verysanghee
|
2f4b7bb749
|
Update django.po
|
2017-09-25 21:07:33 +02:00 |
|
PCoder
|
f0ba9a0c0c
|
Updated hosting django.po
|
2017-09-26 00:36:06 +05:30 |
|
PCoder
|
a9755ccbff
|
Updated hosting django.po
|
2017-09-26 00:34:33 +05:30 |
|
verysanghee
|
889d737c7c
|
Update django.po
|
2017-09-25 20:58:59 +02:00 |
|
PCoder
|
e2779314b0
|
Fix cancel vm modal text translation
|
2017-09-26 00:25:54 +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
|
70d5efb21a
|
Update hosting django.po with a de translation
|
2017-09-25 02:09:49 +05:30 |
|
PCoder
|
46d82268f4
|
Show terminated in invoice for VM that has been terminated
|
2017-09-25 02:04:40 +05:30 |
|
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
|
83ccb9cffa
|
Added vmdetail migration file
|
2017-09-25 00:36:33 +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
|
a45679d89a
|
Added VMDetail model
|
2017-09-25 00:00:45 +05:30 |
|
PCoder
|
cd5607b44e
|
Updated hosting django.po
|
2017-09-24 19:04:18 +05:30 |
|
PCoder
|
84db1606a3
|
Added resend_activation_link.html template file
|
2017-09-24 18:04:11 +05:30 |
|
PCoder
|
24522908e0
|
Added resend activation link to login page
|
2017-09-24 16:02:06 +05:30 |
|
PCoder
|
3247616137
|
Added resend activation link url
|
2017-09-24 15:53:08 +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
|
09dc0cde13
|
Removed unwanted js code that was causing error
|
2017-09-24 04:39:00 +05:30 |
|
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
|
313b2b2f57
|
fixed vreate vm error
|
2017-09-23 23:47:25 +05:30 |
|
Arvind Tiwari
|
7456baac16
|
merged master
|
2017-09-23 23:05:10 +05:30 |
|
Arvind Tiwari
|
eca7ba01c5
|
fixed duplicate translation
|
2017-09-23 22:54:17 +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
|
e9721705ca
|
margin fix
|
2017-09-23 20:30:53 +05:30 |
|
Arvind Tiwari
|
3685bf591d
|
error msgs translation
|
2017-09-23 19:02:23 +05:30 |
|
Arvind Tiwari
|
be0c50aa2f
|
error msgs translation
|
2017-09-23 19:01:22 +05:30 |
|
Arvind Tiwari
|
ec2413d3dc
|
removed extra quote
|
2017-09-23 18:57:35 +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
|
6983b6f72e
|
all emails redesigned
|
2017-09-23 02:27:19 +05:30 |
|
Arvind Tiwari
|
057a2c77a6
|
password reset email, user activation email redesigned
|
2017-09-23 01:57:40 +05:30 |
|
Arvind Tiwari
|
6004a7ede4
|
new welcome email
|
2017-09-23 01:03:43 +05:30 |
|
Arvind Tiwari
|
0993f2cab1
|
merged master
|
2017-09-21 19:43:20 +05:30 |
|
Arvind Tiwari
|
4a1596b093
|
merged master
|
2017-09-21 19:41:45 +05:30 |
|
Arvind Tiwari
|
6be245a811
|
merged master
|
2017-09-21 19:38:47 +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
|
6dfbf67d7d
|
rearranging text
|
2017-09-21 02:50:07 +05:30 |
|
PCoder
|
143f40bd2d
|
Merge branch 'task/3756/landing_billing_page' of https://github.com/tiwariav/dynamicweb into tiwariav-task/3756/landing_billing_page
|
2017-09-21 02:41:26 +05:30 |
|
Arvind Tiwari
|
1eff51099c
|
exception handling fix
|
2017-09-21 02:26:42 +05:30 |
|
Arvind Tiwari
|
dd77f40707
|
top options added
|
2017-09-21 02:23:08 +05:30 |
|
PCoder
|
2c2ee0f4a4
|
Some more translations
|
2017-09-21 02:18:39 +05:30 |
|
PCoder
|
3eeaba8715
|
Added some translations
|
2017-09-21 02:06:50 +05:30 |
|
Arvind Tiwari
|
f0e50a4e94
|
removed commented code
|
2017-09-21 01:20:51 +05:30 |
|
Arvind Tiwari
|
98eb2f85d8
|
printing pdf
|
2017-09-21 01:19:38 +05:30 |
|
Arvind Tiwari
|
0f5bf606da
|
minor fixes
|
2017-09-20 23:32:48 +05:30 |
|
Arvind Tiwari
|
ec354332f8
|
translation fix
|
2017-09-20 23:28:36 +05:30 |
|
Arvind Tiwari
|
65618bb2aa
|
merged master
|
2017-09-20 23:24:20 +05:30 |
|
Arvind Tiwari
|
fc03df4652
|
merged master
|
2017-09-20 23:21:24 +05:30 |
|
Arvind Tiwari
|
f4766c7d7c
|
merged master
|
2017-09-20 23:19:32 +05:30 |
|
Arvind Tiwari
|
37017dd31a
|
minor mods
|
2017-09-20 23:06:51 +05:30 |
|
Arvind Tiwari
|
98f094e5b8
|
initial changes
|
2017-09-19 15:03:06 +05:30 |
|
Arvind Tiwari
|
04126c69ee
|
vm name added
|
2017-09-19 14:34:53 +05:30 |
|
Arvind Tiwari
|
445359e1ed
|
modal restyle
|
2017-09-19 14:29:18 +05:30 |
|
Arvind Tiwari
|
c53c966136
|
success modal modification
|
2017-09-19 14:24:23 +05:30 |
|
Arvind Tiwari
|
4787276afe
|
bootstrap form input box-shadow removed
|
2017-09-19 13:54:27 +05:30 |
|
Arvind Tiwari
|
e893f1baf1
|
padding fix
|
2017-09-19 01:17:15 +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
|
43300c7226
|
translations added, modal fixed
|
2017-09-18 23:21:04 +05:30 |
|
Arvind Tiwari
|
226f744bae
|
success modal added
|
2017-09-18 21:52:59 +05:30 |
|
Arvind Tiwari
|
b276194f31
|
width normalized
|
2017-09-18 20:18:02 +05:30 |
|
Arvind Tiwari
|
772469a23e
|
design modifications
|
2017-09-18 19:49:14 +05:30 |
|
PCoder
|
3fe6e65e84
|
Rearranged hold tight text
|
2017-09-16 21:45:21 +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 |
|
PCoder
|
155a4b7cb6
|
Added translation and fa-times icon
|
2017-09-16 15:35:31 +05:30 |
|
M.Ravi
|
fe12b9e688
|
Added simple error handling case
|
2017-09-15 18:32:11 +02:00 |
|
M.Ravi
|
67f0e9068d
|
Fixed issue with multiline with template statement
|
2017-09-15 18:16:12 +02:00 |
|
M.Ravi
|
aab9464c6f
|
Rearranged order_detail.html
|
2017-09-15 18:11:22 +02:00 |
|
M.Ravi
|
fa6901e679
|
Made create vm modal non responsive to escape key press
|
2017-09-15 17:55:35 +02:00 |
|
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 |
|
M.Ravi
|
e14ed0c69f
|
Added js handling of create vm form submission
|
2017-09-15 17:30:38 +02:00 |
|
M.Ravi
|
ca5a99ccf5
|
Reverted autoformatted code
|
2017-09-15 17:29:41 +02:00 |
|
M.Ravi
|
445b8f4a79
|
Created virtual_machine_create_form and added ids for elements
|
2017-09-15 17:17:21 +02:00 |
|
Arvind Tiwari
|
2de0fc13b9
|
translation fix
|
2017-09-15 20:17:54 +05:30 |
|
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
|
9c0cefd419
|
js polling timing to 5s
|
2017-09-15 17:44:27 +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
|
0c3f605735
|
status pending style in vm-list
|
2017-09-15 17:02:02 +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
|
589a4fcaa9
|
Added create vm modal
|
2017-09-15 12:45: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
|
75156d2c00
|
undo changes in navbar
|
2017-09-15 01:00:07 +05:30 |
|
Arvind Tiwari
|
a935871722
|
code reformating
|
2017-09-15 00:57:59 +05:30 |
|
Arvind Tiwari
|
c2b5c62014
|
hosting calculator added
|
2017-09-15 00:49:39 +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 |
|
M.Ravi
|
5c3cf7682f
|
Fixed some flake8 warnings
|
2017-09-14 15:27:25 +02:00 |
|
M.Ravi
|
bd45577c90
|
Removed unwanted translations in hosting django.po
|
2017-09-14 14:28:52 +02:00 |
|
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
|
8ca1b13f80
|
template fixed
|
2017-09-14 02:29:51 +05:30 |
|
Arvind Tiwari
|
07a464231d
|
animation added to vm termination
|
2017-09-14 02:24:10 +05:30 |
|
PCoder
|
face045090
|
Updated hosting django.po
|
2017-09-14 00:50:24 +05:30 |
|
M.Ravi
|
86ed0e5319
|
Removed code related removing keys from known_hosts
|
2017-09-13 14:32:33 +02:00 |
|
M.Ravi
|
a08104ba2c
|
Updated a comment
|
2017-09-13 14:31:13 +02:00 |
|
PCoder
|
d40403c15c
|
Updated hosting django.po
|
2017-09-13 07:31:22 +05:30 |
|
PCoder
|
d92e850f3e
|
Improved the condition of fetching key name
|
2017-09-13 07:03:49 +05:30 |
|
PCoder
|
01795dcad0
|
Verifying if a public key exists already
|
2017-09-13 06:57:15 +05:30 |
|
PCoder
|
94a5987985
|
Removed an unwanted print
|
2017-09-13 06:35:07 +05:30 |
|
PCoder
|
ee5150dc6e
|
strip instead of trim
|
2017-09-13 06:27:46 +05:30 |
|
PCoder
|
662219f524
|
Added trim function to clean public ssh key before validating and saving it
|
2017-09-13 06:07:12 +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
|
221af96c8b
|
Removed explicit deleting of file with NamedTemporaryFile
|
2017-09-13 02:46:54 +05:30 |
|
PCoder
|
511a1551d5
|
Added logger debug message when file not found when deleting
|
2017-09-13 02:41:19 +05:30 |
|
PCoder
|
2983940d0f
|
Removed unwanted code
|
2017-09-13 02:33:21 +05:30 |
|
PCoder
|
3770489a49
|
Writing bytes to NamedTemporaryFile
|
2017-09-13 02:31:19 +05:30 |
|