brreynie
|
373a0e6209
|
Merge pull request #125 from SELab1/feed_friends
Feed friends
|
2023-05-16 11:11:10 +02:00 |
|
brreynie
|
754cad20ed
|
Merge branch 'development' into feed_friends
|
2023-05-16 11:10:13 +02:00 |
|
|
|
e6b2cdba3b
|
Merge pull request #124 from SELab1/fixes
Fixes
|
2023-05-16 11:06:29 +02:00 |
|
lbarraga
|
c61853b8bd
|
added friends feed string resources
|
2023-05-16 10:06:46 +02:00 |
|
lbarraga
|
f5ae4f157c
|
implemented friends feed
|
2023-05-16 10:06:24 +02:00 |
|
lbarraga
|
bd9fce4418
|
changed sessions to feed
|
2023-05-16 10:06:04 +02:00 |
|
lbarraga
|
43b46dd4a1
|
changed some DAOs to take ids and added a friends feed getter
|
2023-05-16 10:05:37 +02:00 |
|
lbarraga
|
4d2abaec12
|
changed dateText to Medium instead of bold
|
2023-05-16 10:04:50 +02:00 |
|
lbarraga
|
439bc0ab61
|
changed sessions to feed in navbar
|
2023-05-16 10:04:21 +02:00 |
|
|
|
57668d3164
|
Fix public profile string not showing
|
2023-05-16 09:32:20 +02:00 |
|
|
|
45bd215004
|
Add friends to FAB
|
2023-05-16 09:16:03 +02:00 |
|
|
|
af23a29f6c
|
Forbid adding friends twice
|
2023-05-16 09:10:39 +02:00 |
|
|
|
ef08a773f8
|
Fix own profile showing up in search friends
|
2023-05-16 08:44:56 +02:00 |
|
|
|
9eab533251
|
Styling
|
2023-05-16 08:44:21 +02:00 |
|
brreynie
|
cb3373fa29
|
Merge pull request #122 from SELab1/uitesting
UI Tests
|
2023-05-16 00:42:01 +02:00 |
|
brreynie
|
629137249e
|
test fixes
|
2023-05-16 00:41:24 +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 |
|
|
|
76dc234b8c
|
Merge pull request #123 from SELab1/fixes
Search field fixes
|
2023-05-15 23:51:24 +02:00 |
|
brreynie
|
9856a4514a
|
Merge pull request #121 from SELab1/create-task-from-fab
#67 create task from fab
|
2023-05-15 23:50:50 +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 |
|
|
|
5bce9d6108
|
Search field fixes
|
2023-05-15 23:43:30 +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 |
|
