Commit graph

12605 commits

Author SHA1 Message Date
Benoit Marty
48e15b1c36 Restore line deleted during GitHub conflict fixing by mistake 2022-01-04 16:15:25 +01:00
Benoit Marty
7bbea52e66
Merge branch 'develop' into feature/bma/math_final 2022-01-04 16:13:23 +01:00
Benoit Marty
0797860e4f Update changelog 2022-01-04 16:02:16 +01:00
Benoit Marty
ecc4009689 Add tooltip to explain what are the actions behind the buttons 2022-01-04 16:00:06 +01:00
Benoit Marty
39ff9da3c1
Merge pull request #4846 from vector-im/feature/dla/fix-unread-message-indicator-no-messages
Fix unread messages indicator on room list if no messages
2022-01-04 15:57:26 +01:00
Benoit Marty
ed00f9f712
Merge pull request #4848 from vector-im/cgizard/translate_error_message_joining_room
Update error message when joining room
2022-01-04 15:27:49 +01:00
Benoit Marty
e724c2e26c
Merge pull request #4849 from vector-im/feature/bma/fix_lint
Fix lint after #4843
2022-01-04 15:24:56 +01:00
Benoit Marty
c836491498
Merge pull request #4850 from vector-im/feature/bma/small_changes
Small changes
2022-01-04 15:24:39 +01:00
Benoit Marty
df957971a8 Add some logs to try to understand an error on the production app. Also propagate the exception if this is not a registration flow response. 2022-01-04 14:44:08 +01:00
Benoit Marty
d52e61413d Ask for user confirmation before deleting Widget 2022-01-04 14:32:03 +01:00
Benoit Marty
185afe403f Rename some string resources 2022-01-04 14:25:36 +01:00
Benoit Marty
3db27f89bb Remove useless comments in translations 2022-01-04 14:02:52 +01:00
Claire Gizard
63c63bc462 Update error message when joining room 2022-01-04 13:49:18 +01:00
David Langley
9f13a9df54 If latestPreviewableEvent is null we should return false(no messages in room). 2022-01-04 12:20:56 +00:00
Benoit Marty
108e924783 Remove unused strings 2022-01-04 13:17:41 +01:00
Benoit Marty
ee69ece697 Fix some typo in string resource name 2022-01-04 13:06:02 +01:00
Benoit Marty
eb875823d5 Remove unused class and resource after new poll implementation 2022-01-04 13:02:17 +01:00
Benoit Marty
64e56b0dd7 Remove unused strings 2022-01-04 12:56:36 +01:00
Benoit Marty
99d77c5bca Reanme some string (and group them together) 2022-01-04 12:51:20 +01:00
Benoit Marty
9946e64c23 Fix lint issue (TypographyDashes) 2022-01-04 12:47:46 +01:00
Benoit Marty
81e2e8db06 Fix lint issue 2022-01-04 12:42:24 +01:00
Benoit Marty
5340d16e1f
Merge pull request #4843 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-01-04 11:34:41 +01:00
Weblate
b1d18eb8b6 Merge branch 'origin/develop' into Weblate. 2022-01-04 09:35:17 +00:00
Benoit Marty
279f9e00a3
Merge pull request #4837 from vector-im/feature/bma/safe_epoxy_char_sequence
Safe epoxy char sequence
2022-01-04 09:53:49 +01:00
ariskotsomitopoulos
f1f1d59576 Github actions test 2022-01-04 00:49:39 +02:00
ariskotsomitopoulos
91bda140e9 Github actions test 2022-01-04 00:46:23 +02:00
ariskotsomitopoulos
ddfdf180c2 Github actions test 2022-01-04 00:45:57 +02:00
ariskotsomitopoulos
84c537315c Github actions test 2022-01-04 00:38:50 +02:00
ariskotsomitopoulos
ef2c32e2c9 Github actions test 2022-01-04 00:32:39 +02:00
ariskotsomitopoulos
948f75b215 Github actions test 2022-01-04 00:30:51 +02:00
ariskotsomitopoulos
da8ec4debf Github actions test 2022-01-04 00:25:52 +02:00
ariskotsomitopoulos
42002b80ed Github actions test 2022-01-04 00:23:34 +02:00
Benoit Marty
2dc88d1477 Fix code quality 2022-01-03 20:22:57 +01:00
Benoit Marty
d670d3e872
Merge pull request #4405 from vector-im/feature/fga/timeline_chunks_rework
Feature/fga/timeline chunks rework
2022-01-03 20:20:42 +01:00
ariskotsomitopoulos
925c1671a6 Add more integrations tests for threads 2022-01-03 21:09:36 +02:00
ariskotsomitopoulos
3ef960c4c3 Update copyright 2022-01-03 19:45:48 +02:00
ariskotsomitopoulos
929cc29f77 Update copyright 2022-01-03 19:18:51 +02:00
ariskotsomitopoulos
1b2ce33f7a Github actions test 2022-01-03 18:24:43 +02:00
ariskotsomitopoulos
70d1c15b89 Github actions test 2022-01-03 18:21:52 +02:00
ariskotsomitopoulos
e7dfdce057 Github actions test 2022-01-03 18:15:41 +02:00
ariskotsomitopoulos
b67199eb07 Github actions test 2022-01-03 18:12:16 +02:00
Benoit Marty
2c7df1c376
Merge pull request #4825 from vector-im/feature/bma/call_cleanup
Remove dead code and do some cleanup in CallService
2022-01-03 16:34:50 +01:00
Benoit Marty
74af485137 Small cleanup.
Remove unused methods.
2022-01-03 16:33:41 +01:00
Benoit Marty
9534abef19
Merge pull request #4745 from johnjohndoe/sharecompat
Use ShareCompat.IntentBuilder for sharing content
2022-01-03 16:11:08 +01:00
ganfra
91215854f4 Merge branch 'develop' into feature/fga/timeline_chunks_rework 2022-01-03 16:07:05 +01:00
ganfra
12b775c26d Timeline : clean after PR reviews 2022-01-03 16:06:48 +01:00
ariskotsomitopoulos
e482ef4262 First local thread integration test 2022-01-03 16:51:12 +02:00
Benoit Marty
e03c806fd8 Split long line 2022-01-03 15:30:51 +01:00
Benoit Marty
b39caeb04d 2 new enums 2022-01-03 15:27:59 +01:00
Benoit Marty
98df733257 Split long line and use Kotlin style 2022-01-03 15:25:21 +01:00