mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-13 03:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity
13250 commits 7 branches 124 tags 230 MiB
Commit graph

13250 commits

This branch
This branch
All branches
Author SHA1 Message Date
Benoit Marty
4b6afb3e63
Merge pull request #4494 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.2 
Bump constraintlayout from 2.1.1 to 2.1.2
 2021-11-18 10:18:54 +01:00
Benoit Marty
00ab7aaea9
Merge branch 'develop' into dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.2 2021-11-18 10:18:44 +01:00
Benoit Marty
958be65389
Merge pull request #4493 from vector-im/dependabot/gradle/androidx.work-work-runtime-ktx-2.7.1 
Bump work-runtime-ktx from 2.7.0 to 2.7.1
 2021-11-18 10:17:34 +01:00
Benoit Marty
e98dd2e663
Merge pull request #4396 from vector-im/feature/aris/thread_aware 
Feature/aris/thread aware
 2021-11-18 10:16:56 +01:00
Benoit Marty
f4772f7aa8
Merge pull request #4492 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.4.0 
Bump fragment-ktx from 1.3.6 to 1.4.0
 2021-11-18 10:15:01 +01:00
Andy Balaam
27c92a1583 Add a note about the release builds depending on Google services 
Signed-off-by: Andy Balaam <andyb@element.io>
 2021-11-18 09:13:03 +00:00
m1chj
ebf6231ab1 Translated using Weblate (Polish) 
Currently translated at 91.9% (2474 of 2690 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-18 07:38:54 +00:00
mohzart
ec3071c971 Translated using Weblate (Polish) 
Currently translated at 91.9% (2474 of 2690 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-18 07:38:53 +00:00
m1chj
591f8d9877 Translated using Weblate (Polish) 
Currently translated at 91.9% (2473 of 2690 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-18 07:36:16 +00:00
mohzart
1a029fe84b Translated using Weblate (Polish) 
Currently translated at 91.9% (2473 of 2690 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-18 07:36:16 +00:00
eman luff
0bddba1930 Translated using Weblate (Polish) 
Currently translated at 91.8% (2471 of 2690 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-18 06:28:35 +00:00
mohzart
a62ed45cba Translated using Weblate (Polish) 
Currently translated at 91.8% (2471 of 2690 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pl/
 2021-11-18 06:28:34 +00:00
dependabot[bot]
bff72a4d52
Bump appcompat from 1.3.1 to 1.4.0 
Bumps appcompat from 1.3.1 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.appcompat:appcompat
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 23:08:48 +00:00
dependabot[bot]
84d86a5433
Bump constraintlayout from 2.1.1 to 2.1.2 
Bumps [constraintlayout](https://github.com/androidx/constraintlayout) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/androidx/constraintlayout/releases)
- [Commits](https://github.com/androidx/constraintlayout/commits)

---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 23:07:57 +00:00
dependabot[bot]
f56691a942
Bump work-runtime-ktx from 2.7.0 to 2.7.1 
Bumps work-runtime-ktx from 2.7.0 to 2.7.1.

---
updated-dependencies:
- dependency-name: androidx.work:work-runtime-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 23:07:14 +00:00
dependabot[bot]
9ae6197f4c
Bump fragment-ktx from 1.3.6 to 1.4.0 
Bumps fragment-ktx from 1.3.6 to 1.4.0.

---
updated-dependencies:
- dependency-name: androidx.fragment:fragment-ktx
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-11-17 23:07:08 +00:00
S1m
cef51619b1 Move GuardService to main 
Users using the gcm flavor without playservice will be able to
use the background sync.
 2021-11-17 21:00:09 +01:00
S1m
c4fd115209 Add a BuildConfig to allow external unifiedpush distrib 
Change-Id: I5435c02dab05f84dd5dd99507afd1075f357e76d
 2021-11-17 20:59:32 +01:00
SpiritCroc
c03c6867f7 Merge branch 'merge-v1.3.8' into sc 
Change-Id: If000613462f3cd3b73c8de24f456dccc16fcde38

Conflicts:
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
 2021-11-17 20:26:27 +01:00
SpiritCroc
519f18eed9 Automatic SchildiChat string correction 
Change-Id: I1c1258626a5c15c00dbfdeb855d1cb9b4a0c20a8
 2021-11-17 20:20:46 +01:00
SpiritCroc
54fba60046 Automatic upstream merge postprocessing 
Change-Id: I53832e007d7c439a60c9e38e8c736aec6631b6ba
 2021-11-17 20:20:45 +01:00
SpiritCroc
d9a5991559 Merge tag 'v1.3.8' into HEAD 
Change-Id: If3e3927755638ee38d8817f8504f09b0df14f309

Conflicts:
	dependencies.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/main/AndroidManifest.xml
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
 2021-11-17 20:17:45 +01:00
SpiritCroc
c5f48fa4d2 Merge tag 'v1.3.7' into sc 
Change-Id: Id73c834c10e11ccd46d7d2adc8328eb95d051941

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/model/RoomSummaryEntity.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/content/VideoCompressor.kt
	vector/build.gradle
	vector/src/fdroid/AndroidManifest.xml
	vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/VectorApplication.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	vector/src/main/java/im/vector/app/core/receiver/OnApplicationUpgradeOrRebootReceiver.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationDrawerManager.kt
	vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
 2021-11-17 19:01:22 +01:00
ariskotsomitopoulos
8015ffee42 PR remrarks 2021-11-17 19:56:06 +02:00
Benoit Marty
0c4dee8933
Merge pull request #4338 from vector-im/feature/bca/fix_crypto_shields 
Update shields to match web
 2021-11-17 17:43:10 +01:00
Benoit Marty
51d8887727
Merge pull request #4487 from andybalaam/document-fdroid-process 
Explain the process of releasing to the app stores
 2021-11-17 17:37:44 +01:00
Benoit Marty
83cf522d35 Add missing item in the Changelog 2021-11-17 16:55:32 +01:00
Valere
78bdef4e2d Code review 2021-11-17 16:39:24 +01:00
Valere
cedf553602 Add change log 2021-11-17 16:39:24 +01:00
Valere
1a204c6b5a Use borderless shield for verification (web parity) 2021-11-17 16:39:24 +01:00
Valere
dc708438a6 Update shields to match web 2021-11-17 16:39:24 +01:00
Benoit Marty
a8f6efd5e8 Version++ 2021-11-17 16:07:07 +01:00
Benoit Marty
879e6ef5e2 Merge branch 'release/1.3.8' into main 2021-11-17 16:04:44 +01:00
Benoit Marty
c21a9669a6 Merge branch 'release/1.3.8' into develop 2021-11-17 16:04:43 +01:00
Benoit Marty
7783057eac fastlane 2021-11-17 16:04:26 +01:00
Benoit Marty
cc967103c1 Towncrier 2021-11-17 15:56:09 +01:00
ariskotsomitopoulos
9972dbc278 Use RealmConfiguration instead of Monarchy 2021-11-17 16:54:03 +02:00
Benoit Marty
a5518e90ae
Merge pull request #4485 from vector-im/feature/bma/small_cleanup 
Small cleanup after content scanner code has been merged
 2021-11-17 15:08:07 +01:00
Benoit Marty
36ffb3b073 Fix lint issue 2021-11-17 14:18:12 +01:00
ariskotsomitopoulos
d463500998 Remove unused import 2021-11-17 14:48:10 +02:00
ariskotsomitopoulos
88656ce80b Use GetEventTask instead of session from the ThreadAwarenessHandler 2021-11-17 14:14:21 +02:00
Andy Balaam
bf8c386ef3 Explain the process of releasing to the app stores 2021-11-17 11:39:12 +00:00
Benoit Marty
31837390bc
Merge pull request #4484 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2021-11-17 11:48:00 +01:00
Benoit Marty
c0af8214a6 Improve and use MatrixUrls 2021-11-17 11:27:59 +01:00
Benoit Marty
0fd29d763c
Markdown and sploiler in roomlist + spoiler in notifications (#4483) 
Render markdown in room list and make notifications spoiler aware, per MSC3124
Reorder when case to put the most common on top

Co-authored-by: Onuray Sahin <onurays@element.io>
Co-authored-by: Wasabi\preston <1337paf92@gmail.com>
 2021-11-17 10:21:48 +00:00
Benoit Marty
adea1db87a Remove useless ? 2021-11-17 11:19:59 +01:00
Benoit Marty
855b672f48
Add content scanner service (#4392) 
* Add content scanner APIs

* Move to content scanner matrix SDK to FOSS

* Update file service

* Refactoring

* Replace matrix callbacks by coroutines

* Fix lint errors

* Add changelog

Co-authored-by: yostyle <yoanp@element.io>
 2021-11-17 11:18:20 +01:00
yostyle
0fada97450 Add changelog 2021-11-17 11:11:13 +01:00
Weblate
e279ffa1d8 Merge branch 'origin/develop' into Weblate. 2021-11-17 09:59:36 +00:00
Fjoerfoks
34ae53f813 Translated using Weblate (Frisian) 
Currently translated at 45.9% (17 of 37 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/fy/
 2021-11-17 09:59:23 +00:00