Commit graph

1129 commits

Author SHA1 Message Date
tmslav
f0b089ba8d updated gallery 2016-04-10 06:23:21 +00:00
Tomislav R
1190bd9018 fixed debug option 2016-04-10 04:52:29 +02:00
Tomislav R
0fe1ba241a fixed debug option 2016-04-10 04:52:29 +02:00
tmslav
6bf2a1ec46 Merge pull request #23 from tmslav/develop
Develop
2016-04-10 04:43:19 +02:00
tmslav
a61f4f8318 Merge pull request #23 from tmslav/develop
Develop
2016-04-10 04:43:19 +02:00
Tomislav R
d9487848f0 sorting files 2016-04-10 04:41:36 +02:00
Tomislav R
e24c3d06a4 sorting files 2016-04-10 04:41:36 +02:00
Tomislav R
2125bc7059 Merge branch 'master' into develop 2016-04-10 04:39:32 +02:00
Tomislav R
7815cbeda4 Merge branch 'master' into develop 2016-04-10 04:39:32 +02:00
tmslav
c7500175e9 Update INSTALLATION.rst 2016-04-10 04:20:15 +02:00
tmslav
39dedf92d2 Update INSTALLATION.rst 2016-04-10 04:20:15 +02:00
tmslav
1ebaaef8c3 Update INSTALLATION.rst 2016-04-10 03:47:17 +02:00
tmslav
e8849a6a48 Update INSTALLATION.rst 2016-04-10 03:47:17 +02:00
Tomislav R
45af2dbc05 doc 2016-04-10 03:42:26 +02:00
Tomislav R
046122529c doc 2016-04-10 03:42:26 +02:00
tmslav
99ad6852b7 production changes 2016-04-10 01:05:33 +00:00
tmslav
afc7c68cb7 production changes 2016-04-10 01:05:33 +00:00
de2f79e8ce Merge branch 'develop' 2016-04-09 20:09:52 +02:00
7b8a12e3ce Merge branch 'develop' 2016-04-09 20:09:52 +02:00
Levi Velázquez
3961f63656 Merge pull request #22 from levivm/develop
added translation text for form contact form fields
2016-04-09 13:05:49 -05:00
Levi Velázquez
3395ff7c99 Merge pull request #22 from levivm/develop
added translation text for form contact form fields
2016-04-09 13:05:49 -05:00
Levi
a575465a80 added translation text for form contact form fields 2016-04-09 13:00:16 -05:00
Levi
34dcf31b00 added translation text for form contact form fields 2016-04-09 13:00:16 -05:00
08019b9d33 Merge branch 'develop' 2016-04-09 19:56:45 +02:00
b2334037c1 Merge branch 'develop' 2016-04-09 19:56:45 +02:00
Levi Velázquez
0e1f2f3fdf Merge pull request #21 from levivm/develop
Added supporters placeholders
2016-04-09 04:06:19 -05:00
Levi Velázquez
767bdea286 Merge pull request #21 from levivm/develop
Added supporters placeholders
2016-04-09 04:06:19 -05:00
Levi
4beb09dcd1 Added supporters placeholders 2016-04-09 04:03:28 -05:00
Levi
019f8705bb Added supporters placeholders 2016-04-09 04:03:28 -05:00
Levi Velázquez
d6fbc281cb Merge pull request #17 from levivm/develop
Develop
2016-04-09 03:12:56 -05:00
Levi Velázquez
20376f11a2 Merge pull request #17 from levivm/develop
Develop
2016-04-09 03:12:56 -05:00
Levi
c33b85626a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-09 03:00:41 -05:00
Levi
45aaec38cf Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-09 03:00:41 -05:00
tmslav
c232d3e7f7 Merge pull request #20 from tmslav/develop
updated development from master
2016-04-09 09:58:37 +02:00
tmslav
71f76bbe9a Merge pull request #20 from tmslav/develop
updated development from master
2016-04-09 09:58:37 +02:00
Tomislav R
e9c29fb7f9 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-09 09:57:56 +02:00
Tomislav R
ec12689904 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-09 09:57:56 +02:00
Levi
0e65c1e717 allowing urls translation into german using .po files 2016-04-09 02:53:05 -05:00
Levi
d90a95a3d4 allowing urls translation into german using .po files 2016-04-09 02:53:05 -05:00
tmslav
a79c78d43e Merge pull request #19 from tmslav/master
home added and assigned right template, fixed up blog for digitalglarus
2016-04-09 09:12:03 +02:00
tmslav
f7f838bc62 Merge pull request #19 from tmslav/master
home added and assigned right template, fixed up blog for digitalglarus
2016-04-09 09:12:03 +02:00
Tomislav R
10d3e236ee home added and assigned right template 2016-04-09 08:51:20 +02:00
Tomislav R
36b99b93ef home added and assigned right template 2016-04-09 08:51:20 +02:00
tmslav
29aba3d6aa Merge pull request #18 from tmslav/master
fixed language choosing for digitalglarus
2016-04-09 03:57:26 +02:00
tmslav
8c72f291e5 Merge pull request #18 from tmslav/master
fixed language choosing for digitalglarus
2016-04-09 03:57:26 +02:00
Levi
50a973c28d changed form email contact 2016-04-08 20:11:29 -05:00
Levi
bcc7d35cd8 changed form email contact 2016-04-08 20:11:29 -05:00
Levi
ebe214d95b Create contact page in German and made it editable 2016-04-08 19:45:28 -05:00
Levi
a45f019a14 Create contact page in German and made it editable 2016-04-08 19:45:28 -05:00
Tomislav R
031ce0b5f3 Merge remote-tracking branch 'upstream/master' 2016-04-09 01:02:08 +02:00