brreynie
|
43838f5d6d
|
Merge commit '629137249e'
|
2023-05-16 00:44:33 +02:00 |
|
brreynie
|
629137249e
|
test fixes
|
2023-05-16 00:41:24 +02:00 |
|
brreynie
|
886f452a21
|
Merge commit '1f8e2d1fe3'
|
2023-05-16 00:00:34 +02:00 |
|
Rune Dyselinck
|
8afeb38ab0
|
Merge branch 'uitesting' of https://github.ugent.be/SELab1/project2023-groep-14 into uitesting
|
2023-05-15 23:58:17 +02:00 |
|
brreynie
|
4bb1f2dcb6
|
Delete androidTestResultsUserPreferences.xml
kwestie van cluttering van `.idea` files te vermijden
|
2023-05-15 23:51:56 +02:00 |
|
Rune Dyselinck
|
d9dd3bbb0a
|
Merge remote-tracking branch 'origin/uitesting' into uitesting
|
2023-05-15 23:50:31 +02:00 |
|
Rune Dyselinck
|
e6956a5343
|
Update FireBaseSubjectDAO.kt
|
2023-05-15 23:46:32 +02:00 |
|
Rune Dyselinck
|
b97cbb70c4
|
Update FireBaseSubjectDAO.kt
|
2023-05-15 23:45:38 +02:00 |
|
Rune Dyselinck
|
21c42cb693
|
Update FireBaseSubjectDAO.kt
|
2023-05-15 23:45:12 +02:00 |
|
Rune Dyselinck
|
4420cede7e
|
Update FireBaseSubjectDAO.kt
|
2023-05-15 23:41:39 +02:00 |
|
Rune Dyselinck
|
9bae6dbd23
|
Update FireBaseSubjectDAO.kt
|
2023-05-15 23:36:44 +02:00 |
|
Rune Dyselinck
|
ba7559a142
|
import statement vergeten
|
2023-05-15 23:34:24 +02:00 |
|
Rune Dyselinck
|
4244770f95
|
Merge remote-tracking branch 'origin/development' into uitesting
|
2023-05-15 23:30:07 +02:00 |
|
|
|
0bf15a1647
|
Fixes SelectedProfileState
|
2023-05-15 23:29:01 +02:00 |
|
Rune Dyselinck
|
0a55771ece
|
all tests fixed
|
2023-05-15 23:28:44 +02:00 |
|
|
|
204ca8f67e
|
Merge pull request #119 from SELab1/friends
Friends
|
2023-05-15 23:14:16 +02:00 |
|
lbarraga
|
9bc210c3d0
|
resolve conflicts
|
2023-05-15 23:07:40 +02:00 |
|
Rune Dyselinck
|
31e78856c0
|
normal test fails
|
2023-05-15 22:52:44 +02:00 |
|
|
|
a814bd74d7
|
QOL improvements & friendsSessionsDAOstuff
|
2023-05-15 22:40:36 +02:00 |
|
brreynie
|
1f8e2d1fe3
|
#67 create task from fab
|
2023-05-15 22:23:14 +02:00 |
|
Rune Dyselinck
|
860fb5fac1
|
ui tests
|
2023-05-15 21:53:04 +02:00 |
|
lbarraga
|
19a073f8c6
|
Merge pull request #120 from SELab1/abstract2composition_refactor_session_screen
Abstract2composition refactor session screen
|
2023-05-15 21:48:03 +02:00 |
|
lbarraga
|
924e136153
|
resolve merge conflicts
|
2023-05-15 21:47:28 +02:00 |
|
lbarraga
|
3386d45a04
|
Merge pull request #111 from SELab1/delete_timer
Delete timer
|
2023-05-15 21:43:23 +02:00 |
|
lbarraga
|
61f6e2ac25
|
solve merge issues
|
2023-05-15 21:43:02 +02:00 |
|
brreynie
|
cfc80b6307
|
Merge pull request #113 from SELab1/better_screens
Better session recap screen
|
2023-05-15 21:02:01 +02:00 |
|
lbarraga
|
5ddd92a66f
|
'merge' dots
|
2023-05-15 20:58:37 +02:00 |
|
brreynie
|
654abb7690
|
Merge branch 'development' into better_screens
|
2023-05-15 20:55:20 +02:00 |
|
brreynie
|
9ea4f73187
|
i18n improvement
|
2023-05-15 20:54:47 +02:00 |
|
brreynie
|
e3c31d4f8d
|
Merge pull request #114 from SELab1/bugfixes
Bugfixes
|
2023-05-15 20:36:38 +02:00 |
|
brreynie
|
53993bb2f0
|
Merge branch 'development' into bugfixes
|
2023-05-15 20:36:17 +02:00 |
|
lbarraga
|
6554a92f83
|
remove imports sessionroute
|
2023-05-15 19:22:46 +02:00 |
|
lbarraga
|
0487347c8f
|
cleanup sessionroute
|
2023-05-15 19:18:47 +02:00 |
|
lbarraga
|
9573a2eb5c
|
changed location of sessionscreens
|
2023-05-15 19:09:14 +02:00 |
|
lbarraga
|
346b24aabe
|
give soundplayer to visitor
|
2023-05-15 19:05:43 +02:00 |
|
lbarraga
|
53bdf7d215
|
added callMediaPlayer call
|
2023-05-15 19:02:55 +02:00 |
|
lbarraga
|
8294d63e92
|
added callmedia to session screen
|
2023-05-15 19:02:23 +02:00 |
|
lbarraga
|
4749108992
|
soundplayer to screens instead of mediaplayer
|
2023-05-15 19:01:06 +02:00 |
|
lbarraga
|
1db5a4160e
|
refactor soundplayer location
|
2023-05-15 19:00:36 +02:00 |
|
lbarraga
|
4a04a703db
|
soundplayer wrapper to make mediaplayer easier to work with
|
2023-05-15 18:58:46 +02:00 |
|
lbarraga
|
4519bf2e30
|
added soundplayer
|
2023-05-15 18:57:24 +02:00 |
|
brreynie
|
c872676618
|
Merge pull request #112 from SELab1/color_picker
Color picker
|
2023-05-15 18:17:48 +02:00 |
|
lbarraga
|
4466f3646f
|
#118 gebruik nieuwe visitor om sessionScreen te instantieren
|
2023-05-15 16:34:19 +02:00 |
|
lbarraga
|
052ebb8c32
|
#118 new visitor for session screen
|
2023-05-15 16:31:36 +02:00 |
|
lbarraga
|
b614f7d530
|
Dots now returns an int
|
2023-05-15 16:30:13 +02:00 |
|
Rune Dyselinck
|
74526bc984
|
proto error
|
2023-05-15 15:58:59 +02:00 |
|
Rune Dyselinck
|
522ecae87a
|
fist test
|
2023-05-15 15:11:50 +02:00 |
|
|
|
10c86c9bf0
|
Add resources
|
2023-05-15 14:16:30 +02:00 |
|
|
|
70f1be9b22
|
Add friends button to home screen
|
2023-05-15 14:16:11 +02:00 |
|
|
|
b7ffc7d802
|
Add searchfield composable
|
2023-05-15 14:15:36 +02:00 |
|
