mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-25 10:28:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
24895 commits 7 branches 124 tags 230 MiB
Commit graph

24895 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
0d399b23f7 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iff97921f1bcc03e387c4ef7c875f863ae6a51ad6
 2023-06-05 14:43:29 +02:00
SpiritCroc
f37afeee03 Merge remote-tracking branch 'origin/sc' into sc 
Change-Id: If92caa52267fa199004fd9fd51d73b2fc2725c6f
 2023-06-05 14:43:02 +02:00
Someone
7253f77204 Translated using Weblate (Vietnamese) 
Currently translated at 57.0% (101 of 177 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/vi/
 2023-05-31 14:02:40 +00:00
Nekothegamer
bae30bf0c0 Translated using Weblate (Italian) 
Currently translated at 26.5% (47 of 177 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/it/
 2023-05-25 17:01:52 +00:00
SpiritCroc
e8b50941ba Automatic SchildiChat string correction 
Change-Id: I3923e7be57b7ee80c4aaa117cfd22545ec937327
 2023-05-25 12:04:03 +02:00
SpiritCroc
74f800ed23 Automatic upstream merge postprocessing 
Change-Id: I8601f26a2925acb03824224ef56a4f58a64fad9d
 2023-05-25 12:04:02 +02:00
SpiritCroc
9614f5994d Merge tag 'v1.6.1' into sc 
Change-Id: If1da0c145abfecd01df1384bedc794d2dd4d6bef

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/read/SetReadMarkersTask.kt
	vector/src/main/java/im/vector/app/features/html/EventHtmlRenderer.kt
 2023-05-25 12:03:56 +02:00
SpiritCroc
4cdc4f1341 [TMP] Automatic upstream merge preparation 
Change-Id: Id97218e185f871ca5936f8773ce5f5b34d432e50
 2023-05-25 11:51:31 +02:00
SpiritCroc
2af92abb38 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iee117c31686e6bc899ee6568e8aa3e6a5445e60d
 2023-05-25 11:51:31 +02:00
SpiritCroc
349fbe0f23 pre_merge.sh: ignore failure during git tag 
Do not fail if tag already exists

Change-Id: I8c54fe85879e8bd1866ee96951aca406a03862ed
 2023-05-25 11:50:25 +02:00
Benoit Marty
b9cc1b6dab Merge branch 'release/1.6.1' into main 2023-05-25 11:20:18 +02:00
Benoit Marty
93e2d7d176 Adding fastlane file for version 1.6.1 2023-05-25 11:18:34 +02:00
Benoit Marty
f261a903f0 Changelog for version 1.6.1 2023-05-25 11:18:08 +02:00
Benoit Marty
82748591f9 Setting version for the release 1.6.1 2023-05-25 11:05:07 +02:00
Benoit Marty
cff9fbd008
Merge pull request #8439 from vector-im/yostyle/fix_crash_on_start_verification 
Allow stateloss on verification dialogfragment
 2023-05-25 09:36:40 +02:00
dependabot[bot]
d5d5c9009b
Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1 (#8464) 
* Bump io.element.android:wysiwyg from 1.2.2 to 2.2.1

Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 1.2.2 to 2.2.1.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/1.2.2...2.2.1)

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

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

* Fix compilation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jonnyandrew <jonnya@element.io>
 2023-05-24 10:14:22 +00:00
Valere
e4e4c2940b
Merge pull request #8441 from vector-im/feature/bca/more_migration_logs 
Add more migration logs
 2023-05-24 10:11:08 +02:00
Valere
6da05a3804
Merge pull request #8462 from vector-im/feature/bca/fix_8445 
Special text for re-verification after update
 2023-05-24 10:10:52 +02:00
Valere
9f3255dd78
Merge pull request #8458 from vector-im/feature/bca/remove_legacy_per_device_verif 
Remove legacy manually verify specific other device
 2023-05-24 01:09:29 +02:00
valere
bb59a758cf code review 2023-05-24 00:06:36 +02:00
Valere
591b08f1ff
Merge pull request #8461 from vector-im/feature/bca/fix_several_anr 
Fix several app non responsive issues
 2023-05-23 18:32:13 +02:00
Valere
df1641995e
Merge pull request #8457 from vector-im/feature/bca/fix_bad_device_list 
fix always returning live devices for current user
 2023-05-23 14:58:10 +02:00
valere
27f9be5eda Special text for re-verification after update 2023-05-23 13:08:14 +02:00
valere
19dc812719 add changelog 2023-05-23 11:01:08 +02:00
Jorge Martin Espinosa
bb09bee641
Merge pull request #8459 from vector-im/dependabot/gradle/com.likethesalad.android-stem-plugin-2.4.1 
Bump com.likethesalad.android:stem-plugin from 2.4.0 to 2.4.1
 2023-05-23 10:39:55 +02:00
valere
2ea6cdba6f Fix app non responsive 2023-05-23 08:30:58 +02:00
valere
b98d6ca55b Add changelog 2023-05-23 08:08:02 +02:00
dependabot[bot]
ccf77eb05a
Bump com.likethesalad.android:stem-plugin from 2.4.0 to 2.4.1 
Bumps com.likethesalad.android:stem-plugin from 2.4.0 to 2.4.1.

---
updated-dependencies:
- dependency-name: com.likethesalad.android:stem-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-22 23:59:34 +00:00
valere
94956a2ec6 Add change log 2023-05-22 22:37:37 +02:00
valere
517af968e6 Remove legacy manually verify specific other device 2023-05-22 22:26:26 +02:00
valere
705b17e7f1 fix always returning live devices for current user 2023-05-22 19:26:05 +02:00
SpiritCroc
035e8e3f98 Automatic SchildiChat string correction 
Change-Id: I1aab942766850577ec2097117fd56515104f0912
 2023-05-22 14:23:51 +02:00
SpiritCroc
60acebdc1e Automatic upstream merge postprocessing 
Change-Id: I42fd8cf05076e68cd11615c7c02c016f0e27d6e7
 2023-05-22 14:23:49 +02:00
SpiritCroc
d9c1ec588d Merge tag 'v1.6.0' into sc 
v1.6.0

Change-Id: Iaca4b437bc5a267c40b83a87a98eb7761dae345b

Conflicts:
	library/ui-styles/src/main/res/values/styles_app_bar_layout.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector-app/build.gradle
	vector/src/main/java/im/vector/app/core/di/ConfigurationModule.kt
	vector/src/main/java/im/vector/app/features/crypto/verification/emoji/VerificationEmojiCodeController.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsHelpAboutFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsPinFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsUrls.kt
	vector/src/main/res/layout/dialog_disclaimer_content.xml
	vector/src/main/res/xml/vector_settings_help_about.xml
 2023-05-22 14:19:46 +02:00
SpiritCroc
7999ecac6f [TMP] Automatic upstream merge preparation 
Change-Id: Ie51002a5796e281ec454fff5dd6d7c5383efc6f6
 2023-05-22 12:18:06 +02:00
SpiritCroc
04fd59de52 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: If86249f210fdad8b3ceb77b57caedf449a01fe6a
 2023-05-22 12:18:05 +02:00
Benoit Marty
aecdd475d8 Update the release script to release the flavor rustCrypto - small revert 2023-05-17 16:37:08 +02:00
Benoit Marty
66aa4226b5 version++ 2023-05-17 14:55:30 +02:00
Benoit Marty
4ca67022e6 Merge tag 'v1.6.0' into develop 
v1.6.0
 2023-05-17 14:54:24 +02:00
Benoit Marty
3b9dc50250 Merge branch 'release/1.6.0' into main 2023-05-17 14:53:53 +02:00
Benoit Marty
8d6d10206b Adding fastlane file for version 1.6.0 2023-05-17 14:53:32 +02:00
Benoit Marty
ec9b56d19a Changelog for version 1.6.0 2023-05-17 14:52:43 +02:00
valere
6e27ffc3cf Add more migration logs 2023-05-17 12:41:11 +02:00
Benoit Marty
120053a018 Update the release script to release the flavor rustCrypto. 2023-05-17 12:23:56 +02:00
Benoit Marty
134992cf0d Setting version for the release 1.6.0 2023-05-17 12:10:23 +02:00
yostyle
d6028b75c9 Add changelog 2023-05-17 11:17:54 +02:00
yostyle
dadad3501b Allow stateloss on verification dialogfragment 2023-05-17 11:10:42 +02:00
SpiritCroc
9bfec0818a Increment version 
Change-Id: I7292196817666e2f6a0b8b980f5da9d55fe7f64a
 2023-05-17 10:33:49 +02:00
SpiritCroc
1b8cef9678 Fix live location render crash for Android < 7 
Bring back proper implementation from 9ef870b927, probably gone due to mismerge?

Change-Id: I198488e57d9b800cee303373372b1fd165ddf7f1
 2023-05-16 14:41:36 +02:00
dependabot[bot]
e2afa0ccd3
Bump androidx.core:core-ktx from 1.10.0 to 1.10.1 (#8424) 2023-05-16 08:24:09 +00:00