Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructuring of website #133

Merged
merged 105 commits into from
Sep 28, 2020
Merged

Restructuring of website #133

merged 105 commits into from
Sep 28, 2020

Conversation

pr130
Copy link
Collaborator

@pr130 pr130 commented Aug 3, 2020

  • new menu structure
  • new pages for volunteers and nonprofits
  • several desgin improvements
  • code of conduct, mission and license contract
  • individual project views

commit 480a1dc
Author: Frie <[email protected]>
Date:   Thu Sep 24 14:44:38 2020 +0200

    Update README.md

commit 12e2e8a
Merge: ac38fad f6fef82
Author: Frie <[email protected]>
Date:   Thu Sep 17 11:00:45 2020 +0200

    Merge pull request #148 from CorrelAid:oodm4

    add oodm4

commit f6fef82
Author: Frie <[email protected]>
Date:   Thu Sep 17 10:58:08 2020 +0200

    add oodm4

commit ac38fad
Author: Frie <[email protected]>
Date:   Thu Sep 10 09:59:59 2020 +0200

    blogpost-iomids (#141)

commit be3050f
Author: Frie <[email protected]>
Date:   Thu Sep 3 15:13:03 2020 +0200

    Cookie consent banner second round (#140)

    * test onetrust and osano open source

    * use cookiehub com

commit f8928e1
Author: Frie <[email protected]>
Date:   Tue Sep 1 17:51:55 2020 +0200

    Onlinedd public (#138)

    * Merge branch 'origin/main'

    * draft = false

    * blurred picture

commit 9fe13c7
Author: Frie <[email protected]>
Date:   Mon Aug 31 18:38:52 2020 +0200

    fix date

commit 1c52a05
Author: Frie <[email protected]>
Date:   Mon Aug 31 15:42:31 2020 +0200

    Merge branch 'onlinedd-public'

commit 7a68c3c
Author: Jan <[email protected]>
Date:   Thu Aug 27 15:36:38 2020 +0200

    update content responsible person

commit 99aecce
Author: Isabel Willmann <[email protected]>
Date:   Mon Aug 17 17:11:54 2020 +0200

    update correlaidx hamburg

commit 438131e
Author: Isabel Willmann <[email protected]>
Date:   Mon Aug 17 16:55:48 2020 +0200

    update OODM3 event

commit 7536a8c
Author: Isabel Willmann <[email protected]>
Date:   Mon Aug 17 16:42:32 2020 +0200

    add oodm-3 event

commit b25ebca
Author: IsabelWi <[email protected]>
Date:   Mon Aug 17 16:29:35 2020 +0200

    Add files via upload

commit f08b933
Author: IsabelWi <[email protected]>
Date:   Mon Aug 17 16:28:53 2020 +0200

    Create hamburg.md

commit 473aa0f
Author: IsabelWi <[email protected]>
Date:   Mon Aug 17 16:28:20 2020 +0200

    Create hamburg.md

commit 1568de7
Author: Frie <[email protected]>
Date:   Fri Aug 14 15:20:30 2020 +0200

    baseURL back to apex

commit 96ca538
Merge: 2757a1a 0e4c9af
Author: Frie <[email protected]>
Date:   Thu Aug 13 12:02:18 2020 +0200

    Merge branch 'main' of github.com:CorrelAid/hugo-website into main

commit 0e4c9af
Author: Frie <[email protected]>
Date:   Thu Aug 13 11:56:01 2020 +0200

    Add blog post about online data dialogue (#137)

    * ignore venv

    * blog post online data dialogue

    * add "external blog post"

    * "external" post as draft

commit 2757a1a
Author: Frie <[email protected]>
Date:   Wed Aug 12 10:31:46 2020 +0200

    ignore venv

commit bd3e92d
Author: Frie <[email protected]>
Date:   Wed Aug 5 13:28:15 2020 +0200

    add vscode file to gitignore

commit 48793c3
Author: Frie <[email protected]>
Date:   Wed Aug 5 13:25:05 2020 +0200

commit 7c29b1d
Author: Frie <[email protected]>
Date:   Wed Aug 5 13:20:24 2020 +0200

commit cb34303
Author: Frie <[email protected]>
Date:   Mon Aug 3 13:26:19 2020 +0200

commit c7a4a7b
Author: Frie <[email protected]>
Date:   Mon Aug 3 13:14:32 2020 +0200

    Update README.md

commit 292306e
Author: Frie <[email protected]>
Date:   Mon Aug 3 13:14:04 2020 +0200

    Update münchen.md

commit 1c7e5c3
Author: Frie <[email protected]>
Date:   Mon Aug 3 11:42:39 2020 +0200

    * #114 fix hugo version

    * fix environment variable

    * fix netlify.toml

commit 99fbfd4
Author: Frie <[email protected]>
Date:   Fri Jul 31 14:00:09 2020 +0200

    * disable services except twitter, simple, nojs view

    * #109 use cookiebot

    * Squashed commit of the following:

    commit 9bcea3e
    Author: Frie <[email protected]>
    Date:   Thu Jul 30 11:12:49 2020 +0200

        fix #130 : fix sorting of events.

    commit 37149cb
    Author: Frie <[email protected]>
    Date:   Thu Jul 30 10:47:45 2020 +0200

        no fucking draft

    commit 7bce1a7
    Author: Frie <[email protected]>
    Date:   Thu Jul 30 10:42:06 2020 +0200

        add pictures of Nina & Isabel

    commit 3ef829a
    Author: Frie <[email protected]>
    Date:   Thu Jul 30 10:40:15 2020 +0200

        add more events, remove "Das Event" from template

    commit 1323901
    Author: Frie <[email protected]>
    Date:   Wed Jul 29 15:25:23 2020 +0200

        regina -> isabel

    commit d630dc0
    Author: Frie <[email protected]>
    Date:   Tue Jul 28 17:04:01 2020 +0200

        link to Mailchimp signup form for nonprofits #129

    * #109 add cookie declaration, remove navbar close

    * #109 show widget dep on cookie status 🎉

    * add hugo version

commit 9bcea3e
Author: Frie <[email protected]>
Date:   Thu Jul 30 11:12:49 2020 +0200

    fix #130 : fix sorting of events.

commit 37149cb
Author: Frie <[email protected]>
Date:   Thu Jul 30 10:47:45 2020 +0200

    no fucking draft

commit 7bce1a7
Author: Frie <[email protected]>
Date:   Thu Jul 30 10:42:06 2020 +0200

    add pictures of Nina & Isabel

commit 3ef829a
Author: Frie <[email protected]>
Date:   Thu Jul 30 10:40:15 2020 +0200

    add more events, remove "Das Event" from template

commit 1323901
Author: Frie <[email protected]>
Date:   Wed Jul 29 15:25:23 2020 +0200

    regina -> isabel

commit d630dc0
Author: Frie <[email protected]>
Date:   Tue Jul 28 17:04:01 2020 +0200

    link to Mailchimp signup form for nonprofits #129

commit e87d36b
Author: Frie <[email protected]>
Date:   Wed Jul 22 17:50:32 2020 +0200

    update english contacts

commit dbaeb63
Author: Frie <[email protected]>
Date:   Wed Jul 22 17:49:05 2020 +0200

    update german contacts

commit 051c1d9
Author: Frie <[email protected]>
Date:   Wed Jul 22 17:47:58 2020 +0200

    remove tweet that is not available anymore

commit a3b9225
Merge: b67e1b4 aabb653
Author: Frie <[email protected]>
Date:   Wed Jul 22 12:01:24 2020 +0200

    Merge branch 'master' of github.com:CorrelAid/hugo-website

commit aabb653
Author: IsabelWi <[email protected]>
Date:   Mon Jul 20 15:36:27 2020 +0200

    Add files via upload

commit 5a0daa0
Author: IsabelWi <[email protected]>
Date:   Mon Jul 20 15:34:37 2020 +0200

    Create stuttgart.md

commit 7165a28
Author: IsabelWi <[email protected]>
Date:   Mon Jul 20 15:33:48 2020 +0200

    Create stuttgart.md

commit b67e1b4
Author: Frie <[email protected]>
Date:   Tue Jul 14 14:33:10 2020 +0200

    fix showing egnlish events page

commit ded4c6d
Author: Frie <[email protected]>
Date:   Tue Jul 14 14:14:50 2020 +0200

    add second OODM

commit abaac7e
Author: Frie <[email protected]>
Date:   Tue Jul 14 10:58:46 2020 +0200

    fix footer year

commit 4fc3665
Author: Andrew Sutjahjo <[email protected]>
Date:   Wed Jul 8 14:47:02 2020 +0200

    Add links to NL website and mailto's (#123)
commit b2f897c
Author: AlexandraKapp <[email protected]>
Date:   Mon Sep 28 13:32:02 2020 +0200

    Update berlin (#150)

    * update Berlin info and add Liam

    * typo

    * typo2

    * Update berlin.md

    Co-authored-by: Frie <[email protected]>

commit 480a1dc
Author: Frie <[email protected]>
Date:   Thu Sep 24 14:44:38 2020 +0200

    Update README.md

commit 12e2e8a
Merge: ac38fad f6fef82
Author: Frie <[email protected]>
Date:   Thu Sep 17 11:00:45 2020 +0200

    Merge pull request #148 from CorrelAid:oodm4

    add oodm4

commit f6fef82
Author: Frie <[email protected]>
Date:   Thu Sep 17 10:58:08 2020 +0200

    add oodm4

commit ac38fad
Author: Frie <[email protected]>
Date:   Thu Sep 10 09:59:59 2020 +0200

    blogpost-iomids (#141)

commit be3050f
Author: Frie <[email protected]>
Date:   Thu Sep 3 15:13:03 2020 +0200

    Cookie consent banner second round (#140)

    * test onetrust and osano open source

    * use cookiehub com

commit f8928e1
Author: Frie <[email protected]>
Date:   Tue Sep 1 17:51:55 2020 +0200

    Onlinedd public (#138)

    * Merge branch 'origin/main'

    * draft = false

    * blurred picture

commit 9fe13c7
Author: Frie <[email protected]>
Date:   Mon Aug 31 18:38:52 2020 +0200

    fix date

commit 1c52a05
Author: Frie <[email protected]>
Date:   Mon Aug 31 15:42:31 2020 +0200

    Merge branch 'onlinedd-public'

commit 7a68c3c
Author: Jan <[email protected]>
Date:   Thu Aug 27 15:36:38 2020 +0200

    update content responsible person

commit 99aecce
Author: Isabel Willmann <[email protected]>
Date:   Mon Aug 17 17:11:54 2020 +0200

    update correlaidx hamburg

commit 438131e
Author: Isabel Willmann <[email protected]>
Date:   Mon Aug 17 16:55:48 2020 +0200

    update OODM3 event

commit 7536a8c
Author: Isabel Willmann <[email protected]>
Date:   Mon Aug 17 16:42:32 2020 +0200

    add oodm-3 event

commit b25ebca
Author: IsabelWi <[email protected]>
Date:   Mon Aug 17 16:29:35 2020 +0200

    Add files via upload

commit f08b933
Author: IsabelWi <[email protected]>
Date:   Mon Aug 17 16:28:53 2020 +0200

    Create hamburg.md

commit 473aa0f
Author: IsabelWi <[email protected]>
Date:   Mon Aug 17 16:28:20 2020 +0200

    Create hamburg.md

commit 1568de7
Author: Frie <[email protected]>
Date:   Fri Aug 14 15:20:30 2020 +0200

    baseURL back to apex

commit 96ca538
Merge: 2757a1a 0e4c9af
Author: Frie <[email protected]>
Date:   Thu Aug 13 12:02:18 2020 +0200

    Merge branch 'main' of github.com:CorrelAid/hugo-website into main

commit 0e4c9af
Author: Frie <[email protected]>
Date:   Thu Aug 13 11:56:01 2020 +0200

    Add blog post about online data dialogue (#137)

    * ignore venv

    * blog post online data dialogue

    * add "external blog post"

    * "external" post as draft

commit 2757a1a
Author: Frie <[email protected]>
Date:   Wed Aug 12 10:31:46 2020 +0200

    ignore venv

commit bd3e92d
Author: Frie <[email protected]>
Date:   Wed Aug 5 13:28:15 2020 +0200

    add vscode file to gitignore

commit 48793c3
Author: Frie <[email protected]>
Date:   Wed Aug 5 13:25:05 2020 +0200

commit 7c29b1d
Author: Frie <[email protected]>
Date:   Wed Aug 5 13:20:24 2020 +0200

commit cb34303
Author: Frie <[email protected]>
Date:   Mon Aug 3 13:26:19 2020 +0200

commit c7a4a7b
Author: Frie <[email protected]>
Date:   Mon Aug 3 13:14:32 2020 +0200

    Update README.md

commit 292306e
Author: Frie <[email protected]>
Date:   Mon Aug 3 13:14:04 2020 +0200

    Update münchen.md

commit 1c7e5c3
Author: Frie <[email protected]>
Date:   Mon Aug 3 11:42:39 2020 +0200

    * #114 fix hugo version

    * fix environment variable

    * fix netlify.toml

commit 99fbfd4
Author: Frie <[email protected]>
Date:   Fri Jul 31 14:00:09 2020 +0200

    * disable services except twitter, simple, nojs view

    * #109 use cookiebot

    * Squashed commit of the following:

    commit 9bcea3e
    Author: Frie <[email protected]>
    Date:   Thu Jul 30 11:12:49 2020 +0200

        fix #130 : fix sorting of events.

    commit 37149cb
    Author: Frie <[email protected]>
    Date:   Thu Jul 30 10:47:45 2020 +0200

        no fucking draft

    commit 7bce1a7
    Author: Frie <[email protected]>
    Date:   Thu Jul 30 10:42:06 2020 +0200

        add pictures of Nina & Isabel

    commit 3ef829a
    Author: Frie <[email protected]>
    Date:   Thu Jul 30 10:40:15 2020 +0200

        add more events, remove "Das Event" from template

    commit 1323901
    Author: Frie <[email protected]>
    Date:   Wed Jul 29 15:25:23 2020 +0200

        regina -> isabel

    commit d630dc0
    Author: Frie <[email protected]>
    Date:   Tue Jul 28 17:04:01 2020 +0200

        link to Mailchimp signup form for nonprofits #129

    * #109 add cookie declaration, remove navbar close

    * #109 show widget dep on cookie status 🎉

    * add hugo version

commit 9bcea3e
Author: Frie <[email protected]>
Date:   Thu Jul 30 11:12:49 2020 +0200

    fix #130 : fix sorting of events.

commit 37149cb
Author: Frie <[email protected]>
Date:   Thu Jul 30 10:47:45 2020 +0200

    no fucking draft

commit 7bce1a7
Author: Frie <[email protected]>
Date:   Thu Jul 30 10:42:06 2020 +0200

    add pictures of Nina & Isabel

commit 3ef829a
Author: Frie <[email protected]>
Date:   Thu Jul 30 10:40:15 2020 +0200

    add more events, remove "Das Event" from template

commit 1323901
Author: Frie <[email protected]>
Date:   Wed Jul 29 15:25:23 2020 +0200

    regina -> isabel

commit d630dc0
Author: Frie <[email protected]>
Date:   Tue Jul 28 17:04:01 2020 +0200

    link to Mailchimp signup form for nonprofits #129

commit e87d36b
Author: Frie <[email protected]>
Date:   Wed Jul 22 17:50:32 2020 +0200

    update english contacts

commit dbaeb63
Author: Frie <[email protected]>
Date:   Wed Jul 22 17:49:05 2020 +0200

    update german contacts

commit 051c1d9
Author: Frie <[email protected]>
Date:   Wed Jul 22 17:47:58 2020 +0200

    remove tweet that is not available anymore

commit a3b9225
Merge: b67e1b4 aabb653
Author: Frie <[email protected]>
Date:   Wed Jul 22 12:01:24 2020 +0200

    Merge branch 'master' of github.com:CorrelAid/hugo-website

commit aabb653
Author: IsabelWi <[email protected]>
Date:   Mon Jul 20 15:36:27 2020 +0200

    Add files via upload

commit 5a0daa0
Author: IsabelWi <[email protected]>
Date:   Mon Jul 20 15:34:37 2020 +0200

    Create stuttgart.md

commit 7165a28
Author: IsabelWi <[email protected]>
Date:   Mon Jul 20 15:33:48 2020 +0200

    Create stuttgart.md

commit b67e1b4
Author: Frie <[email protected]>
Date:   Tue Jul 14 14:33:10 2020 +0200

    fix showing egnlish events page

commit ded4c6d
Author: Frie <[email protected]>
Date:   Tue Jul 14 14:14:50 2020 +0200

    add second OODM

commit abaac7e
Author: Frie <[email protected]>
Date:   Tue Jul 14 10:58:46 2020 +0200

    fix footer year

commit 4fc3665
Author: Andrew Sutjahjo <[email protected]>
Date:   Wed Jul 8 14:47:02 2020 +0200

    Add links to NL website and mailto's (#123)
@pr130 pr130 merged commit 33d77b4 into main Sep 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug fixes refactored website
2 participants