mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 19:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
17779 commits 6 branches 120 tags 229 MiB
Commit graph

17779 commits

This branch
This branch
All branches
Author SHA1 Message Date
SpiritCroc
49121000c5 Automatic upstream merge postprocessing 
Change-Id: I8e5240c6060b2585a5e6be7f95fca5a48346dd75
 2022-06-07 15:33:58 +02:00
SpiritCroc
de179f1d29 Merge tag 'v1.4.19' into merge-v1.4.19 
Change-Id: Id486dab5c9b6c545e7035355fe921240c34409a6
 2022-06-07 15:33:53 +02:00
SpiritCroc
753da88597 [TMP] Automatic upstream merge preparation 
Change-Id: I83744c522088410f134452fd7e33b16996c6b01c
 2022-06-07 15:33:50 +02:00
SpiritCroc
f53a2fa6cb Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Iaa543dafc06b45922fa6c02754b5400f08580d66
 2022-06-07 15:33:50 +02:00
Benoit Marty
4ea2b19351 Merge branch 'hotfix/v1.4.19' into main 2022-06-07 15:14:48 +02:00
Benoit Marty
b2f67f971b Prepare v1.4.19 2022-06-07 15:11:46 +02:00
ericdecanini
6513210904 Changes space subtitle in explore rooms from joined string to direct space parent 2022-06-07 15:02:15 +02:00
Valere
a6113526d0 code review 2022-06-07 15:01:57 +02:00
Valere
2fa25f8b5e Fix param name 2022-06-07 15:01:29 +02:00
Valere
d67f86a1e0 fix slow paged room list 2022-06-07 15:00:54 +02:00
SpiritCroc
fe581fbb14 Automatic SchildiChat string correction 
Change-Id: I5614e302cf4ecff378e90423e09ece6b3aea4115
 2022-06-01 15:28:27 +02:00
SpiritCroc
7d11e65d5c Automatic upstream merge postprocessing 
Change-Id: I4c4223cf78f61cc610afc2f0d2e0b8f2b15108cf
 2022-06-01 15:28:26 +02:00
SpiritCroc
ce4f200d83 Automatic color correction 
Change-Id: I37004d734f0c25e0e6eb6b417d7d687352dfe73f
 2022-06-01 15:28:26 +02:00
SpiritCroc
49663a1154 Merge tag 'v1.4.18' into sc 
Change-Id: I58667aa99a8eb99b0b1e7f0784d811061c2086a5

Conflicts:
	dependencies.gradle
	library/attachment-viewer/build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomSummary.kt
	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/session/room/summary/RoomSummaryDataSource.kt
	vector/src/fdroid/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/gplay/java/im/vector/app/gplay/push/fcm/VectorFirebaseMessagingService.kt
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/AppStateHandler.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/utils/Emoji.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
	vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
	vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageImageVideoItem.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageLocationItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt
	vector/src/main/res/xml/vector_settings_labs.xml
 2022-06-01 13:54:34 +02:00
SpiritCroc
fab9a100a1 [TMP] Automatic upstream merge preparation 
Change-Id: I00f10005575cf818d47ea47798ff8af4f4891c06
 2022-06-01 12:20:10 +02:00
SpiritCroc
9446afe0ef Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I6b50d340b0cf82f8d6f85e032b404a79a7e8c236
 2022-06-01 12:20:10 +02:00
Benoit Marty
ba5828711b Merge branch 'release/1.4.18' into main 2022-05-31 17:56:43 +02:00
Benoit Marty
bd970505f1 Fastlane 2022-05-31 17:56:19 +02:00
Benoit Marty
6f7f61f33f Towncrier 2022-05-31 17:55:26 +02:00
Benoit Marty
19fa2f273d Rename folder to please the PlayStore. 2022-05-31 16:47:59 +02:00
Benoit Marty
8e5c96adf5
Merge pull request #6205 from vector-im/johannes/fatal 
Use fatalError instead of NPE
 2022-05-31 16:37:49 +02:00
Benoit Marty
fd5c30c8a9 Fix formatting issue. 2022-05-31 16:36:59 +02:00
Benoit Marty
5b985dc032
Merge pull request #5827 from mikonse/fix-notification-space-switch 
do not switch away from home space on notification
 2022-05-31 16:34:47 +02:00
Johannes Marbach
637b3bb5ba Fix tests 2022-05-31 16:16:54 +02:00
Maxime NATUREL
de185b94f3
Merge pull request #6199 from vector-im/feature/mna/6198-remove-background-location-permission 
Remove background location permission
 2022-05-31 15:58:57 +02:00
Benoit Marty
df23fd10bc
Remove unused import 2022-05-31 14:42:09 +02:00
Maxime NATUREL
2ca96a770d Declaring tools namespace prefix to fix strange build error 2022-05-31 14:24:09 +02:00
Benoit Marty
9cf9e10e5c
Merge pull request #6202 from vector-im/feature/bma/cleanup_string 
Remove unused strings.
 2022-05-31 14:19:13 +02:00
Adam Brown
b88ddbc854
Merge pull request #6201 from vector-im/feature/adm/build-health-false-positives 
Build health false positives
 2022-05-31 13:15:25 +01:00
Maxime NATUREL
4f3b4a71ce Ignore unused strings to be deleted 2022-05-31 13:46:14 +02:00
Johannes Marbach
4fc6cb1de3 Use fatalError instead of NPE 
Signed-off-by: Johannes Marbach <johannesm@element.io>
 2022-05-31 13:42:31 +02:00
Adam Brown
3f670045b3 ordering alphabetically and leaving a trailing comma 2022-05-31 11:20:14 +01:00
Benoit Marty
9d60aff8a2 Remove unused strings. 2022-05-31 12:11:16 +02:00
Adam Brown
2ce64b8f87 excluding the emoji dependencies from the unused check, their resources are used 2022-05-31 10:46:50 +01:00
Benoit Marty
3cc1951587
Merge pull request #6196 from vector-im/feature/bma/lao 
Make Lao language available in the in app setting.
 2022-05-31 11:42:07 +02:00
Benoit Marty
d6b68a33c9
Merge pull request #6194 from vector-im/bma/translators_note 
Add note to translators.
 2022-05-31 11:40:52 +02:00
Benoit Marty
aa753e4845
Merge pull request #6197 from RiotTranslateBot/weblate-element-android-element-app 
Translations update from Weblate
 2022-05-31 11:38:41 +02:00
Maxime NATUREL
233fe21f26 Remove runtime permission request 2022-05-31 11:04:48 +02:00
Maxime NATUREL
90cda6b2be Adding todo to delete some strings 2022-05-31 11:04:29 +02:00
Maxime NATUREL
00002105cf Remove permission declaration in Manifests 2022-05-31 11:04:14 +02:00
Maxime NATUREL
e337035aec Add changelog entry 2022-05-31 11:03:49 +02:00
Jorge Martin Espinosa
2e1a11e10e
Merge pull request #6134 from vector-im/feature/jorgem/mandatory-backup-passphrase 
Add support for mandatory backup or passphrase from .well-known home server configuration
 2022-05-31 11:02:02 +02:00
Johannes Marbach
7dd5b801bb
Merge pull request #6149 from vector-im/johannes/widget-system-permissions 
Make widget web view request system permissions for camera and microphone (PSF-1061)
 2022-05-31 10:54:45 +02:00
Adam Brown
7fdf138e5a
Merge pull request #6036 from vector-im/feature/adm/ftue-deeplinks 
FTUE - Homeserver sign in/up deeplinks
 2022-05-31 09:30:17 +01:00
Weblate
7f59efb876 Merge branch 'origin/develop' into Weblate. 2022-05-31 08:04:30 +00:00
Mr.Narsus
2e7c7c94fb Translated using Weblate (Arabic) 
Currently translated at 44.0% (981 of 2225 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-05-31 08:04:18 +00:00
Jorge Martín
130ed63b03 Add support for mandatory backup or passphrase from .well-known configuration 2022-05-31 10:00:46 +02:00
Benoit Marty
9ed62ac9f7 Changelog 2022-05-31 09:58:13 +02:00
Johannes Marbach
4ebb26d3d3 Merge branch 'develop' into johannes/widget-system-permissions 2022-05-31 09:53:31 +02:00
Benoit Marty
c6c96677e2 Make Lao language available in the in app setting. 2022-05-31 09:52:11 +02:00