ariskotsomitopoulos
b2a2fe2710
Merge branch 'develop' into feature/aris/threads
...
# Conflicts:
# matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/relation/RelationService.kt
# tools/check/forbidden_strings_in_code.txt
# vector/build.gradle
# vector/src/main/java/im/vector/app/core/di/FragmentModule.kt
# vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
# vector/src/main/java/im/vector/app/features/command/Command.kt
# vector/src/main/java/im/vector/app/features/command/CommandParser.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewState.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewModel.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultItem.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/TimelineEventController.kt
# vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
# vector/src/main/java/im/vector/app/features/navigation/Navigator.kt
# vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
# vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
# vector/src/main/res/layout/fragment_timeline.xml
# vector/src/main/res/xml/vector_settings_labs.xml
2022-01-27 17:11:26 +02:00
ariskotsomitopoulos
b83872d5f0
When show all threads developer mode option is enabled, prevent reply in thread to those events
2022-01-27 16:38:14 +02:00
Benoit Marty
ff6810f1f4
Merge pull request #5062 from vector-im/feature/bma/location_sharing_fix
...
Ensure mapbox legal mention are displayed on the map
2022-01-27 15:35:52 +01:00
Benoit Marty
2e36ca5650
Merge pull request #5070 from vector-im/feature/bma/test_screens
...
Test screens in the settings
2022-01-27 14:21:10 +01:00
Benoit Marty
c6ee513ba1
Merge pull request #5069 from vector-im/feature/ons/fix_end_poll
...
Allow ending polls if user created it
2022-01-27 14:09:18 +01:00
ariskotsomitopoulos
554ece724e
- Remove counter from thread notifications
...
- Fix red dot on user mentioning
2022-01-27 14:55:34 +02:00
ariskotsomitopoulos
f53b711e0d
When thread disabled add thread replies within threads ( to the users with threads enabled )
2022-01-27 13:49:03 +02:00
ariskotsomitopoulos
358a7d0ec4
Handle latest thread message & root thread edition to update thread summary and thread list appropriately
2022-01-27 13:22:04 +02:00
Benoit Marty
1518a08c29
Fix towncrier mistake due to file extension change
2022-01-27 12:17:25 +01:00
Benoit Marty
eacdf7f55d
Merge pull request #5071 from vector-im/feature/bma/wording
...
Instruction for the next weblate sync
2022-01-27 10:00:03 +01:00
Benoit Marty
590f4bee25
Merge pull request #5073 from vector-im/feature/adm/instrumentation-modification-error
...
Fixing concurrent modification espresso errors
2022-01-27 09:59:24 +01:00
Onuray Sahin
2ad7a020cf
Current user is not a king to end polls, check event sender id instead.
2022-01-27 00:00:29 +03:00
Adam Brown
19a46afe7b
untracking activities during espresso runs as soon as they're idle
...
- Sometimes activities are instantly idle without going through the lifecycleChanged callback which means we were registering callsbacks which were duplicated and triggering for later waits
2022-01-26 18:47:24 +00:00
Benoit Marty
6c79be1c68
Instruction for the next weblate sync
2022-01-26 18:16:35 +01:00
Benoit Marty
891367752b
Test the legals screen ( #4709 )
2022-01-26 18:00:49 +01:00
Benoit Marty
5989d6b82a
Test analytics opt-in screen from the settings
2022-01-26 17:41:09 +01:00
Benoit Marty
62a554b5e2
Changelog
2022-01-26 17:01:52 +01:00
Benoit Marty
6107fb644d
Flatten View hierarchy
2022-01-26 17:00:36 +01:00
Onuray Sahin
db1152cb72
Allow ending polls if user created it.
2022-01-26 17:50:31 +03:00
ariskotsomitopoulos
92d082c26a
Improve thread message deletion
...
Fix thread summary after isLimited events
2022-01-26 14:07:07 +02:00
Benoit Marty
d127e0c39d
Fix buildkite build
2022-01-26 11:55:44 +01:00
Benoit Marty
793cdf8f87
Ensure mapbox legal mention are displayed on the map
2022-01-26 00:22:07 +01:00
Benoit Marty
38a6c3ea61
Merge branch 'develop' of github.com:vector-im/element-android into develop
2022-01-25 21:50:12 +01:00
Benoit Marty
fe5109fead
Version++
2022-01-25 21:48:18 +01:00
Benoit Marty
e6c5ce63a0
Merge branch 'release/1.3.16' into develop
2022-01-25 21:46:50 +01:00
Benoit Marty
2544559fb3
fastlane
2022-01-25 21:46:34 +01:00
Benoit Marty
00928308c8
Update the changelog manually
2022-01-25 21:45:05 +01:00
Benoit Marty
bf1ef3ce56
Towncrier
2022-01-25 21:42:37 +01:00
Benoit Marty
f6d7959cdc
Fix sanity test
2022-01-25 21:37:24 +01:00
Benoit Marty
b1882a1d3b
Merge pull request #5060 from vector-im/feature/adm/build-quality-errors
...
build quality errors
2022-01-25 20:49:39 +01:00
Benoit Marty
539b29e4ed
Merge pull request #5059 from vector-im/feature/bma/weblate_cleanup
...
Cleanup string resource during Weblate sync
2022-01-25 20:10:43 +01:00
Adam Brown
523f4eeabf
using material card view instead of androidx cardview
2022-01-25 18:15:32 +00:00
Benoit Marty
2177934073
Title is now limited to 30 chars by the PlayStore
2022-01-25 19:08:46 +01:00
Benoit Marty
76599af088
Add default description for nl-NL
2022-01-25 19:05:20 +01:00
Benoit Marty
d9ba4c9c7c
Title is now limited to 30 chars by the PlayStore
2022-01-25 19:03:04 +01:00
Adam Brown
0fda2a125a
fixing line length
2022-01-25 17:58:51 +00:00
Benoit Marty
e8b34c70c0
Rename folder for fastlane
2022-01-25 18:50:09 +01:00
Benoit Marty
a7925eef73
Update fastlane, it then generates this...
2022-01-25 18:49:00 +01:00
Benoit Marty
ac82e8afd2
Rename folder for fastlane
2022-01-25 18:48:30 +01:00
Benoit Marty
b4e5a3a6df
Remove unused string
2022-01-25 18:34:06 +01:00
Benoit Marty
d501447544
Remove unused string
2022-01-25 18:33:06 +01:00
Benoit Marty
58b2050baf
Rename string
2022-01-25 18:18:47 +01:00
Benoit Marty
f4f0b36b05
Remove unused string
2022-01-25 18:18:11 +01:00
Benoit Marty
fa07271074
Rename some resource: kick -> remove
2022-01-25 18:15:22 +01:00
Benoit Marty
210ef74f62
Remove unused string
2022-01-25 18:13:03 +01:00
Benoit Marty
ece93caae3
Rename some resource: kick -> remove
2022-01-25 18:10:59 +01:00
Benoit Marty
41628ea511
Merge pull request #5057 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2022-01-25 18:07:01 +01:00
Benoit Marty
f14bf0dd50
Merge pull request #4817 from vector-im/feature/ons/static_location
...
Static Location Sharing
2022-01-25 18:03:17 +01:00
Benoit Marty
f83c2b32bc
Add summary to location sharing setting
2022-01-25 17:59:22 +01:00
Benoit Marty
823ece9582
Add licence mention as per https://github.com/maplibre/maplibre-gl-native/blob/master/LICENSE.md
2022-01-25 17:51:17 +01:00
