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

• 7a5555fe99 Merge pull request #274 from Modulos/develop Noe 2017-05-24 20:47:54 +02:00
• 17a85e3831 Context fix modulos 2017-05-24 20:45:20 +02:00
• 6f9ca234f2 Fixed, delete files .html.py Henry Bravo 2017-05-24 11:52:52 -05:00
• 4c5cbe5bd9 Merge pull request #273 from levivm/develop Levi Velázquez 2017-05-24 11:10:30 -05:00
• 4daf6ac3ac added redirect after create vm ssh key Levi 2017-05-24 11:09:54 -05:00
• ee80181a55 added redirect after create vm ssh key Levi 2017-05-24 10:58:16 -05:00
• f2649251c2 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Henry Bravo 2017-05-23 18:32:21 -05:00
• c205bb05e8 Fixed Pricing pages bugs Henry Bravo 2017-05-23 18:32:06 -05:00
• c59fcd4b16 Merge pull request #271 from Modulos/checkbox Levi Velázquez 2017-05-23 13:31:34 -05:00
• 229c8b9cfc Disable checkbox modulos 2017-05-23 20:27:26 +02:00
• f2d4e1515e Merge pull request #270 from Modulos/order_now Levi Velázquez 2017-05-23 13:12:12 -05:00
• e6f2157b83 Correct pricing page redriection modulos 2017-05-23 19:58:29 +02:00
• df0b4f2629 Merge branch 'develop' into order_now modulos 2017-05-23 19:31:58 +02:00
• 15259e59f2 Add support for sign up redirection modulos 2017-05-23 19:18:51 +02:00
• 08e3ac6bce Merge pull request #269 from HenryGBC/develop Levi Velázquez 2017-05-23 12:17:04 -05:00
• 398b7062e0 resolve conflicts Henry Bravo 2017-05-23 12:13:44 -05:00
• c383156c42 Pass params in form pricing Henry Bravo 2017-05-23 12:06:48 -05:00
• 4dc60c4b1a Merge pull request #268 from levivm/develop Levi Velázquez 2017-05-23 11:59:46 -05:00
• da3194fee3 fixed configuration name in vm detail Levi 2017-05-23 11:58:48 -05:00
• 52a67bc3a4 Merge pull request #267 from levivm/develop Levi Velázquez 2017-05-23 11:53:23 -05:00
• 3d03d00201 fixed ip format in virtual machine list Levi 2017-05-23 11:52:53 -05:00
• 9dee72a91c Merge pull request #266 from levivm/develop Levi Velázquez 2017-05-23 11:51:07 -05:00
• 60fc2890f1 added ipv4 and ipv6 to virtualmachine list Levi 2017-05-23 11:50:02 -05:00
• e278ff742d Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2017-05-23 11:48:25 -05:00
• 8d81220202 changed virtual machine list Levi 2017-05-23 11:48:02 -05:00
• bed670c9e3 Merge pull request #261 from Modulos/public_ip Levi Velázquez 2017-05-23 11:10:08 -05:00
• 21d37ffca4 Merge pull request #263 from Modulos/beta_modal Levi Velázquez 2017-05-23 11:10:01 -05:00
• 194dfe5064 Merge pull request #265 from Modulos/remove_prefix Levi Velázquez 2017-05-23 11:09:56 -05:00
• adf9b77e4e Show ipv6 address modulos 2017-05-23 11:30:10 +02:00
• 4c8a4d0be8 Typo modulos 2017-05-23 11:17:38 +02:00
• 021a8e784d Remove 'public-' prefix modulos 2017-05-23 10:36:57 +02:00
• 506fbca204 Design calculator page Henry Bravo 2017-05-22 23:35:29 -05:00
• 30f042cdc3 Fixed bugs style dcl Henry Bravo 2017-05-22 13:00:27 -05:00
• ba9336dd33 Merge pull request #264 from Modulos/order_now Noe 2017-05-22 18:27:09 +02:00
• 88731d6371 Change buy now to order now and add link modulos 2017-05-22 18:25:56 +02:00
• 920e7669dc Show modal after beta access signup modulos 2017-05-22 18:03:33 +02:00
• ccb583b20d Add vm-ipv6-nat64-ipv4 network name check modulos 2017-05-22 13:28:14 +02:00
• 9d5d924c7e Merge remote-tracking branch 'upstream/develop' into public_ip modulos 2017-05-22 12:57:12 +02:00
• a2571bfad2 Merge pull request #260 from Modulos/develop Noe 2017-05-22 12:55:58 +02:00
• e782290eeb Fix NoReverseMatch for create-virtual-machine modulos 2017-05-22 12:53:01 +02:00
• 866594f3fc Merge remote-tracking branch 'upstream/develop' into public_ip modulos 2017-05-22 12:44:44 +02:00
• 54c7234dbe Merge pull request #259 from levivm/develop Levi Velázquez 2017-05-21 22:50:21 -05:00
• d71c3093e8 added price to create vm view Levi 2017-05-21 22:49:56 -05:00
• e818a53bbe Merge pull request #258 from levivm/develop Levi Velázquez 2017-05-21 22:48:38 -05:00
• cb33e6a750 added price to create vm view Levi 2017-05-21 22:48:10 -05:00
• ffc4700faf Merge pull request #257 from levivm/develop Levi Velázquez 2017-05-21 22:47:07 -05:00
• 34d596f2ba added next url to ssh create key view Levi 2017-05-21 22:46:31 -05:00
• f73ed7fad7 Merge pull request #256 from levivm/develop Levi Velázquez 2017-05-21 22:40:19 -05:00
• 05bf8db38a added next url to ssh create key view Levi 2017-05-21 22:39:47 -05:00
• 8f310c1ceb Merge pull request #255 from levivm/develop Levi Velázquez 2017-05-21 22:38:38 -05:00
• 65c6f1342b added next url to ssh create key view Levi 2017-05-21 22:38:12 -05:00
• 3d05264d64 Merge pull request #254 from levivm/develop Levi Velázquez 2017-05-21 22:36:26 -05:00
• 02a2ac31c6 added next url to ssh create key view Levi 2017-05-21 22:35:43 -05:00
• 646f73763e Merge pull request #253 from ungleich/opennebula_api Levi Velázquez 2017-05-21 22:02:49 -05:00
• d5e98e34d9 Merge pull request #252 from levivm/opennebula_api Levi Velázquez 2017-05-21 22:02:24 -05:00
• 3f198bb4de Fixed djangohosting, railshosting and nodehosting page. Fixed payment erro Levi 2017-05-21 22:01:26 -05:00
• 9b3c65d28a Merge pull request #250 from ungleich/opennebula_api Levi Velázquez 2017-05-20 11:40:25 -05:00
• 8036ea84a1 Merge pull request #251 from levivm/opennebula_api Levi Velázquez 2017-05-20 11:39:42 -05:00
• 1aba5cbee5 fixed datacenterlight page Levi 2017-05-20 11:38:37 -05:00
• 6c2be0202f Merge pull request #249 from levivm/opennebula_api Levi Velázquez 2017-05-20 11:25:13 -05:00
• 3503e6568e Merge branch 'develop' into opennebula_api Levi 2017-05-20 11:23:13 -05:00
• 03ec8ef674 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api Levi 2017-05-20 11:20:30 -05:00
• ec198c74f9 fixed translations Levi 2017-05-20 11:19:58 -05:00
• 5dd54f4219 added redirect Levi 2017-05-20 11:06:10 -05:00
• 8e00e55c76 Merge pull request #248 from HenryGBC/develop Levi Velázquez 2017-05-20 10:31:17 -05:00
• 14e87feab2 Update django.po verysanghee 2017-05-20 17:11:50 +02:00
• 5cead83c89 typo verysanghee 2017-05-20 17:08:24 +02:00
• 00101921c7 Fixed typo bugs dcl Henry Bravo 2017-05-19 22:41:10 -05:00
• d13efd4527 Get public ip for vms Modulos 2017-05-19 16:39:56 +02:00
• 767e95895a Redesign DCL Page Henry Bravo 2017-05-18 00:13:00 -05:00
• 1ca884e1f6 Removed 'More info' button from datacenterlight index page. M.Ravi 2017-05-14 21:09:16 +05:30
• 39f9b3c085 Merge pull request #245 from ungleich/connection_error_open_api Noe 2017-05-14 14:21:34 +02:00
• 62be9ae789 Added ServiceUnvailable error handling for the case when we have no connection to OpenNebula. M.Ravi 2017-05-14 17:39:10 +05:30
• 7cbe75014d Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api Modulos 2017-05-14 12:45:22 +02:00
• 0353f72676 Try connection Modulos 2017-05-14 12:44:36 +02:00
• dec1ccd180 Created url for buy button on datacenterlight home page and redirection of ^hosting/ endpoint to take to hosting app's login page. M.Ravi 2017-05-14 15:36:11 +05:30
• 8d0e69ab25 Merge pull request #244 from ungleich/connection_error Noe 2017-05-14 12:34:54 +02:00
• a6e6303ba0 Merge branch 'opennebula_api' into connection_error Modulos 2017-05-14 12:24:53 +02:00
• 1e2b8b1652 Add connection error handling Modulos 2017-05-14 12:22:10 +02:00
• 05e19ffb68 Created url for buy button on datacenterlight home page and redirection of ^hosting/ endpoint to take to hosting app's login page. M.Ravi 2017-05-14 15:36:11 +05:30
• d7bd142387 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api Modulos 2017-05-14 03:41:56 +02:00
• 8a18c275c3 Display configuration in virtualmachine detail Modulos 2017-05-14 03:41:30 +02:00
• d031488514 Merge pull request #242 from levivm/opennebula_api Levi Velázquez 2017-05-13 20:20:02 -05:00
• bcc32174b2 added permissions to hosting bill view Levi 2017-05-13 20:19:09 -05:00
• de3fa34e7e Merge pull request #241 from levivm/opennebula_api Levi Velázquez 2017-05-13 19:58:27 -05:00
• d5749f65f1 fixed create vm button display Levi 2017-05-13 19:57:23 -05:00
• 921fa209ce Merge image into template Modulos 2017-05-14 02:18:16 +02:00
• 46b918d175 Fix price calculation Modulos 2017-05-14 02:17:48 +02:00
• f80496a103 Quick fix remove cpu_cost etc. Modulos 2017-05-14 01:21:10 +02:00
• b8df86342a Add try and except for template disks Modulos 2017-05-14 01:02:22 +02:00
• aa8e886745 Merge pull request #240 from levivm/opennebula_api Levi Velázquez 2017-05-13 18:00:49 -05:00
• 9141e1211c remove pdb Levi 2017-05-13 18:00:30 -05:00
• c7b59ec762 added web-team@ungleich.ch email for error Levi 2017-05-13 17:59:04 -05:00
• ddeb3b5575 Merge pull request #239 from levivm/opennebula_api Levi Velázquez 2017-05-13 17:21:50 -05:00
• 4f0bc72cc1 debugging templates Levi 2017-05-13 17:21:07 -05:00
• 4e07655694 Merge pull request #238 from levivm/opennebula_api Levi Velázquez 2017-05-13 12:36:41 -05:00
• e6ec14dfe7 Merge branch 'opennebula_api' of github.com:ungleich/dynamicweb into opennebula_api Levi 2017-05-13 12:22:21 -05:00
• edab311d62 Fix memory MB to GB Modulos 2017-05-13 17:32:55 +02:00
• 85d3158dbd Fix order price Modulos 2017-05-13 17:02:45 +02:00
• cee507e34f Update open_api/vms to include ssh_key and specs Modulos 2017-05-13 15:50:00 +02:00