Commit Graph

1349 Commits

Author SHA1 Message Date
Simeon Pursiainen 54c23bd530 minor text fix 2025-01-11 18:57:02 +02:00
Simeon Pursiainen 357ac71186 added existing pics to board page 2025-01-11 17:17:36 +02:00
Simeon Pursiainen bcd35e2041 updated board representatives with new names and emails 2025-01-11 15:56:48 +02:00
Johannes Viirimäki c116036748 Merge branch 'master' into 'production'
Master to production

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!141
2024-10-31 13:42:11 +00:00
Johannes f0101059dd add silver honorarys, fix links 2024-10-31 15:21:31 +02:00
Johannes eb467bf387 Merge branch 'master' of gitlab.com:sahkoinsinoorikilta/vtmk/web2.0-frontend 2024-10-31 15:00:31 +02:00
Johannes cfce1ef859 add new silver honorarys 2024-10-31 14:59:55 +02:00
Johannes Viirimäki fcce680e80 Merge branch 'master' into 'production'
Master to production

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!140
2024-09-24 09:39:59 +00:00
Johannes Viirimäki d649b4fc0c Merge branch 'feature/new-pages' into 'master'
Feature/new pages

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!139
2024-09-23 12:53:32 +00:00
Johannes Viirimäki 0373e07d45 Update yhteystiedot.tsx 2024-09-23 12:46:17 +00:00
Johannes 9745276ffd update corporate logos 2024-09-23 15:41:23 +03:00
Johannes 42835f98f3 delete duplicate info on board page 2024-09-22 17:11:08 +03:00
Johannes 2b150c1d29 Add committee info, fix typos 2024-09-16 15:06:39 +03:00
Johannes 1beb35ee80 create page for membership information 2024-09-11 17:47:02 +03:00
Johannes 4f812dc0c8 Merge remote-tracking branch 'origin/master' into feature/new-pages 2024-09-11 15:02:00 +03:00
Johannes Viirimäki 955664a342 Merge branch 'master' into 'production'
fix typos

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!138
2024-07-02 07:02:12 +00:00
Johannes 53f4f3de4c fix typos 2024-07-02 09:42:23 +03:00
Johannes Viirimäki b77ffff341 Merge branch 'master' into 'production'
update sponsor logos, update fuksi guide link

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!137
2024-06-24 06:31:25 +00:00
Johannes c4e31e3c91 update sponsor logos, update fuksi guide link 2024-06-24 09:11:04 +03:00
Johannes Viirimäki 9f95b3d05f Merge branch 'master' into 'production'
add link to new fopas

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!136
2024-06-20 10:22:59 +00:00
Johannes Viirimäki fd7e41bffb add link to new fopas 2024-06-20 09:58:10 +00:00
Johannes Viirimäki a062841b9c Merge branch 'master' into 'production'
fix typos, update info

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!135
2024-06-03 20:15:51 +00:00
Johannes Viirimäki 643ed1505a fix typos, update info 2024-06-03 19:48:17 +00:00
Johannes Viirimäki 5dde3422e7 Merge branch 'master' into 'production'
Master to production

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!134
2024-05-30 12:26:03 +00:00
Johannes 16504230b2 change picture and info on freshmen page 2024-05-30 15:10:13 +03:00
Johannes 0fd26fa246 update info on freshmen page 2024-05-29 16:32:18 +03:00
Jan Tuomi a33dc3e77e Merge branch 'master' into production 2024-05-27 15:32:55 +03:00
Jan Tuomi 2cf804be05 Merge branch 'update-cicd-docker-images' into 'master'
Use docker:25 based dind services and runner images

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!133
2024-05-27 12:20:01 +00:00
Jan Tuomi 0fe6a29ffc Use docker:25 based dind services and runner images 2024-05-27 15:13:08 +03:00
Johannes Viirimäki 8e1b0b9a30 Merge branch 'master' into 'production'
Master to prod

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!132
2024-05-16 22:29:34 +00:00
Johannes Viirimäki ba9d938092 update fuksi tg chat links 2024-05-11 11:34:49 +00:00
Johannes Viirimäki a2e55927ab Merge branch 'master' into 'production'
Master to prod

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!131
2024-04-10 10:05:45 +00:00
Johannes 1bda00ac9d update guild's tg link on freshmen page 2024-04-10 12:50:22 +03:00
Johannes bfdfa28b5b asdf 2024-04-10 12:45:03 +03:00
Justus Ojala 96a3709f0c Merge branch '59-chamge-admin-event-date-format' into 'master'
Update date formats

Closes #59

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!130
2024-02-28 16:21:27 +00:00
Justus Ojala a7fff40d74 Update date formats 2024-02-28 18:12:37 +02:00
Johannes Viirimäki 5ac532176c Merge branch 'master' into 'production'
Master to production

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!129
2024-02-19 19:46:38 +00:00
Johannes 325e51953a add new honorarys, add board pictures 2024-02-19 21:27:29 +02:00
Johannes 48d9437f59 stuff 2024-02-19 16:40:33 +02:00
Johannes 3f2cb7717e start new branch 2024-02-03 14:56:21 +02:00
Johannes 2ea74f90ac fix typos, update some info 2024-01-11 00:05:29 +02:00
Johannes Viirimäki af2190c447 Merge branch 'master' into 'production'
master to prod

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!128
2024-01-10 21:15:20 +00:00
Johannes f413435194 update contacts and committees 2024-01-10 22:21:21 +02:00
Johannes e770722ad0 update committee info 2024-01-10 17:56:22 +02:00
tommi s 4cab856739 Merge branch 'master' into 'production'
update contacts page

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!127
2024-01-03 18:26:20 +00:00
Johannes 0e5f7339e8 update contacts page 2024-01-03 18:22:51 +02:00
tommi s d53cd5f34c Merge branch 'master' into 'production'
Master to prod (leasing page)

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!126
2023-12-19 19:15:59 +00:00
tommi s 6c73fe9675 Merge branch 'feat/rent_page' into 'master'
Feat/rent page to master

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!125
2023-12-16 09:58:08 +00:00
Tommi S a02e4891c2 fix lint 2023-12-16 11:43:15 +02:00
Tommi S 57ef1484a9 fix lint 2023-12-16 11:42:38 +02:00