ariskotsomitopoulos ac5caccdf9 Merge branch 'develop' into feature/aris/threads ... # Conflicts: # matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/EventEntity.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TokenChunkEventPersistor.kt # matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt # tools/check/forbidden_strings_in_code.txt # vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt # vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt # vector/src/main/res/menu/menu_timeline.xml		2022-01-07 13:29:43 +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-07 13:29:43 +02:00
emojis	Sync Emojis	2021-11-15 00:01:55 +00:00
install	Add a script to download and install APK from Buildkite	2021-03-03 20:37:19 +01:00
jitsi	Jitsi android-sdk-3.1.0 -> android-sdk-3.10.0	2021-11-18 15:58:40 +01:00
release	Use stable build tools for the release.	2021-12-14 16:37:52 +01:00
templates	Use id from existing views instead of "hard-coded" values	2021-12-07 16:56:27 +01:00
tests	Make the app react to test push	2020-10-08 22:08:48 +02:00
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	Rename package im.vector.riotx to im.vector.app (other manual changes)	2020-08-03 18:48:20 +02:00
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	Rename package im.vector.riotx to im.vector.app (other manual changes)	2020-08-03 18:48:20 +02:00
debug_dump_filesystem.sh	Rename package im.vector.riotx to im.vector.app (other manual changes)	2020-08-03 18:48:20 +02:00
debug_dump_prefs.sh	Rename package im.vector.riotx to im.vector.app (other manual changes)	2020-08-03 18:48:20 +02:00
hs_diag.py	Add homeserver version check	2021-02-19 21:27:25 +01:00
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	Create a script to import SAS strings (#1909)	2020-08-26 16:02:58 +02:00