Commit Graph

1361 Commits

Author SHA1 Message Date
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
SimeonPursiainen dba12edb94 test 2025-03-06 22:50:24 +02:00
Simeon Pursiainen 1360ed2f93 Merge branch 'master' into 'production'
Release kilta-avustus + yhdenvertaisuus pages

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!147
2025-03-06 22:07:10 +02:00
SimeonPursiainen 0a53ede99d edited equitypage 2025-03-06 21:55:06 +02:00
Simeon Pursiainen 82e5b40432 Merge branch 'revert-1434c434' into 'master'
Revert "typos"

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!146
2025-03-04 22:21:52 +02:00
Simeon Pursiainen 9040624ec4 fixes 2025-03-04 22:17:14 +02:00
Simeon Pursiainen 5445d0b419 Revert "typos"
This reverts commit 1434c434bf
2025-03-04 22:14:45 +02:00
Simeon Pursiainen 1434c434bf typos 2025-03-04 21:47:47 +02:00
Simeon Pursiainen e0e8fa6a78 typos 2025-03-04 21:46:00 +02:00
Simeon Pursiainen 5fa35bf681 Merge branch 'master' of https://gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-frontend 2025-03-04 21:24:27 +02:00
Simeon Pursiainen b9ed0181fc Added ProSIK and golden honoraries 2025-03-04 20:35:15 +02:00
Simeon Pursiainen def7c79d82 Added ProSIK and golden honoraries 2025-03-04 20:22:23 +02:00
Simeon Pursiainen fb8340e23e Added funding page 2025-03-04 19:06:52 +02:00
Simeon Pursiainen 6e22c5496a Added equitypage 2025-03-02 16:22:34 +02:00
Simeon Pursiainen 62e2985f39 Merge branch 'master' into 'production'
Updated english page

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!145
2025-02-28 20:20:41 +00:00
SimeonPursiainen 7323600314 test 2025-02-28 22:06:52 +02:00