mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-18 15:22:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
25743 commits 7 branches 122 tags 229 MiB
Commit graph

25743 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
a902199fe2 Automatic SchildiChat string correction 
Change-Id: I86ce37dcc2bd6cc92d00585768b746d5f647acb8
 2024-01-10 19:59:28 +01:00
SpiritCroc
3d58efb75a Automatic upstream merge postprocessing 
Change-Id: I0e54ab321170944352d07898179705e3ac667e49
 2024-01-10 19:59:26 +01:00
SpiritCroc
4573a4235e Merge tag 'v1.6.10' into sc 
Change-Id: If32b84a60de38eab046bbedeb2b1e8d9c6094bb3

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAvatarResolver.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
	vector/src/main/java/im/vector/app/core/pushers/UnifiedPushHelper.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/PlainTextComposerLayout.kt
 2024-01-10 19:57:20 +01:00
SpiritCroc
20131ab024 [TMP] Automatic upstream merge preparation 
Change-Id: I489ac980279e10d82764fca5e6942efc805d355c
 2024-01-10 18:09:25 +01:00
SpiritCroc
e40ac752e9 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I1823e449896c1b47d87f7dac6bd01349b3f902fd
 2024-01-10 18:09:25 +01:00
Benoit Marty
42696eb31d Fix parsing after artifact url change on GitHub 2024-01-09 14:04:55 +01:00
Benoit Marty
ee16ef06e9 version++ 2024-01-09 12:20:07 +01:00
Benoit Marty
a080826242 Merge tag 'v1.6.10' into develop 
tag
 2024-01-09 12:16:39 +01:00
Benoit Marty
493093c2a7 Merge branch 'release/1.6.10' into main 2024-01-09 12:16:21 +01:00
Benoit Marty
ac79b2ee63 Adding fastlane file for version 1.6.10 2024-01-09 12:16:15 +01:00
Benoit Marty
5c6e1d5378 Changelog for version 1.6.10 2024-01-09 12:15:28 +01:00
Benoit Marty
4c8ffbd169
Merge pull request #8727 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.24.0 
Bump io.element.android:wysiwyg from 2.22.0 to 2.24.0
 2024-01-08 09:02:03 +01:00
dependabot[bot]
924913165e
Bump io.element.android:wysiwyg from 2.22.0 to 2.24.0 
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.22.0 to 2.24.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.22.0...2.24.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>
 2024-01-05 23:19:07 +00:00
ganfra
e596196f99
Merge pull request #8716 from element-hq/feature/fga/fix_event_edition_reply 
Fix a bunch of issues related to edition and reply #5969
 2024-01-02 14:02:52 +01:00
manuroe
7a2520b03c
Merge pull request #8724 from element-hq/manu/issue_triaging_cleanup 
GH actions: remove triaging process and old GH projects
 2024-01-02 12:11:22 +01:00
manuroe
60d4221016 GH actions: remove triaging process and old GH projects 2024-01-02 11:00:54 +01:00
ganfra
2ada4c8491 Fix quality 2024-01-02 08:17:26 +01:00
ganfra
320aae1430 Also fix pills with rich text editor 2024-01-02 08:17:26 +01:00
ganfra
b72039e735 Fix a bunch of issues related to edition and reply #5969 2024-01-02 08:17:26 +01:00
Jorge Martin Espinosa
c46b3148e4
Try fixing exodus CI job (#8721) 
* Ignore tracker count retrieved by exodus job so the report can be created

* Ignore Sentry, since it's a known and optional tracker
 2024-01-02 08:16:27 +01:00
Benoit Marty
dff9b82185 Revert change on those files, that should fix Weblate conflict 
I am receiving 1 mail per hour about that
 2023-12-22 09:48:03 +01:00
Benoit Marty
25d1945cdc
Merge pull request #8577 from element-hq/sync-analytics-plan 
Sync analytics plan
 2023-12-21 14:19:59 +01:00
Benoit Marty
03966f1c13 Fix KDoc (I know I should not edit this, but its fine) 2023-12-21 09:38:03 +01:00
Benoit Marty
e818f86896
Merge pull request #8666 from yostyle/yostyle/fix_crypto_migration 
Move crypto migration
 2023-12-21 09:33:17 +01:00
Benoit Marty
d610f75f1b Fix compilation issue. 
This extension is only used for Test
 2023-12-21 09:30:46 +01:00
Benoit Marty
7242ad48c2 No need to use also here. 2023-12-21 09:29:31 +01:00
Benoit Marty
abccc7dd9f
Merge pull request #8710 from element-hq/feature/bma/elementHq 
Element hq
 2023-12-21 09:14:58 +01:00
Benoit Marty
6feee61f17
Merge pull request #8711 from element-hq/dependabot/gradle/io.element.android-wysiwyg-2.22.0 
Bump io.element.android:wysiwyg from 2.14.1 to 2.22.0
 2023-12-20 15:05:11 +01:00
Benoit Marty
644587a98c Fix crash... 2023-12-20 10:16:29 +01:00
Benoit Marty
fac8dd333a RTE: fix API break... 2023-12-20 10:16:29 +01:00
Yoan Pintas
f3c6535011
Merge branch 'element-hq:develop' into yostyle/fix_crypto_migration 2023-12-18 08:35:32 +00:00
Benoit Marty
431a1a6fb2
Merge pull request #8672 from Amir-yazdanmanesh/develop 
Change jitsi-meet constants URL
 2023-12-15 18:10:40 +01:00
yostyle
18ccc25575 fix lint 2023-12-15 12:25:29 +01:00
Yoan Pintas
7f8e73ee4d
Merge branch 'element-hq:develop' into yostyle/fix_crypto_migration 2023-12-15 10:36:32 +00:00
dependabot[bot]
d145c3108d
Bump io.element.android:wysiwyg from 2.14.1 to 2.22.0 
Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.14.1 to 2.22.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](https://github.com/matrix-org/matrix-wysiwyg/compare/2.14.1...2.22.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>
 2023-12-14 23:52:20 +00:00
SpiritCroc
2117f95290 Switch prefered room preview types to best tested selection 
Devs prefer this option and test this the most.

Change-Id: I1a986597d539589e68c588d99074d32dd04e4833
 2023-12-14 11:36:35 +01:00
Benoit Marty
b6e3e875ac Organization renaming: vector-im -> element-hq 2023-12-13 11:09:03 +01:00
Benoit Marty
6d65a74f1d Organization renaming: replace all https://github.com/vector-im by https://github.com/element-hq 2023-12-13 11:01:40 +01:00
Benoit Marty
1c1c89fb86
Merge pull request #8698 from vector-im/feature/bma/mdm 
Implement Mobile Device Manager feature with 3 keys.
 2023-12-11 17:03:28 +01:00
Benoit Marty
9652932095
Merge pull request #8706 from vector-im/sync-sas-strings 
Sync SAS Strings
 2023-12-11 16:04:44 +01:00
bmarty
9c6fbcd141 Sync SAS Strings 2023-12-11 00:03:20 +00:00
bmarty
7e40b933c0 Sync analytics plan 2023-12-11 00:03:18 +00:00
SpiritCroc
4ad5062b1e [merge] Fix Fastfile after upstream merge 
Change-Id: I31f905a222aa89f83d317c95df0e9097d5d8fac1
 2023-12-07 19:47:57 +01:00
SpiritCroc
86317190c4 Increment version 
Change-Id: I35b83dc3f579688f9c580c243e933a95b908952a
 2023-12-07 17:51:38 +01:00
SpiritCroc
46cd827e95 Hide quick-access to matrix.org account registration for Play Store 
New Play Store guidelines require easy account deletion links etc. when
the app provides a way to create accounts. For SchildiChat, we do not
provide any homeservers for users, which is hard to teach the Google
Play Store testers. Accordingly, require users to enter their homeserver
themselves. Note that entering matrix.org in the "Custom server" picker
will lead you to the same UX like previously checking the existing box.

Change-Id: I93d313e22dc18b4c1b7469cd4a7e9761c5b6ee5f
 2023-12-07 17:44:58 +01:00
RT Redréovič
2ddb0fd252 Translated using Weblate (Esperanto) 
Currently translated at 100.0% (180 of 180 strings)

Translation: SchildiChat/SchildiChat-android
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/schildichat-android/eo/
 2023-12-06 15:39:17 +00:00
Benoit Marty
4d5fefa105 Fix issue on chinese language resource. 2023-12-06 14:57:50 +01:00
Benoit Marty
5e4b8ed536
Merge pull request #8700 from vector-im/feature/fga/handle_functional_members 
Support Functional members #3736
 2023-12-06 14:16:11 +01:00
Benoit Marty
bb866601ef Fix test compilation issue. 2023-12-05 14:25:36 +01:00
Benoit Marty
6452b5c2b4 Make DefaultMdmService a singleton and use Binds instead of Provides. 2023-12-04 17:54:48 +01:00