mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-21 17:05:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
Matrix client / Element Android fork
25234 commits 6 branches 120 tags 229 MiB
Kotlin 97.5%
Java 1.3%
Shell 0.7%
HTML 0.2%
Python 0.2%
Find a file
SpiritCroc befb402dbe Merge remote-tracking branch 'cintek/pin_messages' into sc 
Fixes https://github.com/SchildiChat/SchildiChat-android/issues/202

@SpiritCroc edit:
- change some merge-unfriendly things, e.g.
    - indention
    - strings_sc.xml
    - don't touch what shouldn't be touched
- add icon license to third party
- add FEATURES.md entry

Conflicts:
	library/ui-strings/src/main/res/values/strings.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimelineService.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt

Change-Id: I490e42d50276edce3e7b099a11dba90d040d0dc0
2023-08-02 19:41:24 +02:00
.github Automatic upstream merge postprocessing 2023-07-26 11:02:06 +02:00
.idea Merge tag 'v1.6.0' into sc 2023-05-22 14:19:46 +02:00
changelog.d Merge remote-tracking branch 'cintek/pin_messages' into sc 2023-08-02 19:41:24 +02:00
docs Rust Crypto SDK is now the default, and the build will replace the existing application. 2023-05-09 22:07:08 +02:00
fastlane Automatic upstream merge postprocessing 2023-07-26 11:02:06 +02:00
fastlane_alternatives alternative_package.sh: Add {foss,fcm} variants 2021-08-21 10:02:33 +02:00
gradle/wrapper Update Gradle Wrapper from 7.5.1 to 7.6. 2022-11-27 00:26:10 +00:00
graphics tmp_icon.sh: Script to quickly try out new launcher icons 2023-04-05 10:19:32 +02:00
library Merge remote-tracking branch 'cintek/pin_messages' into sc 2023-08-02 19:41:24 +02:00
matrix-sdk-android Merge remote-tracking branch 'cintek/pin_messages' into sc 2023-08-02 19:41:24 +02:00
matrix-sdk-android-flow Merge branch 'develop' into feature/bca/rust_flavor 2023-01-30 16:46:54 +01:00
newsfragment Merge tag 'v1.3.5' into sc 2021-10-25 19:29:59 +02:00
resources/img put F-Droid and GPlay badges locally 2020-06-20 19:42:31 +03:00
tools Update the release script to release the flavor rustCrypto - small revert 2023-05-17 16:37:08 +02:00
upstream_.github Automatic upstream merge postprocessing 2023-07-26 11:02:06 +02:00
upstream_fastlane Automatic upstream merge postprocessing 2023-07-26 11:02:06 +02:00
vector Merge remote-tracking branch 'cintek/pin_messages' into sc 2023-08-02 19:41:24 +02:00
vector-app Merge tag 'v1.6.5' into sc 2023-07-26 11:01:57 +02:00
vector-config Merge remote-tracking branch 'cintek/pin_messages' into sc 2023-08-02 19:41:24 +02:00
.editorconfig Enables trailing comma editor config 2022-07-19 14:51:07 +02:00
.gitattributes Merge branch 'develop' into feature/bca/rust_flavor 2022-12-13 11:52:46 +01:00
.gitignore Merge tag 'v1.6.0' into sc 2023-05-22 14:19:46 +02:00
alternative_package.sh [merge] alternative_package.sh: Fix fcm 2022-09-11 10:55:16 +02:00
AUTHORS.md Add ability to share profile by QR code 2020-11-20 14:49:39 +01:00
build.gradle Merge tag 'v1.6.5' into sc 2023-07-26 11:01:57 +02:00
CHANGES.md Changelog for version 1.6.5 2023-07-25 14:56:03 +02:00
CONTRIBUTING.md Run knit. 2022-11-24 16:44:07 +01:00
correct_strings.sh Fix Element-Call string with minus 2022-10-10 15:40:56 +02:00
correct_strings_de.sh Update string correction 2022-07-17 18:55:04 +02:00
coverage.gradle add workflow for rust test 2023-04-25 16:40:43 +02:00
dependencies.gradle Merge tag 'v1.6.3' into sc 2023-06-27 20:13:46 +02:00
dependencies_groups.gradle Merge tag 'v1.6.5' into sc 2023-07-26 11:01:57 +02:00
FEATURES.md Merge remote-tracking branch 'cintek/pin_messages' into sc 2023-08-02 19:41:24 +02:00
flavor.gradle Rust Crypto SDK is now the default, and the build will replace the existing application. 2023-05-09 22:07:08 +02:00
Gemfile Setup Danger to Element Android project. 2022-07-29 10:02:40 +02:00
Gemfile.lock Bump git from 1.11.0 to 1.13.0 2023-01-09 22:01:21 +00:00
generate_bubbles.sh Apply corner roundness to image-related drawables 2022-03-04 10:21:40 +01:00
generate_themes.sh Use light navigation bar in light SC themes 2022-09-14 11:28:16 +02:00
gradle.properties Disable build caching 2023-07-21 12:27:58 +02:00
gradlew Update Gradle Wrapper from 7.5.1 to 7.6. 2022-11-27 00:26:10 +00:00
gradlew.bat Update Gradle Wrapper from 7.5.1 to 7.6. 2022-11-27 00:26:10 +00:00
increment_version.sh Fix fdroid changelog generation 2023-07-26 15:14:19 +02:00
integration_tests_script.sh - Fix integration tests (still not perfect while github actions are very very limited for that) 2022-01-05 23:42:57 +02:00
integration_tests_script_github.sh - Fix integration tests (still not perfect while github actions are very very limited for that) 2022-01-05 23:42:57 +02:00
legacy_icons.sh Theme legacy icons as well 2020-08-12 13:35:31 +02:00
LICENSE Update README.md & Create LICENSE 2019-03-04 19:18:15 +01:00
merge_helpers.sh Revert "[TMP] merge_helpers.sh: Hardcode develop branch" 2022-12-15 11:02:24 +01:00
post_merge.sh Fix some neutral grey icons 2022-10-28 18:29:51 +02:00
pre_merge.sh pre_merge.sh: ignore failure during git tag 2023-05-25 11:50:25 +02:00
PRIVACY.md Privacy policy: moved to website 2021-04-25 11:09:04 +02:00
README.md Automatic upstream merge postprocessing 2023-07-26 11:02:06 +02:00
SECURITY.md Add SECURITY.md (copied from https://github.com/vector-im/.github/blob/main/SECURITY.md) 2023-01-11 15:18:28 +01:00
settings.gradle Import source from https://github.com/dm77/barcodescanner 2023-06-23 18:58:42 +02:00
towncrier.toml updating the removal towncrier usage to be an explicit sdk category 2022-01-14 16:22:46 +00:00
upstream_README.md Automatic upstream merge postprocessing 2023-07-26 11:02:06 +02:00

README.md

Translation status SchildiChat-Android Matrix room #android:schildi.chat

SchildiChat for Android

SchildiChat for Android is a Matrix Client based on Element Android, featuring a different design and various extra tweaks, customization options, and additional community features. A list of changes compared to Element can be found here - but keep in mind this list might not be up-to-date at all times.

Information about available app variants can be found on our website.

Join the discussion on matrix Join our matrix community space

Translations

If you want to translate SchildiChat, visit its weblate here. For translations that concern upstream Element code, visit their weblate here.

Screenshots