Commit Graph

10738 Commits

Author SHA1 Message Date
Benoit Marty ac8303bb99 Add low priority section in DM tab #3463 2021-07-19 18:43:05 +02:00
Benoit Marty ca2794193c Typo 2021-07-19 18:16:36 +02:00
Benoit Marty a34d445215
Merge pull request #3699 from vector-im/feature/bma/part_dl
Complement for #3656
2021-07-19 18:09:33 +02:00
SpiritCroc a5db52fe62 increment_version.sh: exclude "Merge branch" lines
Change-Id: I392d38c5408e7e3e1d76baffda246106536c5912
2021-07-19 16:50:32 +02:00
Benoit Marty a2996ee042 Rename var 2021-07-19 16:32:02 +02:00
Benoit Marty 765f7d634e
Merge pull request #3700 from psrpinto/fix/naming-2
Standardise casing of terms in source strings
2021-07-19 16:26:41 +02:00
SpiritCroc 37621d1fc7 Automatic SchildiChat string correction
Change-Id: I20c511ac19bfbf0bd11c0ae96a5a1ff97b19a59e
2021-07-19 16:15:39 +02:00
SpiritCroc fc8be0c8c5 Automatic upstream merge postprocessing
Change-Id: I76c44254c911cca11449d24928721ef0e01c5f3e
2021-07-19 16:15:38 +02:00
SpiritCroc 8497a307a1 Merge tag 'v1.1.13' into sc
Change-Id: Icc97ef8699b1cc96447369121f3c88582ac651bc

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineControllerInterceptorHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/filtered/FilteredRoomFooterItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
2021-07-19 16:10:57 +02:00
SpiritCroc 2aa4d868e4 [TMP] Automatic upstream merge preparation
Change-Id: Iaf09a78fbaad18a6581bfd5384239f471b007fdf
2021-07-19 16:05:39 +02:00
SpiritCroc a4f87f49dd Automatic revert to unchanged upstream strings, pt.1
Change-Id: I432f4130ab60f0a891a48609ad5bbe6a3a2b9583
2021-07-19 16:05:38 +02:00
Benoit Marty 6d1cabaee3 Version++ 2021-07-19 15:28:14 +02:00
Benoit Marty e9a668be0d Merge branch 'release/1.1.13' into main 2021-07-19 15:26:52 +02:00
Benoit Marty 1896208181 Merge branch 'release/1.1.13' into develop 2021-07-19 15:26:50 +02:00
Paulo Pinto 0bdba9eb7d Standardise casing of terms in source strings
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-19 12:47:10 +01:00
Benoit Marty 60a9f6fcb8 Changelog - fastlane 2021-07-19 13:38:08 +02:00
Benoit Marty 1894ad21e1 Changelog 2021-07-19 13:36:34 +02:00
Benoit Marty 9f631768eb Avoid crash in debug app 2021-07-19 13:34:51 +02:00
Benoit Marty 2f6d2cfe09 Avoid crash in debug app 2021-07-19 13:31:09 +02:00
Benoit Marty c21625079e Improve the template 2021-07-19 12:34:44 +02:00
Benoit Marty 6d8262077d
Merge pull request #3698 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-07-19 11:29:47 +02:00
Benoit Marty 7643cc506d Remove part file(s) in case of failure
Will not always delete part files in case of crashes
2021-07-19 11:08:03 +02:00
Benoit Marty 9c1bec94c9 Create AtomicFileCreator class to avoid code copy/paste 2021-07-19 10:59:40 +02:00
Benoit Marty 2e64f89ec6
Merge pull request #3656 from SpiritCroc/broken_downloads
Avoid incomplete downloads in cache
2021-07-19 10:50:52 +02:00
Weblate 9b829ddd04 Merge branch 'origin/develop' into Weblate. 2021-07-19 08:08:18 +00:00
Benoit Marty f51769174d `bundle update fastlane` 2021-07-19 09:55:06 +02:00
Ihor Hordiichuk 5a5486c4b9 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (23 of 23 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/uk/
2021-07-17 21:25:06 +00:00
ppnplusdf0eb2eb726b4bb3 a4cb5b1d28 Translated using Weblate (Thai)
Currently translated at 12.3% (309 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/th/
2021-07-16 16:25:05 +00:00
Benoit Marty 45efb4386b
Merge pull request #3668 from vector-im/dependabot/gradle/org.amshove.kluent-kluent-android-1.68
Bump kluent-android from 1.67 to 1.68
2021-07-16 18:05:45 +02:00
Benoit Marty 6caa2b9ae0 Fix issue with RTL
Still a pb when Mic is on, margins are not correct
2021-07-16 17:12:08 +02:00
Benoit Marty 30bb91892d Fix issue about move overflow.
Now use limit for distances
2021-07-16 16:04:50 +02:00
Benoit Marty 646dfd5029
Merge pull request #3671 from vector-im/dependabot/gradle/kotlin_version-1.5.21
Bump kotlin_version from 1.5.20 to 1.5.21
2021-07-16 15:28:59 +02:00
Benoit Marty 3116b1a1c4
Merge pull request #3680 from psrpinto/fix/naming
Standardise spelling and casing of homeserver, identity server, and integration manager
2021-07-16 15:26:50 +02:00
SpiritCroc e985d18df6 increment_version.sh: Fix for empty changelog
Change-Id: Ic3a2a789b73a7a4c672c1edf9632bcd15f37b01e
2021-07-16 13:26:21 +02:00
SpiritCroc 0dcb14482d Increment version
Change-Id: I8c9b382eea65a87575d0642eb8bfa5bc4f0b4707
2021-07-16 12:34:43 +02:00
SpiritCroc 134dfcea81 Merge remote-tracking branch 'weblate/sc' into sc
Change-Id: Icbff97960912b362e923897d1764aeafb06b6665
2021-07-16 12:33:58 +02:00
SpiritCroc ce03789c1a increment_version.sh: Update translation before
Change-Id: I74953d63d3a944640a62923ba0f1bd6ff02ef859
2021-07-16 12:33:26 +02:00
Benoit Marty 6da4f1d84f Add comment 2021-07-16 11:19:06 +02:00
Benoit Marty 13ae0ba5f1 Convert voice message to be able to play on Android 28 and below 2021-07-16 11:00:25 +02:00
Benoit Marty 343ea42ef5 Fix issue on Android 21 2021-07-15 17:30:48 +02:00
Benoit Marty bfc70be5bb Record voice on Android 21 2021-07-15 17:23:46 +02:00
Paulo Pinto 8ce976549f Add entry to changelog
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 16:13:12 +01:00
David Langley dff8503493 fix discrepancies with web 2021-07-15 16:06:46 +01:00
Paulo Pinto 5d4e71a011 Standardise casing of integration manager
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
Paulo Pinto d39e14cc5c Standardise casing of homeserver
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
Paulo Pinto 74104d7d84 Standardise casing of identity server
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
Paulo Pinto e61c8c28bb Standardise spelling and casing of homeserver
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-15 15:58:50 +01:00
Benoit Marty 6f947e979b Split to sub fun 2021-07-15 15:14:26 +02:00
Benoit Marty bb742eb483 Handle record/play error 2021-07-15 15:06:38 +02:00
Benoit Marty 6ab9b462a3 Fix mic button color 2021-07-15 13:42:40 +02:00