fbe392d511
removal of junk and changes made by luca
2024-05-29 17:34:24 +02:00
SebasKoedam
7efdf3579e
Added new style for fitness activity
2024-05-29 17:17:29 +02:00
f350e58fda
Junk removal
2024-05-29 16:30:35 +02:00
SebasKoedam
447ef3a6af
toolbar navigation button white
2024-05-29 16:30:24 +02:00
98c4df1ad5
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 16:18:56 +02:00
Luca Warmenhoven
2e8feb686b
Updated PersonalMotionPreviewElement
2024-05-29 16:18:48 +02:00
SebasKoedam
426725a632
Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66 into 59-als-student-wil-ik-dat-de-ui-in-mijn-app-overal-het-zelfde-is-en-in-het-nederlands-wordt
2024-05-29 16:14:12 +02:00
SebasKoedam
4b46738bf0
fixed the main menu bars and theme
2024-05-29 16:12:37 +02:00
SebasKoedam
34dc294d06
fixed the main menu bars and theme
2024-05-29 16:12:23 +02:00
bceef3bde1
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 16:11:54 +02:00
Luca Warmenhoven
2426e7b2e2
Updated PersonalMotionPreviewElement
2024-05-29 16:11:43 +02:00
ba92ae62c7
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 16:06:15 +02:00
Luca Warmenhoven
6ffbb503c9
Added more logging for debugging functionality
2024-05-29 16:06:10 +02:00
8441097bf1
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 15:56:50 +02:00
9b71df061f
change array
2024-05-29 15:56:04 +02:00
Luca Warmenhoven
bd9ace61e9
Added more logging for debugging functionality
2024-05-29 15:55:37 +02:00
Luca Warmenhoven
60a45fd510
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# code/src/Fitbot/app/src/main/java/com/example/fitbot/ui/components/PersonalMotionPreviewElement.java
2024-05-29 15:39:34 +02:00
Luca Warmenhoven
a6977b057c
Added more logging for debugging functionality
2024-05-29 15:39:13 +02:00
7e60d5e5e6
fixed type error causing bootloop
2024-05-29 15:35:29 +02:00
Luca Warmenhoven
4270ecde7f
Merge remote-tracking branch 'origin/main'
2024-05-29 15:22:49 +02:00
Luca Warmenhoven
3966824b76
Yebal
2024-05-29 15:22:39 +02:00
9ad44897ff
optimization
2024-05-29 15:22:38 +02:00
0441133744
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 15:15:23 +02:00
c3329a4c52
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-29 15:15:14 +02:00
Niels Gras
4c8c9d9f32
Merge branch '57-als-gebruiker-wil-ik-een-uitleg-scherm-zodat-ik-kan-zien-wat-fitbot-inhoudt' into 'main'
...
Resolve "Als gebruiker wil ik een uitleg scherm zodat ik kan zien wat fitbot inhoudt."
Closes #57
See merge request propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66!13
2024-05-29 15:14:48 +02:00
Luca Warmenhoven
447a021b10
Added more logging for debugging functionality
2024-05-29 15:13:04 +02:00
49eb09b105
added logging
2024-05-29 15:12:27 +02:00
ea9a35030b
qi.sdk unregister added
2024-05-29 15:12:18 +02:00
Niels Gras
940202d9f4
Edited help screen
2024-05-29 14:00:45 +02:00
Luca Warmenhoven
4983162ac9
Merge remote-tracking branch 'origin/main'
2024-05-29 13:41:00 +02:00
Luca Warmenhoven
95ed46d9ac
cermit
2024-05-29 13:40:53 +02:00
SebasKoedam
d6fc5098dd
Update database host to use IP address instead of localhost
2024-05-29 13:06:55 +02:00
Luca Warmenhoven
bd74b0b5aa
Merge remote-tracking branch 'origin/main'
2024-05-29 12:17:48 +02:00
Luca Warmenhoven
d080f0af8d
Updated incoming_request_handlers.js to match database querying
2024-05-29 12:17:33 +02:00
1a56a05409
Junk cleanup and new json formatting
2024-05-28 16:17:06 +02:00
cdd8ac9d49
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-28 16:11:09 +02:00
Luca Warmenhoven
3d01749aa2
Attempt to make good
2024-05-28 16:11:03 +02:00
004d216767
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-28 15:58:44 +02:00
Luca Warmenhoven
5789f4c0dd
Attempt to make good
2024-05-28 15:58:25 +02:00
Luca Warmenhoven
5a226dd56b
Attempt to make good
2024-05-28 15:56:28 +02:00
6961801a67
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-28 15:39:28 +02:00
Luca Warmenhoven
3c0e07336d
Attempt to make good
2024-05-28 15:37:26 +02:00
48848de44d
Merge branch 'main' of https://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-4/muupooviixee66
2024-05-28 15:28:21 +02:00
Luca Warmenhoven
c527289c68
Attempt to make good
2024-05-28 15:28:09 +02:00
83b233e275
dead code removal
2024-05-28 15:16:04 +02:00
Luca Warmenhoven
80ef0ac99e
Pep crack cocaine
2024-05-28 15:06:54 +02:00
Luca Warmenhoven
565d19ec00
Pep crack cocaine
2024-05-28 15:04:17 +02:00
Luca Warmenhoven
62e1320b3c
Pep crack cocaine
2024-05-28 15:00:48 +02:00
Luca Warmenhoven
31135d1aa7
poep
2024-05-28 14:36:48 +02:00
Luca Warmenhoven
4c9a256d6c
Pep crack cocaine
2024-05-28 14:15:30 +02:00
