Commit Graph

14043 Commits

Author SHA1 Message Date
SpiritCroc 7b9da40e52 [merge] Use java 11 again, pt.2
Change-Id: I136053222ffa1a264ce97a9d6ec51515e10208a0
2022-01-29 14:59:20 +01:00
SpiritCroc a9d5700d2b Merge tag 'v1.3.16' into sc
Change-Id: I8b3937f4ac30d3e72e2cb694eee2dc5bf034cb75

Conflicts:
	gradle.properties
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/pushrules/EventMatchCondition.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/Timeline.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/di/NetworkModule.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.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/job/SyncThread.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/job/SyncWorker.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.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/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerViewState.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/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MatrixItemColorProvider.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineEventVisibilityHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReportActivity.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/res/layout/activity_call.xml
	vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
	vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/layout/view_voice_message_recorder.xml
	vector/src/main/res/values/config.xml
	vector/src/main/res/xml/vector_settings_labs.xml
2022-01-29 12:18:19 +01:00
SpiritCroc 0eddb5ed75 [TMP] Automatic upstream merge preparation
Change-Id: I367672d6824d7e49f7393247372314c816d05ceb
2022-01-29 10:36:12 +01:00
SpiritCroc a7f1d68f38 Automatic revert to unchanged upstream strings, pt.1
Change-Id: Iaff18aadc34781f6d4d4ba93e4017373ee9feb37
2022-01-29 10:36:12 +01:00
SpiritCroc beb2b1e8a0 [merge] Use Java 11 again
Change-Id: I3cc03216236097f4ba7b9de320fc927a603885a3
2022-01-29 10:35:54 +01:00
Benoit Marty c657586de3 Merge branch 'release/1.3.16' into main 2022-01-25 21:46:51 +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 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
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
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
Benoit Marty 871b05b641
Merge pull request #5019 from vector-im/feature/bca/auto_uisi_update
Quick fixes on auto uisi RS
2022-01-25 16:41:01 +01:00
Valere 14da9806e2 Put bug report app names in config 2022-01-25 16:35:16 +01:00
Weblate c5a213ff68 Merge branch 'origin/develop' into Weblate. 2022-01-25 15:30:46 +00:00
Baxtiyor M 43bccb1d42 Translated using Weblate (Kara-Kalpak)
Currently translated at 0.3% (10 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/kaa/
2022-01-25 15:30:39 +00:00
kingoflove819 eca20b2441 Translated using Weblate (Tamil)
Currently translated at 0.1% (1 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ta/
2022-01-25 15:30:37 +00:00
Baxtiyor M c0c66acad0 Translated using Weblate (Uzbek)
Currently translated at 3.8% (106 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uz/
2022-01-25 15:30:37 +00:00
Ihor Hordiichuk 7c96ab27e0 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-01-25 15:30:37 +00:00
LinAGKar a634987d1b Translated using Weblate (Swedish)
Currently translated at 99.9% (2728 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sv/
2022-01-25 15:30:36 +00:00
Peter Vágner d6f62bc2a5 Translated using Weblate (Slovak)
Currently translated at 69.9% (1910 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-01-25 15:30:35 +00:00
Jozef Gaal 206f69e3dd Translated using Weblate (Slovak)
Currently translated at 69.9% (1910 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
2022-01-25 15:30:29 +00:00
lvre a2e25205e6 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
2022-01-25 15:30:29 +00:00
m1chj 8b5542216e Translated using Weblate (Polish)
Currently translated at 97.6% (2665 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
2022-01-25 15:30:28 +00:00
maciejek997 b3414d6534 Translated using Weblate (Polish)
Currently translated at 97.6% (2665 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
2022-01-25 15:30:28 +00:00
Johan Smits b4f77d314e Translated using Weblate (Dutch)
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/nl/
2022-01-25 15:30:26 +00:00
Linerly 500ffa0d1d Translated using Weblate (Indonesian)
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
2022-01-25 15:30:12 +00:00
Szimszon 0e081a1c90 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/hu/
2022-01-25 15:30:11 +00:00
libexus 56a1cd7b41 Translated using Weblate (German)
Currently translated at 99.7% (2723 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
2022-01-25 15:30:10 +00:00
waclaw66 65f54c854f Translated using Weblate (Czech)
Currently translated at 100.0% (2729 of 2729 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/cs/
2022-01-25 15:30:09 +00:00
Benoit Marty bca65281b6
Merge pull request #5025 from vector-im/feature/adm/use-case-dark-mode
Updating use case icons to match designs
2022-01-25 16:06:40 +01:00
Benoit Marty 1ee29555c6 Merge branch 'develop' into feature/ons/static_location 2022-01-25 16:01:16 +01:00
Benoit Marty 589cfeb0cc ktlint 2022-01-25 16:00:52 +01:00
Benoit Marty 7aba03c60a
Merge pull request #5056 from vector-im/feature/bma/fix_toolbar_title
Fix toolbar title
2022-01-25 15:55:34 +01:00