Commit graph

629 commits

Author SHA1 Message Date
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
tmslav
a4de615301 Merge pull request #15 from tmslav/master
updated main pages links
2016-04-01 12:38:25 +02:00
Tomislav R
1d18894b60 updated main pages links 2016-04-01 12:37:01 +02:00
tmslav
7b0f0db338 Merge pull request #14 from ungleich/master
dynamicweb
2016-03-31 20:31:46 +02:00
tmslav
eb9df736bb Merge pull request #13 from tmslav/master
removed db
2016-03-31 18:16:50 +02:00
Tomislav R
40cdf8a11f removed 2016-03-31 18:15:37 +02:00
tmslav
2d2f7ca6f4 Merge pull request #11 from tmslav/master
added media
2016-03-26 17:33:09 +01:00
Tomislav R
e13947df8d added media 2016-03-25 19:39:50 +01:00
tmslav
e78fe3ca01 Merge pull request #10 from tmslav/master
added db
2016-03-25 19:36:38 +01:00
Tomislav R
c77f80dc45 added db 2016-03-25 19:35:52 +01:00
tmslav
fb539cbe92 Merge pull request #9 from tmslav/master
merge blog fix
2016-03-25 19:22:04 +01:00
Tomislav R
26de99e773 fixed orphaned plugins and add post functionality 2016-03-25 19:18:07 +01:00
Tomislav R
f5ece43b25 added missing blog templates 2016-03-23 14:25:15 +01:00
Tomislav R
28df2526a8 update django settings for local and production 2016-03-22 22:09:22 +01:00
Tomislav R
1f2c94a053 removed duplicated djangocms 2016-03-22 21:09:59 +01:00
Your Name
1ce3f4bbac resolve merge conflict 2016-03-22 15:16:21 +00:00
Your Name
767d24adb7 resolve merge conflict 2016-03-22 15:12:47 +00:00
tmslav
d56bbd5eab Merge pull request #8 from tmslav/blog_fix
Blog update
2016-03-22 01:23:02 +01:00
Tomislav R
6b78bac53b Blog update 2016-03-22 01:21:50 +01:00
0d04a18a0d server push 2016-03-19 21:28:58 +01:00
0f3ebfdbba settings difference push 2016-03-16 15:23:15 +01:00
tmslav
3d23db0c73 Merge pull request #7 from tmslav/membership_payment
Membership payment
2016-03-16 15:16:11 +01:00
Tomislav R
6319515bb4 fixed new user registration 2016-03-16 15:10:48 +01:00
Tomislav R
ff9a6e1b2b fixed requirements 2016-03-16 00:26:49 +01:00