M.Ravi
|
af3818d64a
|
Removed some unwanted changes and prepared for a pull request.
|
2017-04-24 03:16:43 +05:30 |
|
M.Ravi
|
73cfccd00c
|
Merge branch 'master' into opennebula-integration
|
2017-04-24 03:11:03 +05:30 |
|
M.Ravi
|
d537fcb118
|
Manual merge of ungleich/master into opennebula-integration
|
2017-04-24 03:01:05 +05:30 |
|
M.Ravi
|
1028ab0eca
|
Merge branch 'master' of https://github.com/ungleich/dynamicweb
|
2017-04-24 02:02:01 +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 |
|
Levi Velázquez
|
f0d812970e
|
Merge pull request #211 from ungleich/develop
Develop
|
2017-04-20 14:23:18 -05:00 |
|
M.Ravi
|
c8614f4f63
|
Added functionality to select templates for the VMs being created
|
2017-04-18 13:34:29 +05:30 |
|
Levi Velázquez
|
25c09819e7
|
Merge pull request #210 from levivm/develop
Develop
|
2017-04-17 21:42:08 -05:00 |
|
Levi Velázquez
|
970e1b5368
|
Merge pull request #1 from levivm/feature/new_digitalglarus
added translations
|
2017-04-17 21:38:21 -05:00 |
|
Levi
|
ef713a2ba7
|
Merge branch 'master' of github.com:ungleich/dynamicweb
|
2017-04-17 21:32:15 -05:00 |
|
Levi
|
19db768619
|
added translations
|
2017-04-17 21:31:29 -05:00 |
|
Modulos
|
c9be516e9b
|
Remove author from blog_item
|
2017-04-12 12:30:29 +02:00 |
|
Modulos
|
ef8ae14582
|
Change border-color if contact field is empty
The conact modals where moved in seperated templates. Further to
evaluate the form without reloading the page some ajax was added.
|
2017-04-12 11:17:03 +02:00 |
|
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 |
|
Modulos
|
74f134cccc
|
Add default DJANGO_SECRET_KEY
|
2017-04-10 09:48:09 +02:00 |
|
Modulos
|
353d0497ff
|
Add travis-ci integration
|
2017-04-10 09:35:22 +02:00 |
|
Levi Velázquez
|
d98d139136
|
Merge pull request #202 from HenryGBC/feature/new_digitalglarus
Fix IE slides
|
2017-04-08 09:44:03 -05:00 |
|
HenryGBC
|
9056de81a8
|
Fix IE slides
|
2017-04-08 09:54:50 -04:30 |
|
Levi Velázquez
|
adccf82229
|
Merge pull request #201 from levivm/feature/new_digitalglarus
fixed translations
|
2017-04-07 14:22:03 -05:00 |
|
Levi
|
2737f2d2ef
|
fixed translations
|
2017-04-07 14:21:27 -05:00 |
|
Levi Velázquez
|
243ce693d6
|
Merge pull request #200 from levivm/feature/new_digitalglarus
fixed translations
|
2017-04-07 14:14:47 -05:00 |
|
Levi
|
7843269c1c
|
fixed translations
|
2017-04-07 14:14:31 -05:00 |
|
Levi
|
50ae04cfc4
|
fixed translations
|
2017-04-07 14:12:50 -05:00 |
|
Levi Velázquez
|
0dad359cfe
|
Merge pull request #199 from levivm/feature/new_digitalglarus
Feature/new digitalglarus
|
2017-04-07 13:53:59 -05:00 |
|
Levi
|
ef972ddc22
|
added translations
|
2017-04-07 13:53:11 -05:00 |
|
Levi
|
d2997e24bc
|
Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus
|
2017-04-07 13:51:55 -05:00 |
|
Levi
|
87ab1cdc8d
|
added alplora to allowed host
|
2017-04-07 13:51:44 -05:00 |
|
Levi Velázquez
|
24acee504c
|
Merge pull request #198 from ungleich/bugfix/german-alplora-texts
rephrase DE texts and removed empty spaces
|
2017-04-07 13:45:02 -05:00 |
|
Levi Velázquez
|
e235a1d609
|
Merge pull request #195 from HenryGBC/feature/new_digitalglarus
Select language mobile
|
2017-04-07 13:37:02 -05:00 |
|
|
|
e79af3b2f5
|
rephrase DE texts and removed empty spaces
|
2017-04-07 19:44:43 +02:00 |
|
HenryGBC
|
563992b90f
|
Select language mobile
|
2017-04-07 09:24:13 -04:30 |
|
verysanghee
|
0ee74474a2
|
Merge pull request #194 from HenryGBC/feature/new_digitalglarus
Add doctype
|
2017-04-07 13:53:53 +02:00 |
|
HenryGBC
|
72ab23b21a
|
Add doctype
|
2017-04-06 21:03:48 -04:30 |
|
Levi Velázquez
|
95a8bae713
|
Merge pull request #193 from HenryGBC/feature/new_digitalglarus
Fixed Slides support in IE11
|
2017-04-06 13:43:56 -05:00 |
|
HenryGBC
|
0a647ffff9
|
Fixed Slides support in IE11
|
2017-04-06 14:07:26 -04:30 |
|
Levi Velázquez
|
8b00f39d24
|
Merge pull request #192 from levivm/feature/new_digitalglarus
disabled testimonials footer
|
2017-04-06 12:50:33 -05:00 |
|
Levi
|
081ca21b55
|
disabled testimonials footer
|
2017-04-06 12:49:50 -05:00 |
|
Levi Velázquez
|
2a4e4e4109
|
Merge pull request #191 from levivm/feature/new_digitalglarus
disabled testimonials footer
|
2017-04-06 12:48:40 -05:00 |
|
Levi
|
2846d3aa3c
|
disabled testimonials footer
|
2017-04-06 12:48:06 -05:00 |
|
Levi Velázquez
|
274f370329
|
Merge pull request #190 from levivm/feature/new_digitalglarus
Feature/new digitalglarus
|
2017-04-06 10:15:49 -05:00 |
|
Levi
|
4f31fd9e70
|
Merge branch 'feature/new_digitalglarus' of github.com:ungleich/dynamicweb into feature/new_digitalglarus
|
2017-04-06 10:15:08 -05:00 |
|
Levi
|
8969b0c29b
|
fixed translations
|
2017-04-06 10:14:39 -05:00 |
|
