 Justus Ojala
|
d580af1f01
|
Update guild room custodians
(cherry picked from commit 42ce058dc9)
Co-authored-by: Justus Ojala <justus.ojala@aalto.fi>
|
2025-09-24 21:04:32 +03:00 |
|
|
Simeon Pursiainen
|
3c72152704
|
Merge branch 'textFix' into 'production'
Textfix
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!191
|
2025-09-24 13:00:08 +03:00 |
|
|
SimeonPursiainen
|
2ad2907f5f
|
Fixup
|
2025-09-23 21:27:48 +03:00 |
|
|
SimeonPursiainen
|
f61fc155a8
|
Updated membership fee payment info
|
2025-09-23 21:18:20 +03:00 |
|
|
Simeon Pursiainen
|
802b308826
|
Merge branch 'master' into 'production'
Master
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!188
|
2025-09-11 21:21:13 +03:00 |
|
|
Simeon Pursiainen
|
e4784e1932
|
Master
|
2025-09-11 21:21:13 +03:00 |
|
|
Simeon Pursiainen
|
c015f0a275
|
Merge branch 'master' into 'production'
touch d'andre
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!185
|
2025-09-09 19:18:11 +03:00 |
|
|
Simeon Pursiainen
|
6a9cb63cff
|
touch d'andre
|
2025-09-09 19:18:11 +03:00 |
|
|
Simeon Pursiainen
|
5007d443e7
|
Merge branch 'master' into 'production'
Fixup
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!184
|
2025-09-09 14:42:39 +03:00 |
|
|
SimeonPursiainen
|
7abb7dc414
|
Fixup
|
2025-09-09 13:36:16 +03:00 |
|
|
Simeon Pursiainen
|
648c49582e
|
Merge branch 'master' into 'production'
Changed instructions for job ads
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!183
|
2025-09-05 12:30:03 +03:00 |
|
|
SimeonPursiainen
|
103f2b163a
|
Changed instructions for job ads
|
2025-09-05 12:15:15 +03:00 |
|
|
Simeon Pursiainen
|
c50a09c691
|
Merge branch 'master' into 'production'
added new media card for sosso
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!182
|
2025-09-02 16:55:36 +03:00 |
|
|
SimeonPursiainen
|
fda39d7372
|
added new media card for sosso
|
2025-09-02 16:42:35 +03:00 |
|
|
Simeon Pursiainen
|
2b75f5a567
|
Merge branch 'master' into 'production'
Added Metso to sponsors
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!181
|
2025-09-01 20:04:25 +03:00 |
|
|
SimeonPursiainen
|
3689dbc60c
|
Added Metso to sponsors
|
2025-09-01 19:52:02 +03:00 |
|
|
Simeon Pursiainen
|
4e27d892d5
|
Merge branch 'master' into 'production'
fix stack compose
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!180
|
2025-09-01 19:29:30 +03:00 |
|
|
SimeonPursiainen
|
80a961d1f9
|
fix stack compose
|
2025-09-01 19:15:28 +03:00 |
|
|
Simeon Pursiainen
|
0a36c1c233
|
Merge branch 'master' into 'production'
removing replicas
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!179
|
2025-09-01 18:57:43 +03:00 |
|
|
SimeonPursiainen
|
db8c8ea2b9
|
removing replicas
|
2025-09-01 18:42:42 +03:00 |
|
|
Simeon Pursiainen
|
9459930291
|
Merge branch 'master' into 'production'
Separate eng and international fuksi pages
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!177
|
2025-08-16 14:51:57 +03:00 |
|
|
Justus Ojala
|
cea106b134
|
Separate eng and international fuksi pages
|
2025-08-16 14:51:57 +03:00 |
|
|
Justus Ojala
|
a854de921b
|
Merge branch 'text-fix' into 'master'
Reverse captain name order to match photo
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!178
|
2025-08-16 14:13:05 +03:00 |
|
|
Justus Ojala
|
9c8a2eb4ce
|
Reverse captain name order to match photo
|
2025-08-16 14:13:05 +03:00 |
|
|
Justus Ojala
|
ff558534a0
|
Merge branch 'revert-eng-freshmen' into 'master'
Revert eng freshmen page
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!176
|
2025-08-16 13:34:46 +03:00 |
|
|
Justus Ojala
|
56531b1cfc
|
Revert eng freshmen page
|
2025-08-16 13:27:06 +03:00 |
|
|
Justus Ojala
|
a7c297354f
|
Merge branch 'update-links' into 'master'
Update links on international freshman page
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!175
|
2025-08-16 12:56:02 +03:00 |
|
|
Justus Ojala
|
ff5da7a131
|
Update links on international freshman page
|
2025-08-16 12:27:35 +03:00 |
|
|
Justus Ojala
|
7412b652c1
|
Merge branch 'separate-eng-and-intl-pages' into 'master'
Separate eng and intl pages
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!174
|
2025-08-16 12:17:13 +03:00 |
|
|
Justus Ojala
|
eb64777252
|
Separate eng and intl pages
|
2025-08-16 12:17:13 +03:00 |
|
|
Simeon Pursiainen
|
af9b115205
|
Merge branch 'master' into 'production'
Master
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!173
|
2025-08-13 21:16:40 +03:00 |
|
|
Justus Ojala
|
73869a4c15
|
Merge branch 'for-freshmen-update-20250813' into 'master'
Update "for feshmen" page
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!172
|
2025-08-13 20:35:09 +03:00 |
|
|
Justus Ojala
|
b6e0e5ea36
|
Update "for feshmen" page
|
2025-08-13 20:35:09 +03:00 |
|
|
Simeon Pursiainen
|
7ed7849c43
|
Merge branch 'master' into 'production'
FIx fopas links
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!171
|
2025-07-15 21:41:51 +03:00 |
|
|
Simeon Pursiainen
|
96a591b1c5
|
Merge branch 'production' into 'master'
# Conflicts:
# src/views/ForFreshmenPage/ForFreshmenPageHero.tsx
|
2025-07-15 21:29:15 +03:00 |
|
|
SimeonPursiainen
|
19ad40b969
|
fopas links fix
|
2025-07-15 20:43:11 +03:00 |
|
|
SimeonPursiainen
|
482be66b43
|
new links for fopas
|
2025-07-09 20:58:23 +03:00 |
|
|
SimeonPursiainen
|
5439ff9a56
|
fixing lint
|
2025-07-02 07:36:43 +03:00 |
|
|
SimeonPursiainen
|
b7c06890fe
|
english fuksipoint guide
|
2025-07-02 07:35:57 +03:00 |
|
|
SimeonPursiainen
|
cdff86c0f3
|
english fuksiguide
|
2025-07-02 07:34:19 +03:00 |
|
|
SimeonPursiainen
|
984966f3af
|
added replica in case of a failure
|
2025-07-01 20:56:44 +03:00 |
|
|
SimeonPursiainen
|
fe015c3bce
|
testing force push to refresh site
|
2025-07-01 19:37:07 +03:00 |
|
|
Simeon Pursiainen
|
a570fde9d7
|
Merge branch 'master' into 'production'
Translate the freshman page hero
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!170
|
2025-06-26 07:22:24 +03:00 |
|
|
SimeonPursiainen
|
c683b2d61a
|
removed ramboll from sponsors
|
2025-06-26 06:51:13 +03:00 |
|
|
SimeonPursiainen
|
c23200401f
|
edited ForFreshmenPage
|
2025-06-26 06:48:37 +03:00 |
|
|
SimeonPursiainen
|
827eab0531
|
edited english freshmen page
|
2025-06-26 06:47:44 +03:00 |
|
|
Justus Ojala
|
1ee25d3447
|
Merge branch '60-forfreshmen' into 'master'
Translate the freshman page hero
Closes #60
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!168
|
2025-06-24 20:47:28 +03:00 |
|
|
Simeon Pursiainen
|
e62017691c
|
Merge branch 'master' into 'production'
added 2025 fuksiopas
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!169
|
2025-06-24 18:48:02 +03:00 |
|
|
SimeonPursiainen
|
c116ea27cc
|
added 2025 fuksiopas
|
2025-06-24 18:12:07 +03:00 |
|
|
Justus Ojala
|
eb67fedde4
|
Merge branch 'master' into '60-forfreshmen'
# Conflicts:
# src/views/FreshmenPage/FreshmenPageView.tsx
|
2025-06-23 21:49:35 +03:00 |
|