Commit graph

675 commits

Author SHA1 Message Date
Levi Velázquez
2f4e668371 Merge pull request #33 from levivm/develop
Develop
2016-04-15 20:21:39 -05:00
Levi
b0be58ac1d Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-15 20:18:54 -05:00
Levi
d2238106e8 Handled success message from contact form in ungleich, Contact section in ungleich now supports translation, About section in ungleich now supports translation, Footer section in ungleich now supports translation, Portfolio section in ungleich now supports translation, Services section in ungleich now supports translation, Software section in ungleich now supports translation, Fixed digitalglarus about page 2016-04-15 20:18:29 -05:00
Levi Velázquez
673fb73209 Merge pull request #32 from levivm/develop
Fixed admin urls
2016-04-13 01:27:54 -05:00
Levi
488bb76c76 Fixed admin urls 2016-04-13 01:27:11 -05:00
Levi Velázquez
e8720422fd Merge pull request #31 from levivm/develop
Integrating Ungleich page into dynamicweb
2016-04-13 01:11:30 -05:00
Levi
830018f41c Removing files 2016-04-13 01:02:48 -05:00
Levi
363dc15afe Adding .psd to gitignore 2016-04-13 00:50:11 -05:00
Levi
74a4002654 Cleaning files 2016-04-13 00:46:09 -05:00
Levi
a768ce35a2 Cleaning psd files 2016-04-13 00:38:26 -05:00
Levi
c09fc89197 Divided ungleich landing sections into templates. Moved static files and all files path were adapted, Ungleich form conected to landing, Reconfigured django urls 2016-04-13 00:31:19 -05:00
Levi
202c3f5b46 Moved ungleich landing into django 2016-04-12 22:03:18 -05:00
Levi Velázquez
6f8bb26c95 Merge pull request #29 from levivm/develop
Develop
2016-04-12 00:54:02 -05:00
Levi
ce6d98c931 Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-12 00:51:02 -05:00
Levi
c5e5640e8d Added translation support for ungleich contact page, 2016-04-12 00:50:15 -05:00
Levi Velázquez
96682e30ed Merge pull request #28 from levivm/develop
Updated contact page style and changed header bg
2016-04-10 17:09:49 -05:00
Levi
2f9fa9f8fb Updated contact page style and changed header bg 2016-04-10 17:09:16 -05:00
Levi Velázquez
2df6899599 Merge pull request #27 from levivm/develop
Changing database name from app_new to app
2016-04-10 16:24:21 -05:00
Levi
1ac1e2c4e1 Changing database name from app_new to app 2016-04-10 16:23:30 -05:00
Levi Velázquez
534d086836 Merge pull request #26 from levivm/develop
Moved contact form model in order to be reusable by ungleich app, Cre…
2016-04-10 16:13:56 -05:00
Levi
7dd4f7e70a Moved contact form model in order to be reusable by ungleich app, Created unit test for digitalglarus contact page, Created ungleich contact page, Created unit test for ungleich contact page, Created unit test for forms . 2016-04-10 16:12:43 -05:00
Tomislav R
cd710b9a36 Merge remote-tracking branch 'upstream/design_membership' into updating_calendar 2016-04-10 21:30:11 +02:00
tmslav
3c0b414b10 Merge pull request #25 from tmslav/develop
update staging
2016-04-10 08:52:03 +02:00
tmslav
923e9930b0 Merge pull request #24 from tmslav/master
updating staging
2016-04-10 08:50:55 +02:00
Tomislav R
61a9213279 Merge branch 'master' into develop 2016-04-10 08:43:03 +02:00
Tomislav R
e73d50be19 Merge remote-tracking branch 'upstream/master' 2016-04-10 08:42:33 +02:00
tmslav
f0b089ba8d updated gallery 2016-04-10 06:23:21 +00:00
Tomislav R
0fe1ba241a fixed debug option 2016-04-10 04:52:29 +02:00
tmslav
a61f4f8318 Merge pull request #23 from tmslav/develop
Develop
2016-04-10 04:43:19 +02:00
Tomislav R
e24c3d06a4 sorting files 2016-04-10 04:41:36 +02:00
Tomislav R
7815cbeda4 Merge branch 'master' into develop 2016-04-10 04:39:32 +02:00
tmslav
39dedf92d2 Update INSTALLATION.rst 2016-04-10 04:20:15 +02:00
tmslav
e8849a6a48 Update INSTALLATION.rst 2016-04-10 03:47:17 +02:00
Tomislav R
046122529c doc 2016-04-10 03:42:26 +02:00
tmslav
afc7c68cb7 production changes 2016-04-10 01:05:33 +00:00
7b8a12e3ce Merge branch 'develop' 2016-04-09 20:09:52 +02: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
34dcf31b00 added translation text for form contact form fields 2016-04-09 13:00:16 -05:00
b2334037c1 Merge branch 'develop' 2016-04-09 19:56:45 +02:00
Levi Velázquez
767bdea286 Merge pull request #21 from levivm/develop
Added supporters placeholders
2016-04-09 04:06:19 -05:00
Levi
019f8705bb Added supporters placeholders 2016-04-09 04:03:28 -05:00
Levi Velázquez
20376f11a2 Merge pull request #17 from levivm/develop
Develop
2016-04-09 03:12:56 -05:00
Levi
45aaec38cf Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-09 03:00:41 -05:00
tmslav
71f76bbe9a Merge pull request #20 from tmslav/develop
updated development from master
2016-04-09 09:58:37 +02:00
Tomislav R
ec12689904 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-09 09:57:56 +02:00
Levi
d90a95a3d4 allowing urls translation into german using .po files 2016-04-09 02:53:05 -05: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
36b99b93ef home added and assigned right template 2016-04-09 08:51:20 +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
bcc7d35cd8 changed form email contact 2016-04-08 20:11:29 -05:00