Commit graph

602 commits

Author SHA1 Message Date
Levi
1469f077bd Merge branch 'develop' of github.com:ungleich/dynamicweb into develop 2016-04-12 00:51:02 -05:00
Levi
b29ee74634 Added translation support for ungleich contact page, 2016-04-12 00:50:15 -05:00
Levi Velázquez
c6feaba777 Merge pull request #28 from levivm/develop
Updated contact page style and changed header bg
2016-04-10 17:09:49 -05:00
Levi
20a59f461d Updated contact page style and changed header bg 2016-04-10 17:09:16 -05:00
Levi Velázquez
f52a94db11 Merge pull request #27 from levivm/develop
Changing database name from app_new to app
2016-04-10 16:24:21 -05:00
Levi
fce44b2ec5 Changing database name from app_new to app 2016-04-10 16:23:30 -05:00
Levi Velázquez
f6cb9abc42 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
942464f6f6 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
tmslav
cf0fec706c Merge pull request #25 from tmslav/develop
update staging
2016-04-10 08:52:03 +02:00
Tomislav R
e1676a98aa Merge branch 'master' into develop 2016-04-10 08:43:03 +02:00
Tomislav R
b661b5e7e6 Merge remote-tracking branch 'upstream/master' 2016-04-10 08:42:33 +02:00
tmslav
aa592156fd updated gallery 2016-04-10 06:23:21 +00:00
Tomislav R
1190bd9018 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
Tomislav R
d9487848f0 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
tmslav
c7500175e9 Update INSTALLATION.rst 2016-04-10 04:20:15 +02:00
tmslav
1ebaaef8c3 Update INSTALLATION.rst 2016-04-10 03:47:17 +02:00
Tomislav R
45af2dbc05 doc 2016-04-10 03:42:26 +02:00
tmslav
99ad6852b7 production changes 2016-04-10 01:05:33 +00:00
de2f79e8ce 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
a575465a80 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
Levi Velázquez
0e1f2f3fdf 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 Velázquez
d6fbc281cb 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
tmslav
c232d3e7f7 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
Levi
0e65c1e717 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
Tomislav R
10d3e236ee 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
Levi
50a973c28d 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
Tomislav R
031ce0b5f3 Merge remote-tracking branch 'upstream/master' 2016-04-09 01:02:08 +02:00
Tomislav R
1cc0358cb0 added language selection 2016-04-09 01:01:08 +02:00
Levi
a680de0567 cleaning code 2016-04-07 00:30:18 -05:00
Levi
bb8c5314bc Adapt copyright copy to use current year, Add bank account info, Set the correct text on supporters page, HTML Form adapted to Django template, Create forms.py to have all forms, Create Contact Django Form View, Create a HTML template to contact email, Send contact email to info@digitalglarus.ch 2016-04-07 00:26:50 -05:00
Levi
d7cb1fbbc6 cleaning code 2016-04-03 21:47:21 -05:00
Levi
93e1641203 remove templates 2016-04-03 21:46:17 -05:00
Levi
b2b788d779 template moved 2016-04-03 21:28:04 -05:00
Levi
979a0bb24d Merge branch 'develop' into feature/supporter 2016-04-03 21:15:05 -05:00
Levi
ceeed874d2 fixed supporter page, change footer info, added support-us page, changed contact email 2016-04-03 20:39:57 -05:00
1a5b1ec6e1 Merge branch 'master' into develop 2016-04-04 03:33:25 +02:00
3f1f43752f Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop 2016-04-04 03:32:50 +02:00
a2a3e6156c blog dg fix 2016-04-04 03:32:22 +02:00
tmslav
725a1d1e3d Merge pull request #16 from tmslav/master
updated ungleich
2016-04-03 11:47:04 +02:00
Tomislav R
949ee20a8a updated ungleich 2016-04-03 11:46:25 +02:00