filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,336 Commits 6 Branches 120 Tags 228 MiB
Commit Graph

10336 Commits

Author SHA1 Message Date
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 e9a668be0d Merge branch 'release/1.1.13' into main 2021-07-19 15:26:52 +02: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
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 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
Paulo Pinto 8ce976549f Add entry to changelog 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-15 16:13:12 +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
Besnik Bleta 98aec941e2 Translated using Weblate (Albanian) 
Currently translated at 99.5% (2483 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2021-07-15 11:25:06 +00:00
Paulo Pinto 1dfb10d174 Translated using Weblate (Portuguese) 
Currently translated at 33.8% (843 of 2494 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt/
 2021-07-15 11:25:05 +00:00
Benoit Marty 8757d0269f Added translation using Weblate (English (United Kingdom)) 2021-07-15 09:58:23 +00:00
Frisk ccaadcbd4f Translated using Weblate (Polish) 
Currently translated at 22.5% (14 of 62 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/pl/
 2021-07-15 11:27:06 +02:00
SeedPuller f1fe9055c4 Added translation using Weblate (Persian) 2021-07-15 11:27:06 +02:00
Weblate aeb830d639 Added translation using Weblate (Polish) 2021-07-15 11:27:06 +02:00
SpiritCroc b7d0ce7857 Deleted translation using Weblate (English (United States)) 2021-07-15 11:27:06 +02:00
Weblate f59f75a1ee Added translation using Weblate (English (United States)) 2021-07-15 11:27:06 +02:00
J. Lavoie 5b20f53c9f Translated using Weblate (French) 
Currently translated at 100.0% (54 of 54 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/schildichat-android/fr/
 2021-07-15 11:27:06 +02:00
SpiritCroc dc34334e3c Fix RTL language reply rendering issues 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/74

Change-Id: I2c24950506158fdde11f5d13b177e11fe894bde9
 2021-07-15 11:17:39 +02:00
dependabot[bot] 2afac82c81
Bump kotlin_version from 1.5.20 to 1.5.21 
Bumps `kotlin_version` from 1.5.20 to 1.5.21.

Updates `kotlin-gradle-plugin` from 1.5.20 to 1.5.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.21)

Updates `kotlin-stdlib-jdk7` from 1.5.20 to 1.5.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.21)

Updates `kotlin-stdlib` from 1.5.20 to 1.5.21
- [Release notes](https://github.com/JetBrains/kotlin/releases)
- [Changelog](https://github.com/JetBrains/kotlin/blob/v1.5.21/ChangeLog.md)
- [Commits](https://github.com/JetBrains/kotlin/compare/v1.5.20...v1.5.21)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib-jdk7
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlin:kotlin-stdlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-13 23:08:48 +00:00
Benoit Marty c08bd664ab
Merge pull request #3667 from vector-im/feature/bma/permission 
Permission rework
 2021-07-13 10:33:40 +02:00
Benoit Marty 34723ce4f7 Cleanup 2021-07-13 10:27:29 +02:00
Benoit Marty 0f27971c96
Merge pull request #3661 from SpiritCroc/emoji_reaction_top_row 
Fix top row of emoji reaction picker on small displays
 2021-07-13 01:10:15 +02:00
dependabot[bot] b0ea022eea
Bump kluent-android from 1.67 to 1.68 
Bumps [kluent-android](https://github.com/MarkusAmshove/Kluent) from 1.67 to 1.68.
- [Release notes](https://github.com/MarkusAmshove/Kluent/releases)
- [Changelog](https://github.com/MarkusAmshove/Kluent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MarkusAmshove/Kluent/commits)

---
updated-dependencies:
- dependency-name: org.amshove.kluent:kluent-android
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-12 23:07:08 +00:00
Benoit Marty 76ab34f1a6 Cleanup 2021-07-13 00:41:26 +02:00
Benoit Marty 59e3b421bb Cleanup 2021-07-13 00:33:29 +02:00
Benoit Marty cc042f2d7a Fail fast 2021-07-13 00:31:05 +02:00
Benoit Marty b553ee2a76 changelog 2021-07-13 00:26:21 +02:00
Benoit Marty 067349f602 Fix some misunderstanding about the permissions request - step 2 2021-07-13 00:22:23 +02:00
Benoit Marty 80657251a5 Fix some misunderstanding about the permissions request - step 1 2021-07-12 23:47:33 +02:00
Benoit Marty fabbd6da9e Add action to see permission status in the DebugActivity 2021-07-12 22:12:51 +02:00
Benoit Marty cca9a8007c Use new permission request management 
I do not know why all has not been migrated in the previous rework
 2021-07-12 21:18:01 +02:00