Commit graph

1065 commits

Author SHA1 Message Date
4ad7d30d04 Merge remote-tracking branch 'refs/remotes/origin/master' 2017-05-25 21:25:28 +02:00
Levi Velázquez
6d6093975c Merge pull request #219 from ungleich/develop
Develop
2017-05-04 10:45:55 -05:00
Levi Velázquez
4a4ca3ff15 Merge pull request #206 from Modulos/feature/3040
Change border-color if contact field is empty
2017-05-03 00:13:05 -05:00
Levi Velázquez
f525606100 Merge pull request #216 from Modulos/feature/no_author
Remove author from blog posts
2017-05-02 23:55:49 -05:00
bcc93d28b0 Merge remote-tracking branch 'origin/master' 2017-05-01 00:09:05 +02:00
Modulos
32f52c1791 Remove author from blog posts 2017-04-27 03:25:14 +02:00
Levi Velázquez
a0a2a4aecb Merge pull request #208 from Modulos/feature/3057
Remove author from blog_item
2017-04-26 11:24:21 -05:00
Levi Velázquez
0a5a9630cf Merge pull request #215 from ungleich/develop
Develop
2017-04-26 11:15:03 -05:00
Levi Velázquez
3537d4bf6f Merge pull request #204 from Modulos/feature/travis-ci
Feature/travis ci
2017-04-25 22:17:40 -05:00
Levi Velázquez
d7674877a8 Merge pull request #213 from levivm/develop
fixed translations
2017-04-24 23:46:16 -05:00
Levi
1f85dfc5b3 fixed translations 2017-04-24 23:44:34 -05:00
Levi Velázquez
f0d812970e Merge pull request #211 from ungleich/develop
Develop
2017-04-20 14:23:18 -05:00
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
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
Levi Velázquez
b6102be4ef Merge pull request #189 from HenryGBC/feature/new_digitalglarus
Fix nav language & ico
2017-04-06 09:55:38 -05:00
HenryGBC
48ab6c70e1 Fixed padding nnavbar 2017-04-06 09:40:27 -04:30
HenryGBC
5699be18bb Fix nav language & ico 2017-04-03 17:47:16 -04:30
Levi Velázquez
40edb3f006 Merge pull request #188 from levivm/feature/new_digitalglarus
changed email in alplora contact form
2017-04-01 17:46:00 -05:00