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

24027 Commits

Author SHA1 Message Date
SpiritCroc e875b0d731 Automatic SchildiChat string correction 
Change-Id: I58e45b4ec199646ae34c92b027994511fcb43276
 2023-03-08 20:40:41 +01:00
SpiritCroc 6103512e86 Automatic upstream merge postprocessing 
Change-Id: Ied644879ce9c28c8f1f9fc45e9c26bd203c97aac
 2023-03-08 20:40:40 +01:00
SpiritCroc 4147b06d08 [merge] Fix build 
Change-Id: I05a3dbb9e136f30c429bcc67670bb9411f6476a7
 2023-03-08 20:38:16 +01:00
SpiritCroc 8b2e5b561a [TMP] Revert "Bump glide from 4.14.2 to 4.15.0" 
webpdecoder not updated yet

This reverts commit 370d58e876.

Change-Id: Ib0910b98d60d86124e25684c3d0fd3383d310d32
 2023-03-08 20:32:28 +01:00
SpiritCroc 19881a9f70 Merge tag 'v1.5.28' into sc 
Change-Id: Ic5e1c79d3c39476375bf795bb7a1abb67c664f94

Conflicts:
	dependencies.gradle
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/RichTextComposerLayout.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_text_message_rich_stub.xml
 2023-03-08 20:27:57 +01:00
SpiritCroc cf4929f6cb [TMP] Automatic upstream merge preparation 
Change-Id: I8f7e9e1fc3937a011f4f57414e4f761ee51c173a
 2023-03-08 20:20:33 +01:00
SpiritCroc 1912a995ec Automatic revert to unchanged upstream strings, pt.1 
Change-Id: If46704e6abf6819ca45c304444b33377e21d0f50
 2023-03-08 20:20:33 +01:00
ganfra 7ce1842f87 Merge branch 'release/1.5.28' into main 2023-03-08 17:30:55 +01:00
ganfra 7282c30872 Adding fastlane file for version 1.5.28 2023-03-08 17:28:05 +01:00
ganfra 671095fed0 Changelog for version 1.5.28 2023-03-08 17:27:22 +01:00
ganfra fc796154ea
Merge pull request #8193 from vector-im/feature/bma/certList 
Be able to let the user trust several Fingerprints during login flow.
 2023-03-08 11:53:43 +01:00
dependabot[bot] d5f75c6f9a
Bump appDistribution from 16.0.0-beta05 to 16.0.0-beta06 (#8198) 
Bumps `appDistribution` from 16.0.0-beta05 to 16.0.0-beta06.

Updates `com.google.firebase:firebase-appdistribution-api-ktx` from 16.0.0-beta05 to 16.0.0-beta06
- [Release notes](https://github.com/firebase/firebase-android-sdk/releases)
- [Changelog](https://github.com/firebase/firebase-android-sdk/blob/master/docs/make_release_notes.py)
- [Commits](https://github.com/firebase/firebase-android-sdk/commits)

Updates `com.google.firebase:firebase-appdistribution` from 16.0.0-beta05 to 16.0.0-beta06
- [Release notes](https://github.com/firebase/firebase-android-sdk/releases)
- [Changelog](https://github.com/firebase/firebase-android-sdk/blob/master/docs/make_release_notes.py)
- [Commits](https://github.com/firebase/firebase-android-sdk/commits)

---
updated-dependencies:
- dependency-name: com.google.firebase:firebase-appdistribution-api-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.firebase:firebase-appdistribution
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-08 10:53:25 +00:00
Linerly e4034fc751 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (172 of 172 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/id/
 2023-03-07 16:38:01 +00:00
waclaw66 0c831e01f8 Translated using Weblate (Czech) 
Currently translated at 100.0% (172 of 172 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/cs/
 2023-03-07 16:38:01 +00:00
dependabot[bot] 7c23776ea1
Bump org.checkerframework:checker from 3.30.0 to 3.32.0 (#8197) 
Bumps [org.checkerframework:checker](https://github.com/typetools/checker-framework) from 3.30.0 to 3.32.0.
- [Release notes](https://github.com/typetools/checker-framework/releases)
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.30.0...checker-framework-3.32.0)

---
updated-dependencies:
- dependency-name: org.checkerframework:checker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-07 15:53:34 +00:00
Benoit Marty 9e47d0efc3
Merge pull request #8222 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2023-03-07 14:33:47 +01:00
dependabot[bot] 8e89d09b1b Bump io.sentry:sentry-android from 6.14.0 to 6.15.0 
Bumps [io.sentry:sentry-android](https://github.com/getsentry/sentry-java) from 6.14.0 to 6.15.0.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.14.0...6.15.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-07 14:14:06 +01:00
dependabot[bot] 60b19aac65
Bump com.android.tools.build:gradle from 7.4.1 to 7.4.2 (#8183) 
Bumps com.android.tools.build:gradle from 7.4.1 to 7.4.2.

---
updated-dependencies:
- dependency-name: com.android.tools.build:gradle
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-07 12:47:56 +01:00
Benoit Marty c122e43f37
Merge pull request #8214 from vector-im/dependabot/github_actions/danger/danger-js-11.2.4 
Bump danger/danger-js from 11.2.3 to 11.2.4
 2023-03-07 11:55:30 +01:00
Weblate e61ca13b66 Merge branch 'origin/develop' into Weblate. 2023-03-07 10:33:45 +00:00
random 0c5fea2029 Translated using Weblate (Italian) 
Currently translated at 100.0% (94 of 94 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/it/
 2023-03-07 10:33:43 +00:00
sonata-chen 5763926dfe Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-03-07 10:33:41 +00:00
Peter Chen d790ee474e Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-03-07 10:33:41 +00:00
random 9037c6f8da Translated using Weblate (Italian) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/it/
 2023-03-07 10:33:40 +00:00
Florian Renaud 39c702f41b
Merge pull request #8170 from vector-im/feature/fre/apply_push_rules_after_decryption 
Reapply push rules on the decrypted event source (PSG-1146)
 2023-03-07 10:39:48 +01:00
dependabot[bot] 4c1c0ce6a3
Bump danger/danger-js from 11.2.3 to 11.2.4 
Bumps [danger/danger-js](https://github.com/danger/danger-js) from 11.2.3 to 11.2.4.
- [Release notes](https://github.com/danger/danger-js/releases)
- [Changelog](https://github.com/danger/danger-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/danger/danger-js/compare/11.2.3...11.2.4)

---
updated-dependencies:
- dependency-name: danger/danger-js
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-06 23:57:30 +00:00
Yoan Pintas 94675b9f85
create encrypted DM for user invite by email (#8172) 
Co-authored-by: jonnyandrew <jonny.andrew@protonmail.com>
 2023-03-06 22:05:43 +00:00
jonnyandrew 29f2bf25fc
Extend workaround for extra new lines in timeline (#8187) 
* Extend workaround for extra new lines in timeline

Closes vector-im/element-android#8179

Caused by noties/Markwon#423

* Refactor

Co-authored-by: Yoan Pintas <y.pintas@gmail.com>

---------

Co-authored-by: Yoan Pintas <y.pintas@gmail.com>
 2023-03-06 16:03:53 +00:00
Benoit Marty 8595bd2be8 Fix compilation issue. 2023-03-06 15:50:39 +01:00
SpiritCroc e4e4e0a388 Support rendering emote pack display name 
Change-Id: I93b422f3931128dd75de8ee570c56976a93702c8
 2023-03-06 11:28:05 +01:00
SpiritCroc e3a7ef911e Allow custom emote packs with state keys 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/184

Change-Id: I79ede7f9b45ff762b367c4b5cd048987e4f25515
 2023-03-06 10:32:16 +01:00
Benoit Marty 5eded5cb8d
Merge pull request #8211 from vector-im/sync-analytics-plan 
Sync analytics plan
 2023-03-06 09:50:34 +01:00
Florian Renaud 21c7fc3d0a Merge remote-tracking branch 'origin/develop' into feature/fre/apply_push_rules_after_decryption 2023-03-06 09:11:48 +01:00
dependabot[bot] 5117727827
Bump org.jlleitschuh.gradle.ktlint from 11.2.0 to 11.3.1 (#8205) 
Bumps org.jlleitschuh.gradle.ktlint from 11.2.0 to 11.3.1.

---
updated-dependencies:
- dependency-name: org.jlleitschuh.gradle.ktlint
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-03-06 07:56:57 +01:00
bmarty a6211a1da3 Sync analytics plan 2023-03-06 00:03:43 +00:00
SpiritCroc 1f7ff4aec7 Increment version 
Change-Id: I9677db74deb15c841e318002f2781ea13b2d5dfa
 2023-03-05 10:18:41 +01:00
DarkCoder15 49d91fb9e6 Translated using Weblate (Russian) 
Currently translated at 100.0% (171 of 171 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/ru/
 2023-03-05 08:21:27 +00:00
SpiritCroc 5081f665ea Include some experimental settings in rageshakes 
Change-Id: I23e313089409df88518446720bdf69a6f112de4b
 2023-03-04 15:45:27 +01:00
SpiritCroc 16f7cb4b8d Prefer caption over generic text for image/video message previews 
Change-Id: I0cfbae4df14b7f8327e56afd152f0e1fffb93c45
 2023-03-04 15:44:57 +01:00
sonata-chen b1b00b00be Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-03-04 14:25:52 +00:00
Peter Chen f7fffcdd67 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-03-04 14:25:45 +00:00
sonata-chen 36ed81749e Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-03-04 14:24:00 +00:00
Weblate 7abc7b1bf1 Merge branch 'origin/develop' into Weblate. 2023-03-04 14:22:56 +00:00
Open Culture Foundation 257a2cfb5a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (94 of 94 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/zh_Hant/
 2023-03-04 14:22:56 +00:00
Peter Chen 254c31b736 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-03-04 14:22:53 +00:00
Open Culture Foundation ee92f0cd05 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-03-04 14:22:52 +00:00
sonata-chen 8abbe6ae38 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2607 of 2607 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/zh_Hant/
 2023-03-04 14:22:50 +00:00
Benoit Marty 97b47302ef
Merge pull request #8202 from vector-im/feature/bma/fixCi 
Fix CI
 2023-03-03 21:14:16 +01:00
Weblate 184bc19c27 Merge branch 'origin/develop' into Weblate. 2023-03-03 19:33:43 +00:00
Szimszon 0051e922ea Translated using Weblate (Hungarian) 
Currently translated at 100.0% (94 of 94 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/hu/
 2023-03-03 19:33:41 +00:00