Matrix client / Element Android fork
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
.idea
changelog.d
docs
fastlane
fastlane_alternatives
gradle/wrapper
graphics
library
matrix-sdk-android
matrix-sdk-android-flow
newsfragment
resources/img
tools
upstream_.github
upstream_fastlane
vector
vector-app
vector-config
.editorconfig
.gitattributes
.gitignore
alternative_package.sh
AUTHORS.md
build.gradle
CHANGES.md
CONTRIBUTING.md
correct_strings.sh
correct_strings_de.sh
coverage.gradle
dependencies.gradle
dependencies_groups.gradle
FEATURES.md
flavor.gradle
Gemfile
Gemfile.lock
generate_bubbles.sh
generate_themes.sh
gradle.properties
gradlew
gradlew.bat
increment_version.sh
integration_tests_script.sh
integration_tests_script_github.sh
legacy_icons.sh
LICENSE
merge_helpers.sh
post_merge.sh
pre_merge.sh
PRIVACY.md
README.md
SECURITY.md
settings.gradle
towncrier.toml
upstream_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