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

23074 Commits

Author SHA1 Message Date
SpiritCroc b9d312c40d Automatic upstream merge postprocessing 
Change-Id: I2d61b69195b3cd5033ad1014070ebd4b7bee436c
 2023-01-13 15:53:51 +01:00
SpiritCroc d4cb55eeaa Merge tag 'v1.5.20' into sc 
Change-Id: I438392b41ebe84dccfae1639ae90102c3d45c680

Conflicts:
	dependencies.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/store/db/RealmCryptoStore.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineChunk.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
	vector/src/main/java/im/vector/app/core/resources/StringProvider.kt
	vector/src/main/res/xml/vector_settings_advanced_settings.xml
 2023-01-13 14:50:46 +01:00
SpiritCroc b8cbc10ca3 [TMP] Automatic upstream merge preparation 
Change-Id: I0dfb163330468cf676dbe35b2fe07699f2c072cf
 2023-01-13 14:43:06 +01:00
SpiritCroc c8d7710e27 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Id98245b4107a678e502fe15547094d72c4ffc54b
 2023-01-13 14:43:05 +01:00
Benoit Marty 3e947e4379 Merge branch 'release/1.5.20' into main 2023-01-10 16:23:32 +01:00
Benoit Marty 1c2988a709 Merge branch 'release/1.5.20' into main 2023-01-10 16:22:02 +01:00
Benoit Marty b0cb694f81 Adding fastlane file for version 1.5.20 2023-01-10 16:21:56 +01:00
Benoit Marty a11c74d21c Changelog for version 1.5.20 2023-01-10 16:21:33 +01:00
Benoit Marty e384669d85
Merge pull request #5717 from thefirstofthe300/increase-message-font-size 
fix: increase font size for messages
 2023-01-10 15:16:39 +01:00
Benoit Marty 31a0a049b1
Merge pull request #7432 from ByeongsuPark/feature/bspark/enhancement-7111-trim-username 
Add trim to username input when sign-in
 2023-01-10 14:38:56 +01:00
Benoit Marty 94a2453861
Merge pull request #7921 from vector-im/dependabot/bundler/git-1.13.0 
Bump git from 1.11.0 to 1.13.0
 2023-01-10 14:26:33 +01:00
Benoit Marty c06c54d6b6
Merge pull request #7907 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.13.4 
Bump libphonenumber from 8.13.3 to 8.13.4
 2023-01-10 14:25:47 +01:00
Benoit Marty 4c4f3ff11d
Merge pull request #7810 from vector-im/dependabot/gradle/com.gabrielittner.threetenbp-lazythreetenbp-0.13.0 
Bump lazythreetenbp from 0.12.0 to 0.13.0
 2023-01-10 14:21:14 +01:00
Benoit Marty ce863015ce
Merge pull request #7716 from vector-im/dependabot/gradle/com.google.android.gms-oss-licenses-plugin-0.10.6 
Bump oss-licenses-plugin from 0.10.5 to 0.10.6
 2023-01-10 14:20:41 +01:00
Benoit Marty ac482b1389
Merge pull request #7917 from vector-im/feature/bma/viewEventReplay 
View event replay
 2023-01-10 14:10:14 +01:00
Benoit Marty 4f829f11d8
Merge pull request #7918 from vector-im/feature/bma/pushRuleModel 
Remove the "device" field from get `/pushrules` response model.
 2023-01-10 11:15:03 +01:00
Benoit Marty 02c61d3fb5 Fix view event replay 2023-01-10 10:51:58 +01:00
dependabot[bot] da7fcbcf83
Bump git from 1.11.0 to 1.13.0 
Bumps [git](https://github.com/ruby-git/ruby-git) from 1.11.0 to 1.13.0.
- [Release notes](https://github.com/ruby-git/ruby-git/releases)
- [Changelog](https://github.com/ruby-git/ruby-git/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ruby-git/ruby-git/compare/v1.11.0...v1.13.0)

---
updated-dependencies:
- dependency-name: git
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-09 22:01:21 +00:00
Benoit Marty 6eece5b270 Remove the "device" field from get `/pushrules` response model. 2023-01-09 18:07:47 +01:00
Benoit Marty 08f56660ab
Merge pull request #7908 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-01-09 17:38:14 +01:00
Benoit Marty ffb11d6455
Merge pull request #7913 from vector-im/feature/bma/threadListCrashes 
Thread list crashes
 2023-01-09 17:00:06 +01:00
Benoit Marty cceb1cd66c Add constraint on T. It has to extend `VectorViewEvents` 2023-01-09 16:39:12 +01:00
Benoit Marty 81234b3a5b Changelog 2023-01-09 14:37:35 +01:00
Benoit Marty ca3d441de0 Handle error in the thread list request. 2023-01-09 14:16:12 +01:00
Benoit Marty ce0c514dae Fix link on doc. 2023-01-09 14:11:16 +01:00
dependabot[bot] 4860fae7c4
Bump oss-licenses-plugin from 0.10.5 to 0.10.6 
Bumps oss-licenses-plugin from 0.10.5 to 0.10.6.

---
updated-dependencies:
- dependency-name: com.google.android.gms:oss-licenses-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-09 08:56:28 +00:00
Benoit Marty ffba01cabd
Merge pull request #7906 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.4.4 
Bump dependency-check-gradle from 7.4.3 to 7.4.4
 2023-01-09 09:55:32 +01:00
Weblate fe3b05cc55 Merge branch 'origin/develop' into Weblate. 2023-01-07 17:33:32 +00:00
random 096a8fdd3d Translated using Weblate (Italian) 
Currently translated at 100.0% (89 of 89 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2023-01-07 17:33:31 +00:00
Jeff Huang 1dec87356f Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-01-07 17:33:29 +00:00
Ihor Hordiichuk 9ae418ddea Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
 2023-01-07 17:33:28 +00:00
Besnik Bleta dd148443b2 Translated using Weblate (Albanian) 
Currently translated at 99.2% (2566 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sq/
 2023-01-07 17:33:27 +00:00
Jozef Gaal e7e8e485a0 Translated using Weblate (Slovak) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/sk/
 2023-01-07 17:33:26 +00:00
random f5c489e5f7 Translated using Weblate (Italian) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2023-01-07 17:33:26 +00:00
Linerly 1deceaecdb Translated using Weblate (Indonesian) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/id/
 2023-01-07 17:33:25 +00:00
Glandos 6840e52d30 Translated using Weblate (French) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fr/
 2023-01-07 17:33:24 +00:00
Danial Behzadi 8c3fcf989e Translated using Weblate (Persian) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fa/
 2023-01-07 17:33:23 +00:00
Priit Jõerüüt c0010140a3 Translated using Weblate (Estonian) 
Currently translated at 99.6% (2577 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/et/
 2023-01-07 17:33:23 +00:00
Vri c2c8df9e8e Translated using Weblate (German) 
Currently translated at 100.0% (2585 of 2585 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2023-01-07 17:33:22 +00:00
dependabot[bot] 0511191e51
Bump libphonenumber from 8.13.3 to 8.13.4 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.13.3 to 8.13.4.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.13.3...v8.13.4)

---
updated-dependencies:
- dependency-name: com.googlecode.libphonenumber:libphonenumber
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-06 23:04:16 +00:00
dependabot[bot] d0880095ea
Bump dependency-check-gradle from 7.4.3 to 7.4.4 
Bumps dependency-check-gradle from 7.4.3 to 7.4.4.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-06 23:03:28 +00:00
dependabot[bot] 8784b7d3b7
Bump wysiwyg from 0.13.0 to 0.14.0 (#7902) 
Bumps [wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 0.13.0 to 0.14.0.
- [Release notes](https://github.com/matrix-org/matrix-wysiwyg/releases)
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/0.13.0...0.14.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-01-06 18:18:15 +00:00
Benoit Marty a588989d13
Merge pull request #7875 from vector-im/feature/bma/releaseScript3 
Release script update
 2023-01-06 18:45:18 +01:00
Benoit Marty 56067300e0
Merge pull request #7905 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-01-06 18:44:55 +01:00
Benoit Marty baa46634b5
Merge pull request #7885 from vector-im/feature/bma/fixLint 
Fix lint false positive
 2023-01-06 18:44:37 +01:00
Benoit Marty 93021a6028
Merge pull request #7724 from vector-im/feature/bma/launchWhenResumed 
Observe ViewEvents only when resumed
 2023-01-06 18:43:53 +01:00
Benoit Marty e9d1de8fba Fix compilation issue after rebase. 2023-01-06 17:36:40 +01:00
Weblate 330a9be787 Merge branch 'origin/develop' into Weblate. 2023-01-06 16:33:47 +00:00
Linerly 4f2550ae92 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (89 of 89 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
 2023-01-06 16:33:44 +00:00
waclaw66 5734a270d8 Translated using Weblate (Czech) 
Currently translated at 100.0% (89 of 89 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/cs/
 2023-01-06 16:33:42 +00:00