Henry Bravo
|
7485c182c4
|
Redesign vm order page
|
2017-06-09 13:55:45 -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 |
|
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 |
|
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
|
f142bb1ce9
|
Move keys section underneath user name menu
|
2017-05-29 15:00:47 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
d5749f65f1
|
fixed create vm button display
|
2017-05-13 19:57:23 -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
|
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 |
|
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
|
7010c76c72
|
Add floatformat
|
2017-05-09 04:41:35 +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
|
3078536bd7
|
Merge branch 'opennebula-integration' into vm_bill
|
2017-05-08 15:46:53 +02:00 |
|
M.Ravi
|
970ae1d0b2
|
Manual merge of levi/opennebula-integration
|
2017-05-08 12:34:28 +05:30 |
|
Modulos
|
a22c8cad51
|
Fix cosmetic detail
|
2017-05-08 02:46:11 +02:00 |
|
Modulos
|
f871bb2aba
|
Show correct user name and email
|
2017-05-08 01:43:47 +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
|
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
|
ac9ba1480b
|
fixed payment issues
|
2017-05-06 17:36:02 -05: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 |
|
Levi
|
3e755b3b68
|
added vm_template parameter to djangohosting view
|
2017-04-29 12:46:56 -05:00 |
|
M.Ravi
|
d537fcb118
|
Manual merge of ungleich/master into opennebula-integration
|
2017-04-24 03:01:05 +05:30 |
|
M.Ravi
|
d10285e23d
|
Made to use random passwords for creating opennebula users and managing their VMs.
|
2017-04-23 22:46:59 +05:30 |
|
M.Ravi
|
c8614f4f63
|
Added functionality to select templates for the VMs being created
|
2017-04-18 13:34:29 +05:30 |
|
M.Ravi
|
b68fe31361
|
Added start/stop functionality for VMs. Refactored a few functions.
|
2017-04-11 00:44:55 +05:30 |
|
M.Ravi
|
167e0482a9
|
Added Delete VM functionality.
|
2017-04-10 13:43:13 +05:30 |
|
M.Ravi
|
24cfe707cd
|
Listing of VMs and Creation of VMs done.
|
2017-03-17 00:42:27 +05:30 |
|
M.Ravi
|
b363bf5f6a
|
First working version of opennebula-integration.
|
2017-03-15 17:32:55 +05:30 |
|
Levi
|
cb520f6b58
|
Created signup view. Added login after signup.Added signup url to nosystem app urls.py. Added logout view, Added logout button on nabber, Added password reset form, Added password view , Added password reset html, Added password reset email for nosystemd app. Added confirm_reset_password.html, Added confirm_ reset password view, Added confirm reset password form, Fixed reset password token generation, Started donation view, Added donation view, Added donation.html, Added donation form, Adding donation.js lib in order to capture stripe payments for nosystem app.
|
2016-07-22 01:24:32 -05:00 |
|
Levi
|
d7f7d498f5
|
Created .po translation file for login.html, signup.html, reset_password.html, confirm_reset_password.html, base_short.html, order_detail.html. Created .po translation file for orders.html, virtual_machine_detail.html, virtual_machines. created .po translation file for virtual_machine_key.html, notifications.html
|
2016-07-18 21:24:44 -05:00 |
|
Levi
|
4352094680
|
Added ‘view virtual machine plan ’ permission, Added ‘delete virtual machine plan’ permission , Added ‘view hosting order’ permission
|
2016-07-10 22:08:51 -05:00 |
|
Levi
|
e90c5fece0
|
Created generic view for vm pricing widget, Added VM configuration info on VM detail view, Fixed template bugs. Fixed Blog urls bugs
|
2016-06-30 01:23:14 -05:00 |
|
Levi
|
9aa732626f
|
fixed hosting emails
|
2016-06-26 14:54:01 -05:00 |
|
Levi
|
11bb685ea6
|
updated all email templates with the new logo img
|
2016-06-24 00:08:51 -05:00 |
|
Levi
|
ddc2d0aa0d
|
fixing logo on emails
|
2016-06-23 23:58:02 -05:00 |
|
Levi
|
03cdd3437d
|
fixing logo on emails
|
2016-06-23 23:46:25 -05:00 |
|
Levi
|
29efff31ea
|
changing logo on vm booking emails
|
2016-06-23 23:38:32 -05:00 |
|