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
..
benchmark	adding benchmarking script to start monitoring build times	2021-09-23 16:20:41 +01:00
check	Merge branch 'develop' into feature/aris/threads	2022-01-27 17:11:26 +02:00
emojis	Sync Emojis	2021-11-15 00:01:55 +00:00
install
jitsi	Jitsi android-sdk-3.1.0 -> android-sdk-3.10.0	2021-11-18 15:58:40 +01:00
release	Add default description for nl-NL	2022-01-25 19:05:20 +01:00
templates	Use id from existing views instead of "hard-coded" values	2021-12-07 16:56:27 +01:00
tests
towncrier	Update template and use a more power full configuration	2021-06-18 21:35:09 +02:00
travis	Rename towncrier folder from newsfragment to changelog.d	2021-06-18 21:33:50 +02:00
workmanager
compressVideo.sh	Add script to compress video and convert to gif file	2021-12-03 17:30:30 +01:00
debug_alter_scalar_token.sh
debug_dump_filesystem.sh
debug_dump_prefs.sh
hs_diag.py
import_analytic_plan.sh	Add a script to import the plan to Element-Android project	2021-12-02 14:10:03 +01:00
import_emojis.py	Add a formatted version of emoji_picker_datasource.json. Not included in the APK.	2021-06-18 10:25:37 +02:00
import_sas_strings.py