 J4DER4
|
6cb18c4a13
|
Merge branch 'master' into 'production'
Master
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!194
|
2025-11-21 19:23:29 +00:00 |
|
|
SimeonPursiainen
|
2009a65f55
|
Added silver honoraries for 2025
|
2025-10-28 14:13:21 +02:00 |
|
|
Justus Ojala
|
c22bad5718
|
Use secure websockets for mqtt
|
2025-10-14 17:59:55 +03:00 |
|
|
Justus Ojala
|
4fbec0b85c
|
Do not try to connect to MQTT if host undefined
|
2025-10-14 08:41:25 +03:00 |
|
|
Justus Ojala
|
81be5a1e60
|
Merge branch 'Coffeescale' into 'master'
Coffeescale
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!193
|
2025-10-13 22:02:53 +03:00 |
|
|
Justus Ojala
|
80ccf1bc66
|
Coffeescale
|
2025-10-13 22:02:53 +03:00 |
|
|
Justus Ojala
|
d75c6b4756
|
Rename submitKey to submit_id
|
2025-10-13 19:38:28 +03:00 |
|
|
SimeonPursiainen
|
69c06636ab
|
Fix link for freshmen page on the homepage
|
2025-10-07 11:43:41 +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 |
|
|
Justus Ojala
|
42ce058dc9
|
Update guild room custodians
|
2025-09-23 21:38:58 +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 |
|
|
SimeonPursiainen
|
67627d4d16
|
Clearer instructions for membership payments
|
2025-09-23 20:54:32 +03:00 |
|
|
Justus Ojala
|
4639397d25
|
Merge branch 'signup_duplicate_prevention' into 'master'
Add submission key to frontend to prevent duplicate signups
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!189
|
2025-09-16 21:43:15 +03:00 |
|
|
Justus Ojala
|
630c0bce05
|
Add submission key to frontend to prevent duplicate signups
|
2025-09-15 14:00:24 +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
|
b80942ee53
|
Merge branch 'New_visual' into 'master'
New visual
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!187
|
2025-09-11 20:45:14 +03:00 |
|
|
Simeon Pursiainen
|
a27c77e16c
|
New visual
|
2025-09-11 20:45:14 +03:00 |
|
|
Simeon Pursiainen
|
813479a602
|
Merge branch 'New_visual' into 'master'
New visual
See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!186
|
2025-09-11 20:10:29 +03:00 |
|
|
Simeon Pursiainen
|
c12d4c1e73
|
New visual
|
2025-09-11 20:10:29 +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 |
|
|
SimeonPursiainen
|
453d20d345
|
Added kyykkäsetti to rentpage
|
2025-09-09 19:05:15 +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 |
|