sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
1800 commits 10 branches 82 tags 313 MiB
Commit graph

317 commits

Author SHA1 Message Date
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
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
a427fa8579 Renamed 'manage vmss' model names so that we have a nice name 2017-04-23 22:24:41 +05:30
M.Ravi
354cb144f7 Added graceful handling of OpenNebula network not available 2017-04-23 22:16:13 +05:30
M.Ravi
41d1e8b003 Merge branch 'opennebula-integration' of https://github.com/ungleich/dynamicweb into opennebula-integration 2017-04-23 21:27:32 +05:30
M.Ravi
37dc1f1c57 Added the functionality to create opennebula user corresponding to dynamicweb user and creating and listing vms of the logged in user. 2017-04-23 21:22:50 +05:30
Pcoder
d3f7110c60 Update README-opennebula-integration.md 2017-04-22 10:52:19 +05:30
Pcoder
9645895112 Rename README-opennebula-integration to README-opennebula-integration.md 2017-04-22 10:51:35 +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
c7334dfac2 Merge branch 'opennebula-integration' of https://github.com/ungleich/dynamicweb into opennebula-integration 2017-04-10 13:44:24 +05:30
M.Ravi
167e0482a9 Added Delete VM functionality. 2017-04-10 13:43:13 +05:30
Pcoder
cb64dd2b11 Create README-opennebula-integration 2017-03-17 01:02:03 +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
f56f294205 Fixed blling form goes out of background image, Fixed billing address page "amount" field seems broken, Changed authentication page fonts 
Added new DG login.html, Fixed DG login contact footer, Added new DG login form, Added  DG login, Added DG signup, Added DG reset password, Added DG confirm reset password, Added DG membership payment view
 Please enter the commit message for your changes. Lines starting
 2016-08-20 00:57:46 -05:00
Levi
4e07385949 Added command make_donations_charges in order to create stripe current monthly donations from all donators. Now the user can logout using navbar. Added restriction to user in order to make a donation when he has an active monthly donation . Added donations view where the user can view their recents donations. Now users receive an email after making his first donation. 2016-07-29 00:17:34 -05:00
Levi
4580a75f89 Added DonatorStatus model in order to know if an donator has canceled or not his monthly donation, Now we create a DonatorStatus for the user after receiving his first donation. Added DonatorStatus view. Added donator_status.html in order to allow an user view his donation status , Added action to allow user to cancel his monthly donations. Now the user can logout using navbar. added Donation model to admin.Added command make_donations_charges in order to create stripe current monthly donations from all donators 2016-07-27 00:08:45 -05:00
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
7cd5244fdc Added PostListViewUngleichTest, Added PostDetailViewUngleich, Converted detail ungleich post view into Class Based Django view, Added translations to ungleich landing page 2016-07-15 00:14:51 -05:00
Levi
a6ea27696a fixed tests in order to user permissions 2016-07-10 22:42:06 -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
3e6502133e Merge branch 'develop' into feature/hosting_permission 2016-07-09 17:43:28 -05:00
Levi
37287cf299 Added HostingPriceView test, - [ ] Added resolving url test to few views 2016-07-09 16:04:50 -05:00
Levi
b34d84657e Added HostingUserLoginForm test, Added HostingUserSignupForm test, Added PasswordResetRequestForm Test, Added SetPasswordForm test, Created custom 404 page 2016-07-07 23:35:50 -05:00
Levi
0dc81fff3d Fixed duplicated post bug , Added reset password view test, Added confirm reset password view test 2016-07-04 23:44:15 -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