Commit graph

  • b29ee74634 Added translation support for ungleich contact page, Levi 2016-04-12 00:50:15 -05:00
  • c5e5640e8d Added translation support for ungleich contact page, Levi 2016-04-12 00:50:15 -05:00
  • c6feaba777 Merge pull request #28 from levivm/develop Levi Velázquez 2016-04-10 17:09:49 -05:00
  • 96682e30ed Merge pull request #28 from levivm/develop Levi Velázquez 2016-04-10 17:09:49 -05:00
  • 20a59f461d Updated contact page style and changed header bg Levi 2016-04-10 17:09:16 -05:00
  • 2f9fa9f8fb Updated contact page style and changed header bg Levi 2016-04-10 17:09:16 -05:00
  • f52a94db11 Merge pull request #27 from levivm/develop Levi Velázquez 2016-04-10 16:24:21 -05:00
  • 2df6899599 Merge pull request #27 from levivm/develop Levi Velázquez 2016-04-10 16:24:21 -05:00
  • fce44b2ec5 Changing database name from app_new to app Levi 2016-04-10 16:23:30 -05:00
  • 1ac1e2c4e1 Changing database name from app_new to app Levi 2016-04-10 16:23:30 -05:00
  • f6cb9abc42 Merge pull request #26 from levivm/develop Levi Velázquez 2016-04-10 16:13:56 -05:00
  • 534d086836 Merge pull request #26 from levivm/develop Levi Velázquez 2016-04-10 16:13:56 -05:00
  • 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 . Levi 2016-04-10 16:12:43 -05:00
  • 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 . Levi 2016-04-10 16:12:43 -05:00
  • db78247771 Merge remote-tracking branch 'upstream/design_membership' into updating_calendar Tomislav R 2016-04-10 21:30:11 +02:00
  • cd710b9a36 Merge remote-tracking branch 'upstream/design_membership' into updating_calendar Tomislav R 2016-04-10 21:30:11 +02:00
  • cf0fec706c Merge pull request #25 from tmslav/develop tmslav 2016-04-10 08:52:03 +02:00
  • 3c0b414b10 Merge pull request #25 from tmslav/develop tmslav 2016-04-10 08:52:03 +02:00
  • d3122cc3fa Merge pull request #24 from tmslav/master tmslav 2016-04-10 08:50:55 +02:00
  • 923e9930b0 Merge pull request #24 from tmslav/master tmslav 2016-04-10 08:50:55 +02:00
  • e1676a98aa Merge branch 'master' into develop Tomislav R 2016-04-10 08:43:03 +02:00
  • 61a9213279 Merge branch 'master' into develop Tomislav R 2016-04-10 08:43:03 +02:00
  • b661b5e7e6 Merge remote-tracking branch 'upstream/master' Tomislav R 2016-04-10 08:42:33 +02:00
  • e73d50be19 Merge remote-tracking branch 'upstream/master' Tomislav R 2016-04-10 08:42:33 +02:00
  • aa592156fd updated gallery tmslav 2016-04-10 06:23:21 +00:00
  • f0b089ba8d updated gallery tmslav 2016-04-10 06:23:21 +00:00
  • 1190bd9018 fixed debug option Tomislav R 2016-04-10 04:52:29 +02:00
  • 0fe1ba241a fixed debug option Tomislav R 2016-04-10 04:52:29 +02:00
  • 6bf2a1ec46 Merge pull request #23 from tmslav/develop tmslav 2016-04-10 04:43:19 +02:00
  • a61f4f8318 Merge pull request #23 from tmslav/develop tmslav 2016-04-10 04:43:19 +02:00
  • d9487848f0 sorting files Tomislav R 2016-04-10 04:41:36 +02:00
  • e24c3d06a4 sorting files Tomislav R 2016-04-10 04:41:36 +02:00
  • 2125bc7059 Merge branch 'master' into develop Tomislav R 2016-04-10 04:39:32 +02:00
  • 7815cbeda4 Merge branch 'master' into develop Tomislav R 2016-04-10 04:39:32 +02:00
  • c7500175e9 Update INSTALLATION.rst tmslav 2016-04-10 04:20:15 +02:00
  • 39dedf92d2 Update INSTALLATION.rst tmslav 2016-04-10 04:20:15 +02:00
  • 1ebaaef8c3 Update INSTALLATION.rst tmslav 2016-04-10 03:47:17 +02:00
  • e8849a6a48 Update INSTALLATION.rst tmslav 2016-04-10 03:47:17 +02:00
  • 45af2dbc05 doc Tomislav R 2016-04-10 03:42:26 +02:00
  • 046122529c doc Tomislav R 2016-04-10 03:42:26 +02:00
  • 99ad6852b7 production changes tmslav 2016-04-10 01:05:33 +00:00
  • afc7c68cb7 production changes tmslav 2016-04-10 01:05:33 +00:00
  • de2f79e8ce Merge branch 'develop' Raul Ascencio 2016-04-09 20:09:52 +02:00
  • 7b8a12e3ce Merge branch 'develop' Raul Ascencio 2016-04-09 20:09:52 +02:00
  • 3961f63656 Merge pull request #22 from levivm/develop Levi Velázquez 2016-04-09 13:05:49 -05:00
  • 3395ff7c99 Merge pull request #22 from levivm/develop Levi Velázquez 2016-04-09 13:05:49 -05:00
  • a575465a80 added translation text for form contact form fields Levi 2016-04-09 13:00:16 -05:00
  • 34dcf31b00 added translation text for form contact form fields Levi 2016-04-09 13:00:16 -05:00
  • 08019b9d33 Merge branch 'develop' Raul Ascencio 2016-04-09 19:56:45 +02:00
  • b2334037c1 Merge branch 'develop' Raul Ascencio 2016-04-09 19:56:45 +02:00
  • 0e1f2f3fdf Merge pull request #21 from levivm/develop Levi Velázquez 2016-04-09 04:06:19 -05:00
  • 767bdea286 Merge pull request #21 from levivm/develop Levi Velázquez 2016-04-09 04:06:19 -05:00
  • 4beb09dcd1 Added supporters placeholders Levi 2016-04-09 04:03:28 -05:00
  • 019f8705bb Added supporters placeholders Levi 2016-04-09 04:03:28 -05:00
  • d6fbc281cb Merge pull request #17 from levivm/develop Levi Velázquez 2016-04-09 03:12:56 -05:00
  • 20376f11a2 Merge pull request #17 from levivm/develop Levi Velázquez 2016-04-09 03:12:56 -05:00
  • c33b85626a Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-09 03:00:41 -05:00
  • 45aaec38cf Merge branch 'develop' of github.com:ungleich/dynamicweb into develop Levi 2016-04-09 03:00:41 -05:00
  • c232d3e7f7 Merge pull request #20 from tmslav/develop tmslav 2016-04-09 09:58:37 +02:00
  • 71f76bbe9a Merge pull request #20 from tmslav/develop tmslav 2016-04-09 09:58:37 +02:00
  • e9c29fb7f9 Merge remote-tracking branch 'upstream/develop' into develop Tomislav R 2016-04-09 09:57:56 +02:00
  • ec12689904 Merge remote-tracking branch 'upstream/develop' into develop Tomislav R 2016-04-09 09:57:56 +02:00
  • 0e65c1e717 allowing urls translation into german using .po files Levi 2016-04-09 02:53:05 -05:00
  • d90a95a3d4 allowing urls translation into german using .po files Levi 2016-04-09 02:53:05 -05:00
  • a79c78d43e Merge pull request #19 from tmslav/master tmslav 2016-04-09 09:12:03 +02:00
  • f7f838bc62 Merge pull request #19 from tmslav/master tmslav 2016-04-09 09:12:03 +02:00
  • 10d3e236ee home added and assigned right template Tomislav R 2016-04-09 08:51:20 +02:00
  • 36b99b93ef home added and assigned right template Tomislav R 2016-04-09 08:51:20 +02:00
  • 29aba3d6aa Merge pull request #18 from tmslav/master tmslav 2016-04-09 03:57:26 +02:00
  • 8c72f291e5 Merge pull request #18 from tmslav/master tmslav 2016-04-09 03:57:26 +02:00
  • 50a973c28d changed form email contact Levi 2016-04-08 20:11:22 -05:00
  • bcc7d35cd8 changed form email contact Levi 2016-04-08 20:11:22 -05:00
  • ebe214d95b Create contact page in German and made it editable Levi 2016-04-08 19:45:28 -05:00
  • a45f019a14 Create contact page in German and made it editable Levi 2016-04-08 19:45:28 -05:00
  • 031ce0b5f3 Merge remote-tracking branch 'upstream/master' Tomislav R 2016-04-09 01:02:08 +02:00
  • b411479283 Merge remote-tracking branch 'upstream/master' Tomislav R 2016-04-09 01:02:08 +02:00
  • 1cc0358cb0 added language selection Tomislav R 2016-04-09 01:01:08 +02:00
  • c41bbc1786 added language selection Tomislav R 2016-04-09 01:01:08 +02:00
  • a680de0567 cleaning code Levi 2016-04-07 00:30:18 -05:00
  • 9f68d2ad11 cleaning code Levi 2016-04-07 00:30:18 -05:00
  • 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 Levi 2016-04-07 00:26:50 -05:00
  • f667aae38e 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 Levi 2016-04-07 00:26:50 -05:00
  • d7cb1fbbc6 cleaning code Levi 2016-04-03 21:47:21 -05:00
  • 76f703b9d7 cleaning code Levi 2016-04-03 21:47:21 -05:00
  • 93e1641203 remove templates Levi 2016-04-03 21:46:17 -05:00
  • f586dd07c3 remove templates Levi 2016-04-03 21:46:17 -05:00
  • b2b788d779 template moved Levi 2016-04-03 21:28:04 -05:00
  • 10fac88181 template moved Levi 2016-04-03 21:28:04 -05:00
  • 979a0bb24d Merge branch 'develop' into feature/supporter Levi 2016-04-03 21:15:05 -05:00
  • 0e380f6911 Merge branch 'develop' into feature/supporter Levi 2016-04-03 21:15:05 -05:00
  • ceeed874d2 fixed supporter page, change footer info, added support-us page, changed contact email Levi 2016-04-03 20:39:57 -05:00
  • 8de47013ad fixed supporter page, change footer info, added support-us page, changed contact email Levi 2016-04-03 20:39:57 -05:00
  • 1a5b1ec6e1 Merge branch 'master' into develop Raul Ascencio 2016-04-04 03:33:25 +02:00
  • 0ccf491441 Merge branch 'master' into develop Raul Ascencio 2016-04-04 03:33:25 +02:00
  • 3f1f43752f Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop Raul Ascencio 2016-04-04 03:32:50 +02:00
  • 67002a0a03 Merge branch 'develop' of https://github.com/ungleich/dynamicweb into develop Raul Ascencio 2016-04-04 03:32:50 +02:00
  • a2a3e6156c blog dg fix Raul Ascencio 2016-04-04 03:32:22 +02:00
  • 858b3ccafa blog dg fix Raul Ascencio 2016-04-04 03:32:22 +02:00
  • 725a1d1e3d Merge pull request #16 from tmslav/master tmslav 2016-04-03 11:47:04 +02:00
  • 939a6bf35f Merge pull request #16 from tmslav/master tmslav 2016-04-03 11:47:04 +02:00