Commit graph

Select branches

Hide pull requests

HenryGBC-dcl-bug#3366-3426

aatish/dynamicweb-6213_alignment_fixes

changes-settings

design_membership

feature/nosystemd

feature/old_master

feature/vm_pricing

feature/yearly-subscription

hosting_translations

master

serialize

1.0.0

1.0.1

1.0.10

1.0.11

1.0.12

1.0.13

1.0.14

1.0.15

1.0.16

1.0.17

1.0.18

1.0.19

1.0.2

1.0.20

1.0.21

1.0.22

1.0.23

1.0.24

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1

1.1.1

1.2

1.2.1

1.2.10

1.2.11

1.2.12

1.2.13

1.2.2

1.2.3

1.2.4

1.2.5

1.2.6

1.2.7

1.2.8

1.2.9

1.3

1.3.1

1.3.2

1.3.3

1.4

1.4.1

1.5

1.5.1

1.5.2

1.5.3

1.5.4

1.5.5

1.6

1.6.1

1.6.2

1.6.3

1.6.4

1.6.5

1.7

1.7.1

1.7.2

1.8

1.9

1.9.1

2.0

2.0.1

2.0.2

2.0.3

2.0.4

2.0.5

2.1

2.1.1

2.1.2

2.2

2.2.1

2.2.2

2.3

2.3.1

2.4

2.4.1

2.4.10

2.4.2

2.4.3

2.4.4

2.4.5

2.4.6

2.4.7

2.4.8

2.4.9

2.5

2.5.1

2.5.10

2.5.11

2.5.2

2.5.3

2.5.4

2.5.5

2.5.6

2.5.7

2.5.8

2.5.9

2.6

2.6.1

2.6.2

2.6.3

2.6.4

2.6.5

2.6.6

2.6.7

2.6.8

2.6.9

old-2.0

Mono Color

• beb0a8926c Merge pull request #237 from ungleich/add_config Noe 2017-05-13 13:48:51 +02:00
• 752e11bcea Readded hostingplans Modulos 2017-05-13 13:47:53 +02:00
• 8017fbb90f Work on configuration Modulos 2017-05-13 10:00:07 +02:00
• d8c8804cc4 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api Levi 2017-05-13 00:31:33 -05:00
• 07dc04018f cleaned code Levi 2017-05-13 00:31:29 -05:00
• 68c0a6cec6 Merge pull request #236 from ungleich/add_config Levi Velázquez 2017-05-13 00:29:40 -05:00
• 75d93b2aad Add images as configuration Modulos 2017-05-13 06:59:57 +02:00
• c816d280ee Remove opennebula_functions.py Modulos 2017-05-13 05:52:27 +02:00
• cfaf201064 Handle ConnectionException, add change_user_password Modulos 2017-05-13 05:50:56 +02:00
• 8f3125d2f7 Merge pull request #235 from levivm/opennebula_api Noe 2017-05-13 05:07:53 +02:00
• 8980f6b2fc merged opnnebula api changes Levi 2017-05-12 12:13:18 -05:00
• 130c00c8ee API Integration Modulos 2017-05-12 12:07:05 +02:00
• 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 Levi 2017-05-12 00:56:35 -05:00
• b7e8eceb25 Add opennebula api urls and add delete vm api Modulos 2017-05-11 17:39:59 +02:00
• 358d70570a Add authentication Modulos 2017-05-11 12:45:09 +02:00
• 1a6e1a44d8 fixing formatting Levi 2017-05-11 00:38:53 -05:00
• 22798e29bf Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api Levi 2017-05-11 00:11:42 -05:00
• 1f10f04a9d Fixed ssh key error, Now an existing user is not ask for his credit card again Levi 2017-05-11 00:11:33 -05:00
• ef00d676f5 Access VirtualMachine via api! Modulos 2017-05-11 05:51:30 +02:00
• cbc13de34f Access VirtualMachineTemplates via api! Modulos 2017-05-11 04:05:58 +02:00
• 5ed72bf4bf Change to ungleich/python-oca Modulos 2017-05-11 04:03:31 +02:00
• 746dfaa40d Merge branch 'serialize' into opennebula_api Modulos 2017-05-10 13:26:24 +02:00
• 4016dcfea9 Merge branch 'calculate_price' into opennebula_api Modulos 2017-05-10 13:25:38 +02:00
• d36a83c8ac Merge branch 'create_template' into opennebula_api Modulos 2017-05-10 13:22:11 +02:00
• 5861bec4a6 Merge pull request #234 from Modulos/create_vm Levi Velázquez 2017-05-09 23:33:45 -05:00
• ba0cc137bc Start serialization serialize Modulos 2017-05-10 04:06:12 +02:00
• f2a7ac258d Fix typo and add function description Modulos 2017-05-10 02:49:03 +02:00
• c1a3f7281f Add calculate price function to template Modulos 2017-05-10 02:36:11 +02:00
• b62819ae79 Add create vm function Modulos 2017-05-10 01:31:27 +02:00
• b052507134 Add create template function Modulos 2017-05-10 01:11:49 +02:00
• ec945cc31b Add ConnectionRefusedError exception Modulos 2017-05-10 00:39:41 +02:00
• 714849fb49 Fix test_model_can_create_user Modulos 2017-05-09 17:15:12 +02:00
• 78294cb6a3 Add inital migration Modulos 2017-05-09 16:37:03 +02:00
• df777f384d Initial commit Modulos 2017-05-09 16:33:56 +02:00
• 987bf7ae2e Merge pull request #229 from Modulos/fix_create_user Levi Velázquez 2017-05-08 22:57:03 -05:00
• f1ae7e1014 Fix _get_or_create_user Modulos 2017-05-09 05:54:10 +02:00
• 7cd2f1884d Merge pull request #220 from Modulos/vm_bill Levi Velázquez 2017-05-08 22:10:50 -05:00
• 63052df6c9 Change to new OpenNebula functions Modulos 2017-05-09 05:05:58 +02:00
• d0fc0144e5 Merge branch 'opennebula-integration' into vm_bill Modulos 2017-05-09 04:56:03 +02:00
• 31b7b37eb9 Merge pull request #227 from levivm/opennebula-integration Levi Velázquez 2017-05-08 21:55:07 -05:00
• 9a34518457 attached opennebula vm id to virtualmachine plan Levi 2017-05-08 21:54:12 -05:00
• abf6dbddce added create vm feature from a normal user in opennebula Levi 2017-05-08 21:49:40 -05:00
• 6dedf3693e Change to use OpenNebulaManager Modulos 2017-05-09 04:41:45 +02:00
• 7010c76c72 Add floatformat Modulos 2017-05-09 04:41:35 +02:00
• 38b2aa8986 Create HostingBill obj when payment's successful Modulos 2017-05-09 04:40:41 +02:00
• 3ee075fad9 Merge branch 'opennebula-integration' into vm_bill Modulos 2017-05-09 04:04:53 +02:00
• d8b073653c Merge pull request #226 from levivm/opennebula-integration Levi Velázquez 2017-05-08 19:06:31 -05:00
• bd83545653 Merge branch 'opennebula-integration' of github.com:ungleich/dynamicweb into opennebula-integration Levi 2017-05-08 19:06:12 -05:00
• 7ae49d00dd added opennebula manager claass Levi 2017-05-08 19:02:29 -05:00
• c745a8c402 Remove comment Modulos 2017-05-08 16:00:42 +02:00
• 3078536bd7 Merge branch 'opennebula-integration' into vm_bill Modulos 2017-05-08 15:46:53 +02:00
• 621376c5b4 Added functionality to create opennebula user if it does not exist M.Ravi 2017-05-08 16:23:03 +05:30
• 970ae1d0b2 Manual merge of levi/opennebula-integration M.Ravi 2017-05-08 12:34:28 +05:30
• a1eea9162e Added logger methods for print. M.Ravi 2017-05-08 11:36:46 +05:30
• ae69a56ab2 Add error handling Modulos 2017-05-08 02:47:38 +02:00
• a22c8cad51 Fix cosmetic detail Modulos 2017-05-08 02:46:11 +02:00
• 0220867772 Merge pull request #225 from levivm/opennebula-integration Levi Velázquez 2017-05-07 19:05:45 -05:00
• d72c1c810d added get vms Levi 2017-05-07 18:57:44 -05:00
• b4ec750728 Return error page if HostingBill is None Modulos 2017-05-08 01:56:02 +02:00
• f871bb2aba Show correct user name and email Modulos 2017-05-08 01:43:47 +02:00
• 23f58ead52 Merge pull request #224 from levivm/opennebula-integration Levi Velázquez 2017-05-07 17:48:05 -05:00
• 233642a6b1 removed pdb Levi 2017-05-07 17:47:41 -05:00
• 1ebc3b8be4 testing Levi 2017-05-07 17:46:03 -05:00
• c2a76e6c39 Merge migrations and fix spacing Modulos 2017-05-07 16:09:41 +02:00
• 4ab8963149 Follow fat models small views Modulos 2017-05-07 06:43:28 +02:00
• d146c25899 Merge branch 'opennebula-integration' into vm_bill Modulos 2017-05-07 06:29:29 +02:00
• 6d4e9d8a83 Refactored code to introduce different VM templates M.Ravi 2017-05-07 05:31:39 +05:30
• 07a3d8649c Merge pull request #223 from levivm/opennebula-integration Levi Velázquez 2017-05-06 18:40:14 -05:00
• e67148ff59 fixing vm list Levi 2017-05-06 18:39:19 -05:00
• a04955eb59 Merge pull request #222 from levivm/opennebula-integration Levi Velázquez 2017-05-06 18:37:30 -05:00
• b0a27b8c75 adding method to list vms Levi 2017-05-06 18:36:51 -05:00
• e1a61ba930 Merge pull request #217 from levivm/opennebula-integration Levi Velázquez 2017-05-06 18:27:35 -05:00
• 70e80758ac Merge pull request #221 from ungleich/develop Levi Velázquez 2017-05-06 18:26:53 -05:00
• 2ac34ff295 fixed virtual machines template Levi 2017-05-06 18:25:15 -05:00
• e99be51de1 adding list vm Levi 2017-05-06 18:19:28 -05:00
• 767a5fc5da fixing errors on vm creation Levi 2017-05-06 18:17:47 -05:00
• 3994d2d33b added migratin Levi 2017-05-06 18:12:25 -05:00
• 90307724c8 added null true to opennebula id atribute Levi 2017-05-06 18:09:01 -05:00
• c9c7023c73 fixed create vm method Levi 2017-05-06 18:04:45 -05:00
• 97fecf88db fixed typo Levi 2017-05-06 17:42:14 -05:00
• ac9ba1480b fixed payment issues Levi 2017-05-06 17:36:02 -05:00
• bd362cb619 Change to user_email add TODOs Modulos 2017-05-06 15:28:18 +02:00
• 6f252def5d Return error if HostingBill object does not exist Modulos 2017-05-06 15:16:10 +02:00
• 673e8a0c79 Add total_price to HostingBill model Modulos 2017-05-06 14:44:08 +02:00
• 2ff8b9e4a5 Add hosting bill view, model and urls Modulos 2017-05-05 14:59:11 +02:00
• 6d6093975c Merge pull request #219 from ungleich/develop Levi Velázquez 2017-05-04 10:45:55 -05:00
• ed806910e6 adding integration opennebula-hosting app Levi 2017-05-03 23:19:32 -05:00
• 9884eefa19 Update managevms.html Pcoder 2017-05-03 11:44:04 +05:30
• 58d3dd6624 Fixed some issues. M.Ravi 2017-05-03 11:09:22 +05:30
• 4a4ca3ff15 Merge pull request #206 from Modulos/feature/3040 Levi Velázquez 2017-05-03 00:13:05 -05:00
• f525606100 Merge pull request #216 from Modulos/feature/no_author Levi Velázquez 2017-05-02 23:55:49 -05:00
• 7cc2af420b Added DEV_PREFIX parameter when creating VM, so that we create KVM virtual disk M.Ravi 2017-05-01 14:28:23 +05:30
• bcc93d28b0 Merge remote-tracking branch 'origin/master' Sanghee Kim 2017-05-01 00:09:05 +02:00
• 2658205008 showing VMS Levi 2017-04-29 12:54:14 -05:00
• 4ec830550c showing VMS Levi 2017-04-29 12:51:30 -05:00
• 3e755b3b68 added vm_template parameter to djangohosting view Levi 2017-04-29 12:46:56 -05:00
• 085133fb53 integrating hosting app with opennebula integration Levi 2017-04-29 12:39:55 -05:00
• 56e6e43742 Merge pull request #2 from ungleich/opennebula-integration Levi Velázquez 2017-04-29 11:44:28 -05:00
• 32f52c1791 Remove author from blog posts Modulos 2017-04-27 03:25:14 +02:00
• 68e81472d5 Fixed a bug related to incorrect opennebula parameter. Added python oca's github repo to the requirements.txt. M.Ravi 2017-04-26 23:26:35 +05:30