403 Commits

Author SHA1 Message Date
d067ee702a Merge pull request 'feedback dialog is now scrollable' (#64) from develop-scrollableFeedbackWidget into develop
Reviewed-on: #64
Reviewed-by: Elias Müller <elias@elias-mueller.com>
2024-04-10 10:14:31 +00:00
dfd9459922 feedback dialog is now scrollable 2024-04-10 12:10:57 +02:00
51373fe7a2 Merge pull request 'double tap on messages to show options' (#63) from develop-doubleTapMessages into develop
Reviewed-on: #63
Reviewed-by: Elias Müller <elias@elias-mueller.com>
2024-04-09 18:37:28 +00:00
cafa1248d5 resolved issue with merge 2024-04-09 19:46:00 +02:00
ed710b3c2e Merge branch 'develop' into develop-doubleTapMessages
# Conflicts:
#	lib/view/pages/talk/components/chatBubble.dart
2024-04-09 19:42:51 +02:00
8dd3ca9eae double tap on messages to show options 2024-04-09 19:34:45 +02:00
07ffa374fe Merge pull request '#53 fixed misplaced profile pictures' (#62) from develop-fixSwappedProfilePictures into develop
Reviewed-on: #62
Reviewed-by: Pupsi <larslukasneuhaus@gmx.de>
2024-04-09 17:22:08 +00:00
0302c10fcd #53 fixed misplaced profile pictures 2024-04-09 18:53:56 +02:00
92361ec455 Merge pull request 'added upload with multiple files' (#61) from develop-uploadMultipleFiles into develop
Reviewed-on: #61
2024-04-09 08:21:54 +00:00
cf4dea566e solved pr comments; picking multiple Images from Gallery is now possible 2024-04-08 22:39:28 +02:00
d8c72a5d28 solved most pr comments and a bug 2024-04-07 16:48:38 +02:00
9803b06af1 merged to origin/devlop 2024-04-07 15:58:51 +02:00
8131ccae1e solved some pr comments 2024-04-07 15:49:43 +02:00
e901f139d6 solved some pr comments 2024-04-06 13:34:52 +02:00
02dd659d1d fixed typos 2024-04-06 11:40:48 +02:00
277b3366f9 added upload with multiple files 2024-04-05 18:19:49 +02:00
b4defb9eda added upload with multiple files 2024-04-05 18:16:12 +02:00
4c7f53e309 updated project style guidelines 2024-04-03 19:18:17 +02:00
27618f4404 added min/ max-scale to fileViewer 2024-04-02 19:16:49 +02:00
8bf5e5a06a disabled gestureNavigation on bottomNavigation 2024-04-02 19:12:28 +02:00
bc60362984 Merge pull request 'added option to choose more emoji reactions' (#55) from develop-moreEmojiReactions into develop
Reviewed-on: #55
2024-04-02 16:51:32 +00:00
74c7c16877 changed a standard emoji to eyes looking around 2024-04-02 18:30:13 +02:00
0a577b5f48 Merge branch 'develop' into develop-moreEmojiReactions 2024-04-02 16:26:33 +00:00
57ddee2dc9 removed search option and action bar 2024-04-02 18:24:12 +02:00
8ae8c97b41 made emojis in emoji picker bigger 2024-04-02 18:10:54 +02:00
883db8d7ef Merge pull request 'develop-unfocusTextField' (#56) from develop-unfocusTextField into develop
Reviewed-on: #56
2024-04-02 14:55:35 +00:00
6450b292a7 resolved pr comments 2024-04-02 16:45:43 +02:00
65d15ffd4e removed commented code 2024-04-02 15:51:06 +02:00
07401d0864 resolved pr comments and fixed a bug 2024-04-02 15:47:55 +02:00
21411e1517 added unfocus at textfields for custon events and feedback 2024-04-02 15:03:37 +02:00
339d402422 added unfocus when tapping outside textfield 2024-04-02 14:41:36 +02:00
c54a42aa43 added unfocus when tapping on background image 2024-04-02 14:34:35 +02:00
42574583ed added unfocus when tapping on background image 2024-04-02 14:32:37 +02:00
9aa3f7c058 added option to choose more emoji reactions 2024-04-02 14:11:48 +02:00
1b407562df Merge pull request 'old cache gets deleted' (#52) from develop-removeOldCache into develop
Reviewed-on: #52
2024-04-02 07:34:05 +00:00
f86c97dcf0 Merge branch 'develop' into develop-removeOldCache 2024-04-02 07:33:13 +00:00
6b4d6a1c8c Merge pull request 'develop-biggerFeedbackWidget' (#51) from develop-biggerFeedbackWidget into develop
Reviewed-on: #51
2024-04-02 07:32:51 +00:00
20dfe2c2e6 Merge branch 'develop' into develop-removeOldCache 2024-04-01 12:20:49 +00:00
6c2c305f1c old cache gets deleted 2024-04-01 14:18:23 +02:00
dbbf6f6c5c Merge branch 'develop' into develop-biggerFeedbackWidget 2024-04-01 10:57:52 +00:00
07b32f1e32 added option to attach image to feedback 2024-04-01 12:57:27 +02:00
ea329d8d64 added option to attach image to feedback 2024-03-31 21:02:47 +02:00
f45848331e added bigger feedback dialog widget 2024-03-31 15:35:12 +02:00
a1ad6aa582 updated version and dependencies 2024-03-31 14:37:08 +02:00
3e3e2579f0 Merge pull request 'added connected double lessons with own setting' (#49) from develop-connectedDoubleLessons into develop
Reviewed-on: #49
2024-03-31 10:50:58 +00:00
681b5e42c3 removed spaces 2024-03-31 12:31:53 +02:00
a0c025b58b code fixes, added isSameOrAfter for DateTime objects, added check for teacher room and status 2024-03-30 23:01:37 +01:00
20d7b16ede Merge branch 'develop' into develop-connectedDoubleLessons 2024-03-30 22:05:54 +01:00
afdc02f2a4 added connected double lessons with own setting 2024-03-30 18:26:33 +01:00
75846750f7 updated project linter-rules and enforced them 2024-03-29 18:22:55 +01:00