Merge branch 'dev' into 'main' (54940dc0) · Commits · TheAlternative / website-lexy · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

website-lexy
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Admin message

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

54940dc0

Commit 54940dc0 authored 1 year ago by Alexander Schoch

Downloads
- Plain Diff

Merge branch 'dev' into 'main'

Update to newest version after release of new website

See merge request vseth/0500-kom/0522-thealt/website!2

parents 253c2dde a2df2863

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

components/eventCard.jsx 1 addition, 1 deletion

components/eventCard.jsx
components/signUpsModal.jsx 29 additions, 4 deletions

components/signUpsModal.jsx
components/toc.jsx 3 additions, 1 deletion

components/toc.jsx
graphql/resolvers.js 51 additions, 4 deletions

graphql/resolvers.js
graphql/schema.js 1 addition, 0 deletions

graphql/schema.js
public/locales/de/common.json 2 additions, 1 deletion

public/locales/de/common.json
public/locales/en/common.json 2 additions, 1 deletion

public/locales/en/common.json
styles/globals.css 4 additions, 2 deletions

styles/globals.css
thealternative.config.js 90 additions, 2 deletions

thealternative.config.js
utilities/dates.js 4 additions, 3 deletions

utilities/dates.js
utilities/hasAccess.js 1 addition, 2 deletions

utilities/hasAccess.js
utilities/mail.js 23 additions, 0 deletions

utilities/mail.js

with 211 additions and 21 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment