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

• 12dd3abd5f Merge branch 'develop' into opennebula-integration M.Ravi 2017-04-26 22:48:38 +05:30
• 9abffdfc8a Manual merge of develop into opennebula-integration M.Ravi 2017-04-26 22:48:28 +05:30
• a0a2a4aecb Merge pull request #208 from Modulos/feature/3057 Levi Velázquez 2017-04-26 11:24:21 -05:00
• 0a5a9630cf Merge pull request #215 from ungleich/develop Levi Velázquez 2017-04-26 11:15:03 -05:00
• cb4d96604c Manual merge of develop into opennebula-integration M.Ravi 2017-04-26 10:40:52 +05:30
• e9646c878e Merge branch 'develop' into opennebula-integration M.Ravi 2017-04-26 10:35:24 +05:30
• c938ce738d Setting the opennebula params from the env M.Ravi 2017-04-26 10:27:15 +05:30
• 3537d4bf6f Merge pull request #204 from Modulos/feature/travis-ci Levi Velázquez 2017-04-25 22:17:40 -05:00
• d7674877a8 Merge pull request #213 from levivm/develop Levi Velázquez 2017-04-24 23:46:16 -05:00
• 1f85dfc5b3 fixed translations Levi 2017-04-24 23:44:34 -05:00
• 43350869e0 Reverted some files back to as they were in master. They had been reorganized. M.Ravi 2017-04-25 03:55:05 +05:30
• 1e61ec965d Some more fixes for the issues of the review of rscnt. M.Ravi 2017-04-25 03:37:50 +05:30
• a8952700d6 Partial fixes for issues pointed by @rscnt M.Ravi 2017-04-24 18:51:11 +02:00
• af3818d64a Removed some unwanted changes and prepared for a pull request. M.Ravi 2017-04-24 03:16:43 +05:30
• 73cfccd00c Merge branch 'master' into opennebula-integration M.Ravi 2017-04-24 03:11:03 +05:30
• d537fcb118 Manual merge of ungleich/master into opennebula-integration M.Ravi 2017-04-24 03:01:05 +05:30
• 1028ab0eca Merge branch 'master' of https://github.com/ungleich/dynamicweb M.Ravi 2017-04-24 02:02:01 +05:30
• d10285e23d Made to use random passwords for creating opennebula users and managing their VMs. M.Ravi 2017-04-23 22:46:59 +05:30
• a427fa8579 Renamed 'manage vmss' model names so that we have a nice name M.Ravi 2017-04-23 22:24:41 +05:30
• 354cb144f7 Added graceful handling of OpenNebula network not available M.Ravi 2017-04-23 22:16:13 +05:30
• 41d1e8b003 Merge branch 'opennebula-integration' of https://github.com/ungleich/dynamicweb into opennebula-integration M.Ravi 2017-04-23 21:27:32 +05:30
• 37dc1f1c57 Added the functionality to create opennebula user corresponding to dynamicweb user and creating and listing vms of the logged in user. M.Ravi 2017-04-23 21:22:50 +05:30
• d3f7110c60 Update README-opennebula-integration.md Pcoder 2017-04-22 10:52:19 +05:30
• 9645895112 Rename README-opennebula-integration to README-opennebula-integration.md Pcoder 2017-04-22 10:51:35 +05:30
• f0d812970e Merge pull request #211 from ungleich/develop Levi Velázquez 2017-04-20 14:23:18 -05:00
• c8614f4f63 Added functionality to select templates for the VMs being created M.Ravi 2017-04-18 13:34:29 +05:30
• 25c09819e7 Merge pull request #210 from levivm/develop Levi Velázquez 2017-04-17 21:42:08 -05:00
• 970e1b5368 Merge pull request #1 from levivm/feature/new_digitalglarus Levi Velázquez 2017-04-17 21:38:21 -05:00
• ef713a2ba7 Merge branch 'master' of github.com:ungleich/dynamicweb Levi 2017-04-17 21:32:15 -05:00
• 19db768619 added translations Levi 2017-04-17 21:31:29 -05:00
• c9be516e9b Remove author from blog_item Modulos 2017-04-12 12:30:29 +02:00
• ef8ae14582 Change border-color if contact field is empty Modulos 2017-04-12 11:17:03 +02:00
• b68fe31361 Added start/stop functionality for VMs. Refactored a few functions. M.Ravi 2017-04-11 00:44:55 +05:30
• c7334dfac2 Merge branch 'opennebula-integration' of https://github.com/ungleich/dynamicweb into opennebula-integration M.Ravi 2017-04-10 13:44:24 +05:30
• 167e0482a9 Added Delete VM functionality. M.Ravi 2017-04-10 13:43:13 +05:30
• 74f134cccc Add default DJANGO_SECRET_KEY Modulos 2017-04-10 09:48:09 +02:00
• 353d0497ff Add travis-ci integration Modulos 2017-04-10 09:35:22 +02:00
• d98d139136 Merge pull request #202 from HenryGBC/feature/new_digitalglarus Levi Velázquez 2017-04-08 09:44:03 -05:00
• 9056de81a8 Fix IE slides HenryGBC 2017-04-08 09:54:50 -04:30
• adccf82229 Merge pull request #201 from levivm/feature/new_digitalglarus Levi Velázquez 2017-04-07 14:22:03 -05:00
• 2737f2d2ef fixed translations Levi 2017-04-07 14:21:27 -05:00
• 243ce693d6 Merge pull request #200 from levivm/feature/new_digitalglarus Levi Velázquez 2017-04-07 14:14:47 -05:00
• 7843269c1c fixed translations Levi 2017-04-07 14:14:31 -05:00
• 50ae04cfc4 fixed translations Levi 2017-04-07 14:12:50 -05:00
• 0dad359cfe Merge pull request #199 from levivm/feature/new_digitalglarus Levi Velázquez 2017-04-07 13:53:59 -05:00
• ef972ddc22 added translations Levi 2017-04-07 13:53:11 -05:00
• d2997e24bc Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus Levi 2017-04-07 13:51:55 -05:00
• 87ab1cdc8d added alplora to allowed host Levi 2017-04-07 13:51:44 -05:00
• 24acee504c Merge pull request #198 from ungleich/bugfix/german-alplora-texts Levi Velázquez 2017-04-07 13:45:02 -05:00
• e235a1d609 Merge pull request #195 from HenryGBC/feature/new_digitalglarus Levi Velázquez 2017-04-07 13:37:02 -05:00
• e79af3b2f5 rephrase DE texts and removed empty spaces Sanghee Kim 2017-04-07 19:44:43 +02:00
• 563992b90f Select language mobile HenryGBC 2017-04-07 09:24:13 -04:30
• 0ee74474a2 Merge pull request #194 from HenryGBC/feature/new_digitalglarus verysanghee 2017-04-07 13:53:53 +02:00
• 72ab23b21a Add doctype HenryGBC 2017-04-06 21:03:48 -04:30
• 95a8bae713 Merge pull request #193 from HenryGBC/feature/new_digitalglarus Levi Velázquez 2017-04-06 13:43:56 -05:00
• 0a647ffff9 Fixed Slides support in IE11 HenryGBC 2017-04-06 14:07:26 -04:30
• 8b00f39d24 Merge pull request #192 from levivm/feature/new_digitalglarus Levi Velázquez 2017-04-06 12:50:33 -05:00
• 081ca21b55 disabled testimonials footer Levi 2017-04-06 12:49:50 -05:00
• 2a4e4e4109 Merge pull request #191 from levivm/feature/new_digitalglarus Levi Velázquez 2017-04-06 12:48:40 -05:00
• 2846d3aa3c disabled testimonials footer Levi 2017-04-06 12:48:06 -05:00
• 274f370329 Merge pull request #190 from levivm/feature/new_digitalglarus Levi Velázquez 2017-04-06 10:15:49 -05:00
• 4f31fd9e70 Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus Levi 2017-04-06 10:15:08 -05:00
• 8969b0c29b fixed translations Levi 2017-04-06 10:14:39 -05:00
• b6102be4ef Merge pull request #189 from HenryGBC/feature/new_digitalglarus Levi Velázquez 2017-04-06 09:55:38 -05:00
• 48ab6c70e1 Fixed padding nnavbar HenryGBC 2017-04-06 09:40:27 -04:30
• 5699be18bb Fix nav language & ico HenryGBC 2017-04-03 17:47:16 -04:30
• 40edb3f006 Merge pull request #188 from levivm/feature/new_digitalglarus Levi Velázquez 2017-04-01 17:46:00 -05:00
• a451c96271 changed email in alplora contact form Levi 2017-04-01 17:45:12 -05:00
• 25e3b7e888 Merge pull request #187 from HenryGBC/feature/new_digitalglarus Levi Velázquez 2017-04-01 17:44:29 -05:00
• b853ce84c5 Fix mobile sspace datacenterlight HenryGBC 2017-03-31 22:55:01 -04:30
• 80ecb963b3 Add name field i beta program HenryGBC 2017-03-30 20:21:15 -04:30
• 9c2c0e9a73 add texts in Was is alplora? HenryGBC 2017-03-30 10:06:03 -04:30
• a3dfad937e Merge pull request #186 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-30 00:04:48 -05:00
• 3482018363 removed testimonials link for alplora Levi 2017-03-30 00:03:47 -05:00
• 93358aaa63 Merge pull request #185 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-30 00:01:54 -05:00
• 61512da80f removed login temporally Levi 2017-03-29 23:59:32 -05:00
• fe7a2a849e Merge pull request #184 from HenryGBC/feature/new_digitalglarus Levi Velázquez 2017-03-29 09:23:25 -05:00
• e577743aa1 Images(alplora track) fixed HenryGBC 2017-03-27 13:41:07 -04:30
• 4b1b36e371 Merge pull request #183 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-27 13:42:54 -04:00
• 032885627e added new translations Levi 2017-03-27 13:42:21 -04:00
• a27772f432 Merge pull request #182 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-27 12:14:21 -04:00
• af0a715b51 added more translations Levi 2017-03-27 12:12:01 -04:00
• 07864e0e79 Merge pull request #181 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-24 00:06:31 -04:00
• 88c1320a29 testimonials disabled Levi 2017-03-24 00:05:38 -04:00
• 9b1c1e5127 Merge pull request #180 from HenryGBC/feature/new_digitalglarus Levi Velázquez 2017-03-24 00:00:14 -04:00
• f3e26c9cbe Resolve conflicts in views HenryGBC 2017-03-23 22:37:15 -04:30
• 2c21444037 Languages selector HenryGBC 2017-03-23 22:29:17 -04:30
• a3defa3652 Merge pull request #179 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-22 11:18:50 -04:00
• b4651cc337 added contact form in alplora Levi 2017-03-22 11:18:10 -04:00
• c6120cf951 Merge pull request #178 from HenryGBC/feature/new_digitalglarus Levi Velázquez 2017-03-22 11:07:08 -04:00
• 0e9637baa1 Fix text header position, google fonts HenryGBC 2017-03-20 16:33:14 -04:30
• 35c7914b94 Fixed Favicon, Add Doctype, and add dynamic Lang in html HenryGBC 2017-03-20 15:35:41 -04:30
• cb64dd2b11 Create README-opennebula-integration Pcoder 2017-03-17 01:02:03 +05:30
• 24cfe707cd Listing of VMs and Creation of VMs done. M.Ravi 2017-03-17 00:42:27 +05:30
• b363bf5f6a First working version of opennebula-integration. M.Ravi 2017-03-15 17:32:55 +05:30
• dd546d568c Merge pull request #177 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-09 15:59:09 -05:00
• 3422235b86 added new alplora images Levi 2017-03-09 15:57:24 -05:00
• 2d059831dd Merge pull request #176 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-08 10:08:54 -05:00
• a48a9a12c6 remove django toolbar Levi 2017-03-08 10:08:10 -05:00
• 755a08fcde Merge pull request #175 from levivm/feature/new_digitalglarus Levi Velázquez 2017-03-08 01:34:48 -05:00