Commit Graph

1326 Commits

Author SHA1 Message Date
SimeonPursiainen 749acccb07 Cleaning "fukseille" page 2025-05-25 18:20:30 +03:00
SimeonPursiainen 5ef98ae1f5 New FTMK 2025-05-25 18:18:37 +03:00
SimeonPursiainen c449d2e1d0 same as previous commit 2025-05-25 14:08:33 +03:00
SimeonPursiainen c8b846f518 new tg groupchat links 2025-05-25 13:48:19 +03:00
SimeonPursiainen a80e92dcd4 updated telegram links 2025-05-22 22:21:02 +03:00
Justus Ojala 95f02de0ae Translate the ISO section 2025-05-20 21:42:29 +03:00
Justus Ojala b16ea3d5de Translate the freshman page hero
also removed the link to the bachelor programme info package. It is in finnish only, and is largely not applicable to exchange students and master fuksis
2025-05-20 21:21:50 +03:00
Justus Ojala bad9ace8c8 Copy content of finnish freshmen page to english freshmen page 2025-05-20 21:13:55 +03:00
Simeon Pursiainen 1a2a870f18 Merge branch 'master' into 'production'
Master

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!164
2025-05-17 13:23:18 +03:00
Simeon Pursiainen 34d8213156 Master 2025-05-17 13:23:17 +03:00
SimeonPursiainen 238508f875 added member application link 2025-05-17 11:36:47 +03:00
SimeonPursiainen 0fdc1aef3a freshmen page 2025-05-16 23:59:28 +03:00
SimeonPursiainen 71f209edde english page update 2025-05-16 23:28:54 +03:00
SimeonPursiainen 3181cede9b Added english page for freshmen 2025-05-16 23:15:04 +03:00
Simeon Pursiainen 2579cd4763 Merge branch 'master' into 'production'
Revert "Merge branch 'master' of gitlab.com:sahkoinsinoorikilta/vtmk/web2.0-frontend"

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!163
2025-05-16 22:41:30 +03:00
Simeon Pursiainen 63209bbf20 Merge branch 'production' into 'master'
# Conflicts:
#   src/views/FreshmenPage/FreshmenPageView.tsx
2025-05-16 22:29:22 +03:00
SimeonPursiainen 047c8656ac updated tg-links 2025-05-12 23:21:33 +03:00
SimeonPursiainen e16a3bb8fc changes 2025-05-12 23:05:43 +03:00
SimeonPursiainen 9b34d77c42 Changed links 2025-05-12 23:03:18 +03:00
SimeonPursiainen a76ba2b1df removed due to abuse 2025-05-12 22:35:59 +03:00
Simeon Pursiainen 5b59d36f76 Merge branch 'fix_next_version' into 'master'
Revert "audit" to fix next update try 2

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!159
2025-05-12 17:46:31 +03:00
Joona M b381400903 Revert "audit" to fix next update try 2
This reverts commit 7280edb99f.
2025-05-12 17:32:34 +03:00
Simeon Pursiainen de93bb2a05 allow audit failure 2025-05-04 09:06:19 +03:00
Simeon Pursiainen 4a6b8093bc Merge branch 'production' into 'master'
Production

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!157
2025-05-03 21:02:45 +03:00
Simeon Pursiainen d381e39f0f Production 2025-05-03 21:02:45 +03:00
Simeon Pursiainen acb335e010 sponsors 2025-05-03 20:48:28 +03:00
Simeon Pursiainen c630ebdb4d Merge branch 'revert-e1e06f18' into 'master'
Revert "Merge branch 'master' of gitlab.com:sahkoinsinoorikilta/vtmk/web2.0-frontend"

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!156
2025-05-03 20:40:58 +03:00
Simeon Pursiainen 504b035b2a Revert "Merge branch 'master' of gitlab.com:sahkoinsinoorikilta/vtmk/web2.0-frontend"
This reverts commit e1e06f185e
2025-05-03 20:33:33 +03:00
SimeonPursiainen 15843d8970 edit 2025-05-03 20:31:36 +03:00
Simeon Pursiainen d34e371d37 Edit FrontPageView.tsx 2025-05-03 20:06:46 +03:00
Simeon Pursiainen e1e06f185e Merge branch 'master' of gitlab.com:sahkoinsinoorikilta/vtmk/web2.0-frontend 2025-05-03 19:42:16 +03:00
SimeonPursiainen a39e6fec4d updated email link 2025-04-19 16:28:15 +03:00
SimeonPursiainen 12cce80502 testing 2025-04-19 15:31:01 +03:00
Simeon Pursiainen 1be5ef9cb4 Update .gitlab-ci.yml file 2025-04-10 14:28:11 +03:00
Simeon Pursiainen f7a65fabc0 Merge branch 'revert-33ebf456' into 'master'
Revert "updated sponsors"

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!152
2025-04-07 22:27:43 +03:00
Simeon Pursiainen fbe20594dd Revert "updated sponsors" 2025-04-07 22:27:43 +03:00
SimeonPursiainen 734a91c490 updated contacts-page 2025-04-07 21:41:26 +03:00
Simeon Pursiainen 7280edb99f audit 2025-04-06 12:25:31 +03:00
Simeon Pursiainen 613732aed2 Updated contacts 2025-04-06 11:52:17 +03:00
Simeon Pursiainen d22d6cb232 Merge branch 'master' into production 2025-03-19 10:35:56 +02:00
Simeon Pursiainen 744aee88c4 Merge branch 'master' into 'production'
Master

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!151
2025-03-19 09:52:25 +02:00
Simeon Pursiainen 1f2d33ce50 Master 2025-03-19 09:52:25 +02:00
Simeon Pursiainen 33ebf45627 updated sponsors 2025-03-19 09:37:10 +02:00
Simeon Pursiainen b0489b04ca Merge branch 'master' into 'production'
Master

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!150
2025-03-07 15:15:43 +02:00
Simeon Pursiainen 217ffefb63 Master 2025-03-07 15:15:43 +02:00
Simeon Pursiainen 4df467988a Merge branch 'master' into 'production'
Master

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!149
2025-03-07 08:29:35 +02:00
Simeon Pursiainen 0d272bc58c Master 2025-03-07 08:29:35 +02:00
SimeonPursiainen 42fed752cc Merge branch 'production'
testing
2025-03-06 23:37:14 +02:00
Simeon Pursiainen e8e9fedf7c Merge branch 'master' into 'production'
merge

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!148
2025-03-06 23:13:18 +02:00
Simeon Pursiainen 98e811e641 merge 2025-03-06 23:13:18 +02:00