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
Levi Velázquez
8904a14961
Merge branch 'master' into feature/added_localtime
2017-06-23 00:31:23 -05:00
Levi
720270bac5
fixed firefox issue
2017-06-23 00:30:31 -05:00
M.Ravi
aca831adac
Resolved conflicts while merging pcoder-new_flow
2017-06-23 04:35:33 +05:30
M.Ravi
654d73e51d
Add some de translations and invoice now called 'Confirm Order'
2017-06-23 02:33:59 +05:30
M.Ravi
9aba565ec0
Added + corrected de translations
2017-06-23 01:15:48 +05:30
Levi
8c7687fe7c
fixed issue error 500
2017-06-21 13:32:23 -05:00
Levi
de64744120
fixed issue on order view
2017-06-21 13:31:02 -05:00
Levi
1897f4b5f6
fixing date format
2017-06-21 13:28:53 -05:00
Levi
339e20d0b7
changd date format on orders view
2017-06-21 13:24:38 -05:00
M.Ravi
387c45b969
We need the logo in the payment page even when user is not logged in
2017-06-21 23:38:35 +05:30
Levi
f1f6074c78
fixed time
2017-06-21 12:49:29 -05:00
Levi
ed6fdcb049
fixed ssh key time
2017-06-21 12:26:09 -05:00
Levi
d8389993ce
Merge branch 'master' into feature/added_localtime
2017-06-21 12:06:58 -05:00
Levi
4f318a6f2d
changed UTC to localtime in ssh key view
2017-06-21 11:48:11 -05:00
Levi
9b6bb4eb26
changed UTC to localtime in ssh key view
2017-06-21 11:45:35 -05:00
M.Ravi
8dca67e638
Increased top margin for email confirmation and validation forms
2017-06-19 23:53:25 +05:30
M.Ravi
3cf7f8bd57
Updated css to center align text in registration success message
2017-06-19 12:55:14 +05:30
M.Ravi
0a6275bcef
Merge branch 'master' into task/3379/text_style_activation
2017-06-19 12:37:09 +05:30
Pcoder
0cbd3aa666
Merge pull request #349 from pcoder/bug/3416/error_vm_id_change
...
Fixed redirecting user to list vm page, if he requests for details of a vm whose id does not belong to him.
2017-06-18 17:12:52 +02:00
M.Ravi
ab50e58a72
Updated signup and email confirmation views to work with translation
2017-06-17 19:38:43 +05:30
M.Ravi
e63e014588
Added Lato font for sign up success text
2017-06-17 17:34:30 +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
M.Ravi
c2f8ae1eb3
Fixed a responsive issue in signup/email confirmation
2017-06-17 13:41:18 +05:30
Levi
7a4d3bb41f
Merge branch 'master' of github.com:ungleich/dynamicweb
2017-06-15 16:06:11 -05:00
Levi
13ddc8fc66
changed logo to datacenterlight
2017-06-15 16:05:46 -05:00
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
93bc6ac458
Merge pull request #344 from pcoder/bug/3256/view_details_500_error
...
Bug/3256/view details 500 error
2017-06-15 13:25:49 -05:00
Levi Velázquez
65cca56ab8
Merge pull request #341 from levivm/master
...
fixed credit card input issue
2017-06-15 11:33:27 -05:00
M.Ravi
09601aefd9
Replaced all GiB to GB
2017-06-15 12:18:38 +05:30
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
e9643c4783
Deleted django.mo of hosting
2017-06-15 07:16:17 +05:30
M.Ravi
412236f6a1
Merge remote-tracking branch 'mainRepo/master' into task/3377/navbar_rearrange
2017-06-15 02:37:07 +05:30
Levi
3a1158cab0
cleaned up file createvm.js
2017-06-14 13:05:39 -05:00
Levi
1a1b05f2f8
fixed credit card input issu
2017-06-14 12:50:51 -05:00
M.Ravi
3c5cf3f9ec
Rearranged navbar menu items
2017-06-13 23:47:57 +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
Henry Bravo
be82a63b7a
Reduce container in ssh_key and tetextarea
2017-06-11 20:04:06 -05:00
Henry Bravo
38970e9353
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2017-06-11 19:46:26 -05:00
Henry Bravo
225f92caf5
Change To Font Lato in VM Pages and remove messages in login
2017-06-11 19:46:07 -05:00
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
M.Ravi
ce11524fba
Added signup-validate and validate endpoints to hosting's urls
2017-06-11 05:15:48 +05:30
M.Ravi
707d8e7370
Added condition to hosting form to show message for account that have not yet been validated after account creation
2017-06-11 05:14:20 +05:30
M.Ravi
b8463360b5
Added styles for message title and text for email confirmation
2017-06-11 05:11:09 +05:30
M.Ravi
bd10d1cf9f
Added signup_validate html template. This is an empty template that we use to show appropriate message during email confirmation
2017-06-11 05:10:00 +05:30
Henry Bravo
7004536a19
Fix conflicts
2017-06-09 16:18:41 -05:00
Henry Bravo
54b339a546
Staging fix and cleaned html
2017-06-09 15:37:14 -05:00
Levi
d43855adda
fixed #3350 , #3328 , #3316 , #3339
2017-06-09 15:36:14 -05:00
Henry Bravo
7485c182c4
Redesign vm order page
2017-06-09 13:55:45 -05:00
Levi
96272ffd44
added mo files
2017-06-06 00:08:22 -05:00
Levi
a355ae9087
Merge branch 'develop' of git://github.com/HenryGBC/dynamicweb into HenryGBC-develop
2017-06-05 22:51:53 -05:00
Henry Bravo
c69694274f
Fix conflicts
2017-06-05 14:55:41 -05:00
Levi
484ab5f1c6
fixed payment when user has already a card
2017-06-04 17:41:48 -05:00
Levi
5be46db5a3
Merge branch 'feature/delete_ssh_key' of git://github.com/Modulos/dynamicweb into Modulos-feature/delete_ssh_key
2017-06-04 17:22:52 -05:00
Levi
8adcb75b8c
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2017-06-04 17:08:09 -05:00
Levi
ab4d1cf9c9
Changes stripe v2 to stripe v3 and added localization support
2017-06-04 17:04:38 -05:00
Henry Bravo
ba03cf232e
'what is it' section text change and fixed typo
2017-06-03 21:57:21 -05:00
Henry Bravo
9b121cc702
improveded mobile responsiveness
2017-06-03 21:19:13 -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
31e9377818
Merge branch 'develop' into hosting_i18n
2017-06-03 09:59:48 +02:00
Levi
f2ee18deba
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2017-06-02 11:20:30 -05:00
Levi
cd9c8938ed
hidden footbar on mobile devices
2017-06-02 11:11:04 -05:00
Levi Velázquez
1ae8a627f2
Merge pull request #300 from ungleich/master
...
Updating develop
2017-06-02 09:45:49 -05: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
ef0589f691
Add german translation
2017-06-01 23:06:29 +02:00
Henry Bravo
be04bee643
Fix center login pages
2017-06-01 15:40:19 -05:00
modulos
d229d124e9
Merge branch 'develop' into api/cleanup
2017-06-01 21:51:15 +02:00
Henry Bravo
024f7565df
Fixed details in Hosting pages and translate in login
2017-06-01 11:24:50 -05:00
modulos
37a9629408
Add more translations
2017-05-30 15:57:36 +02:00
modulos
9416586d0b
Merge branch 'develop' into hosting_i18n
2017-05-30 15:10:22 +02:00
Henry Bravo
a7c28f5644
Fix conflic translates
2017-05-29 15:05:11 -05:00
modulos
796a56872c
Add translation for CHF/Month
2017-05-29 18:05:21 +02:00
modulos
48050a2360
Remove .mo files and update .po files
2017-05-29 16:12:28 +02:00
modulos
40fe3f4d29
Merge branch 'develop' into hosting_i18n
2017-05-29 15:47:22 +02:00
modulos
1d95f87b8d
Merge branch 'develop' into dcl_i18n
2017-05-29 15:25:18 +02:00
modulos
f142bb1ce9
Move keys section underneath user name menu
2017-05-29 15:00:47 +02:00
modulos
5dfb56eb6f
Add more german translations
2017-05-29 14:36:05 +02:00
modulos
6937fb98f0
Merge branch 'develop' into hosting_i18n
2017-05-29 14:00:53 +02:00
Henry Bravo
67d24462ec
Apply design in Signup and change password, and fixed details
2017-05-28 12:57:02 -05:00
Henry Bravo
3f0a93357f
Login page design new styles
2017-05-28 00:44:36 -05:00
Henry Bravo
ac28ab0d6b
Fix texts bugs and hosting mobile design
2017-05-27 10:39:30 -05:00
Levi
59be6a7413
Merge branch 'master' into develop
2017-05-26 13:03:08 -05:00
modulos
a044490ec3
Add i18n to hosting/order
...
With this commit most work for i18n of the order page is done. However
django errors, e.g. 'this field is required', aren't transalted yet.
2017-05-26 17:02:22 +02:00
modulos
5869c6dd87
Add i18n to datacenterlight
...
The pricing page is now fully i18n as well as the subscription modal
2017-05-26 15:53:21 +02:00
M.Ravi
6a6f403704
Renamed GiB to GB in datacenterlight/pricing.html and hosting/payment.html
2017-05-26 02:47:20 +05:30
Henry Bravo
549acd400a
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2017-05-25 13:31:16 -05:00
Henry Bravo
c91a61b33c
Fix order columns in hosting/payment
2017-05-25 13:27:47 -05: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
4b89e71b1f
Merge branch 'develop' into fix_redirect
2017-05-25 16:19:34 +02:00
modulos
35f129a4c7
Add user generated public ssh keys as well
2017-05-25 15:54:32 +02:00
modulos
c6db1450a1
Correct vm configuration flow
...
A user now get's redirected to vm list view when pressing 'finish
configuration'
2017-05-25 12:39:23 +02:00
modulos
9753dfd2fc
Add UserHosting public key to opennebula user
2017-05-25 11:27:49 +02:00
Levi
4daf6ac3ac
added redirect after create vm ssh key
2017-05-24 11:09:54 -05:00
Levi
ee80181a55
added redirect after create vm ssh key
2017-05-24 10:58:16 -05:00
modulos
df0b4f2629
Merge branch 'develop' into order_now
2017-05-23 19:31:58 +02:00
modulos
15259e59f2
Add support for sign up redirection
2017-05-23 19:18:51 +02:00
Levi
3d03d00201
fixed ip format in virtual machine list
2017-05-23 11:52:53 -05:00
Levi
60fc2890f1
added ipv4 and ipv6 to virtualmachine list
2017-05-23 11:50:08 -05:00
Levi
e278ff742d
Merge branch 'develop' of github.com:ungleich/dynamicweb into develop
2017-05-23 11:48:25 -05:00
Levi
8d81220202
changed virtual machine list
2017-05-23 11:48:02 -05:00
modulos
adf9b77e4e
Show ipv6 address
2017-05-23 11:30:10 +02:00
modulos
e782290eeb
Fix NoReverseMatch for create-virtual-machine
2017-05-22 12:53:01 +02:00
Levi
d71c3093e8
added price to create vm view
2017-05-21 22:49:56 -05:00
Levi
cb33e6a750
added price to create vm view
2017-05-21 22:48:10 -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
65c6f1342b
added next url to ssh create key view
2017-05-21 22:38:12 -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
Modulos
d7bd142387
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
2017-05-14 03:41:56 +02:00
Modulos
8a18c275c3
Display configuration in virtualmachine detail
2017-05-14 03:41:30 +02:00
Levi Velázquez
d031488514
Merge pull request #242 from levivm/opennebula_api
...
added permissions to hosting bill view
2017-05-13 20:20:02 -05:00
Levi
bcc32174b2
added permissions to hosting bill view
2017-05-13 20:19:09 -05:00
Levi Velázquez
de3fa34e7e
Merge pull request #241 from levivm/opennebula_api
...
fixed create vm button display
2017-05-13 19:58:27 -05:00
Levi
d5749f65f1
fixed create vm button display
2017-05-13 19:57:23 -05:00
Modulos
46b918d175
Fix price calculation
2017-05-14 02:18:10 +02:00
Levi
e6ec14dfe7
Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api
2017-05-13 12:22:21 -05:00
Modulos
85d3158dbd
Fix order price
2017-05-13 17:02:45 +02: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
c816d280ee
Remove opennebula_functions.py
2017-05-13 05:52:27 +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
1a6e1a44d8
fixing formatting
2017-05-11 00:38:53 -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
f1ae7e1014
Fix _get_or_create_user
2017-05-09 05:54:10 +02:00
Modulos
63052df6c9
Change to new OpenNebula functions
2017-05-09 05:05:58 +02:00
Modulos
d0fc0144e5
Merge branch 'opennebula-integration' into vm_bill
2017-05-09 04:56:03 +02:00
Levi
9a34518457
attached opennebula vm id to virtualmachine plan
2017-05-08 21:54:12 -05:00
Levi
abf6dbddce
added create vm feature from a normal user in opennebula
2017-05-08 21:49:40 -05:00
Modulos
6dedf3693e
Change to use OpenNebulaManager
2017-05-09 04:41:45 +02:00
Modulos
7010c76c72
Add floatformat
2017-05-09 04:41:35 +02:00
Modulos
38b2aa8986
Create HostingBill obj when payment's successful
2017-05-09 04:40:41 +02:00
Modulos
3ee075fad9
Merge branch 'opennebula-integration' into vm_bill
2017-05-09 04:04:53 +02:00
Levi
bd83545653
Merge branch 'opennebula-integration' of github.com:ungleich/dynamicweb into opennebula-integration
2017-05-08 19:06:12 -05:00
Levi
7ae49d00dd
added opennebula manager claass
2017-05-08 19:02:29 -05:00
Modulos
c745a8c402
Remove comment
...
I assume that only clients are StripeCustomer objects
2017-05-08 16:00:42 +02:00
Modulos
3078536bd7
Merge branch 'opennebula-integration' into vm_bill
2017-05-08 15:46:53 +02:00
M.Ravi
621376c5b4
Added functionality to create opennebula user if it does not exist
2017-05-08 16:23:03 +05:30
M.Ravi
970ae1d0b2
Manual merge of levi/opennebula-integration
2017-05-08 12:34:28 +05:30
M.Ravi
a1eea9162e
Added logger methods for print.
2017-05-08 11:36:46 +05:30
Modulos
ae69a56ab2
Add error handling
2017-05-08 02:47:38 +02:00
Modulos
a22c8cad51
Fix cosmetic detail
2017-05-08 02:46:11 +02:00
Levi Velázquez
0220867772
Merge pull request #225 from levivm/opennebula-integration
...
added get vms
2017-05-07 19:05:45 -05:00
Levi
d72c1c810d
added get vms
2017-05-07 18:57:44 -05:00
Modulos
b4ec750728
Return error page if HostingBill is None
2017-05-08 01:56:02 +02:00
Modulos
f871bb2aba
Show correct user name and email
2017-05-08 01:43:47 +02:00
Levi Velázquez
23f58ead52
Merge pull request #224 from levivm/opennebula-integration
...
Opennebula integration
2017-05-07 17:48:05 -05:00
Levi
233642a6b1
removed pdb
2017-05-07 17:47:41 -05:00
Levi
1ebc3b8be4
testing
2017-05-07 17:46:03 -05:00
Modulos
c2a76e6c39
Merge migrations and fix spacing
2017-05-07 16:09:41 +02:00
Modulos
4ab8963149
Follow fat models small views
...
Based on the recommondation in 'Two scoops of Django' I moved the code
for accessing the customers vm from the view to the model.
2017-05-07 16:07:38 +02:00
Modulos
d146c25899
Merge branch 'opennebula-integration' into vm_bill
2017-05-07 06:29:29 +02:00
M.Ravi
6d4e9d8a83
Refactored code to introduce different VM templates
2017-05-07 05:31:39 +05:30
Levi Velázquez
07a3d8649c
Merge pull request #223 from levivm/opennebula-integration
...
fixing vm list
2017-05-06 18:40:14 -05:00
Levi
e67148ff59
fixing vm list
2017-05-06 18:39:19 -05:00
Levi Velázquez
a04955eb59
Merge pull request #222 from levivm/opennebula-integration
...
adding method to list vms
2017-05-06 18:37:30 -05:00
Levi
b0a27b8c75
adding method to list vms
2017-05-06 18:36:51 -05:00
Levi Velázquez
e1a61ba930
Merge pull request #217 from levivm/opennebula-integration
...
Opennebula integration
2017-05-06 18:27:35 -05:00
Levi
2ac34ff295
fixed virtual machines template
2017-05-06 18:25:15 -05:00
Levi
e99be51de1
adding list vm
2017-05-06 18:19:28 -05:00
Levi
767a5fc5da
fixing errors on vm creation
2017-05-06 18:17:47 -05:00
Levi
3994d2d33b
added migratin
2017-05-06 18:12:25 -05:00
Levi
90307724c8
added null true to opennebula id atribute
2017-05-06 18:09:01 -05:00
Levi
c9c7023c73
fixed create vm method
2017-05-06 18:04:45 -05:00
Levi
97fecf88db
fixed typo
2017-05-06 17:42:14 -05:00
Levi
ac9ba1480b
fixed payment issues
2017-05-06 17:36:02 -05:00
Modulos
bd362cb619
Change to user_email add TODOs
2017-05-06 15:28:18 +02:00
Modulos
6f252def5d
Return error if HostingBill object does not exist
2017-05-06 15:16:10 +02:00
Modulos
673e8a0c79
Add total_price to HostingBill model
2017-05-06 14:44:08 +02:00
Modulos
2ff8b9e4a5
Add hosting bill view, model and urls
2017-05-05 14:59:11 +02:00
Levi
ed806910e6
adding integration opennebula-hosting app
2017-05-03 23:19:32 -05:00
Pcoder
9884eefa19
Update managevms.html
2017-05-03 11:44:04 +05:30
M.Ravi
58d3dd6624
Fixed some issues.
2017-05-03 11:09:22 +05:30
M.Ravi
7cc2af420b
Added DEV_PREFIX parameter when creating VM, so that we create KVM virtual disk
2017-05-01 14:28:23 +05:30
Levi
2658205008
showing VMS
2017-04-29 12:54:14 -05:00
Levi
4ec830550c
showing VMS
2017-04-29 12:51:30 -05:00
Levi
3e755b3b68
added vm_template parameter to djangohosting view
2017-04-29 12:46:56 -05:00
Levi
085133fb53
integrating hosting app with opennebula integration
2017-04-29 12:39:55 -05:00
M.Ravi
cb4d96604c
Manual merge of develop into opennebula-integration
2017-04-26 10:40:52 +05:30
M.Ravi
43350869e0
Reverted some files back to as they were in master. They had been reorganized.
2017-04-25 03:55:05 +05:30
M.Ravi
1e61ec965d
Some more fixes for the issues of the review of rscnt.
2017-04-25 03:37:50 +05:30
M.Ravi
a8952700d6
Partial fixes for issues pointed by @rscnt
...
- Moved opennebula constants to base.py
- Refactored all opennebula functions from admin.py to opennebula_functions.py
- string#format for some strings
- Renamed my_view function to show_vms
- Added logger to show logs of exceptions generated
2017-04-24 18:51:11 +02:00
