filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,678 Commits 6 Branches 119 Tags 221 MiB
Commit Graph

9678 Commits

Author SHA1 Message Date
Benoit Marty 0db5dd3d50
Merge pull request #3419 from vector-im/feature/bma/gitter 
Feature/bma/gitter
 2021-05-27 21:23:05 +02:00
Benoit Marty c3a754604f
Merge pull request #3423 from vector-im/feature/bma/compress_thumbnail 
Compress thumbnail: change Jpeg quality from 100 to 80 (#3396)
 2021-05-27 20:53:16 +02:00
Benoit Marty 302e29831e Compress thumbnail: change Jpeg quality from 100 to 80 (#3396) 2021-05-27 18:42:07 +02:00
Benoit Marty d2fd652fb5
Merge pull request #3414 from vector-im/feature/bma/wording_homeserver 
Feature/bma/wording homeserver
 2021-05-27 17:32:27 +02:00
Benoit Marty cc5a400cfd ktlint 2021-05-27 17:02:41 +02:00
Benoit Marty f559ae1b35 Rename to avoid collision with Matrix Spaces 2021-05-27 16:55:40 +02:00
ganfra 8e8bc0055d Call transfer: clean & add changelog 2021-05-27 16:32:14 +02:00
Benoit Marty 3df8af27a6
Merge pull request #3416 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.24 
Bump libphonenumber from 8.12.23 to 8.12.24
 2021-05-27 16:05:37 +02:00
ganfra bcc360692e Call transfer: makes call transfer working properly 2021-05-27 16:00:32 +02:00
Benoit Marty e925d29037 Avoid adding twice the same server 2021-05-27 15:37:26 +02:00
Benoit Marty 96720af52f Let the View model compute the state 2021-05-27 15:16:55 +02:00
ganfra 90ccc3006d Merge develop into feature/fga/call_transfer 2021-05-27 14:40:06 +02:00
Benoit Marty f62ab84e59 Add custom server - add IME action 2021-05-27 14:12:48 +02:00
Benoit Marty 8d0d7635c6 Single line set to true by default 2021-05-27 14:05:34 +02:00
Benoit Marty d3949729e1 Quick fix for edittext issue 2021-05-27 14:05:34 +02:00
Benoit Marty cbed1afaaa Add custom server 2021-05-27 14:05:34 +02:00
Benoit Marty 72b1bd354e
Merge pull request #3355 from vector-im/feature/fga/voip_virtual_room 
Feature/fga/voip virtual room
 2021-05-27 13:24:34 +02:00
Benoit Marty ea4b5e19fe VoIP: add protocols checks and third party lookups 
Add RoomAccountData and handle RoomSyncAccountData
Virtual rooms: add CallUserMapper, branch onNewInvite and mapping, hide them on sdk side (not ideal solution)
Introduce SessionScopedProperty to handle session dependency in the app
Author: ganfra (rebased by Benoit)
 2021-05-27 10:28:32 +02:00
dependabot[bot] 7fb76b2541
Bump libphonenumber from 8.12.23 to 8.12.24 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.23 to 8.12.24.
- [Release notes](https://github.com/google/libphonenumber/releases)
- [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md)
- [Commits](https://github.com/google/libphonenumber/compare/v8.12.23...v8.12.24)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-27 06:23:10 +00:00
Benoit Marty f30eb4af8a Add checked mark on the current item 2021-05-26 18:17:58 +02:00
Benoit Marty 4641f77842 Better understanding of the model: server / protocol 
Iso Element Web on this part.
 2021-05-26 17:51:44 +02:00
Benoit Marty 64222ff704 Move the class RoomDirectoryData form the SDK to the app 2021-05-26 16:08:56 +02:00
Benoit Marty 65f8546268 Add string 2021-05-26 16:03:44 +02:00
Benoit Marty dec650eae8 Add Gitter.im as a default in the Change Network menu (#3196) 2021-05-26 16:03:28 +02:00
Benoit Marty 535f3ad02d Clean doc 2021-05-26 16:03:13 +02:00
Benoit Marty 898c8cc3a7 Refact: inject ThumbnailExtractor 2021-05-26 14:42:09 +02:00
Valere 60dee6eea3 Code review 2021-05-26 14:25:21 +02:00
Valere f602caf323 Fix towncrier 2021-05-26 14:25:21 +02:00
Valere d04cbadd04 Compute via param from list utility method 2021-05-26 14:25:21 +02:00
Valere b75d0cbfc6 Introduce SpaceItem 2021-05-26 14:25:21 +02:00
Valere a832da2124 Fix reconcile summary API results and known room for display 2021-05-26 14:25:21 +02:00
Valere 432fd67ce2 Fixes #3406 2021-05-26 14:25:21 +02:00
Valere 5d4f60ff6f Update changelog 2021-05-26 14:25:21 +02:00
Valere 447bd98a78 Fixes #3386 show space description in explore header 2021-05-26 14:25:21 +02:00
Benoit Marty 2bea2de0c5
Merge pull request #3365 from vector-im/dependabot/gradle/androidx.core-core-ktx-1.5.0 
Bump core-ktx from 1.3.2 to 1.5.0
 2021-05-26 14:22:26 +02:00
Benoit Marty 526f43044e
Merge pull request #3367 from vector-im/dependabot/gradle/androidx.fragment-fragment-ktx-1.3.4 
Bump fragment-ktx from 1.3.3 to 1.3.4
 2021-05-26 14:21:18 +02:00
Benoit Marty 39799c2aba
Merge pull request #3412 from vector-im/dependabot/gradle/daggerVersion-2.36 
Bump daggerVersion from 2.35.1 to 2.36
 2021-05-26 14:20:07 +02:00
dkanada 4a11802b65 store cache for WidgetWebView between loads 2021-05-26 12:54:38 +02:00
Benoit Marty cd66e62454 "home server" -> "homeserver" (#3404) 2021-05-26 12:44:04 +02:00
ganfra e67cb0eae7 Merge branch 'develop' into feature/fga/call_transfer 2021-05-26 12:26:34 +02:00
ganfra bd8e46c84f Call transfer: start branching consult first action 2021-05-26 12:09:59 +02:00
SpiritCroc 3b2f09e80d Merge remote-tracking branch 'AquaWolf/feature/conversations' into sc 
Change-Id: Idbbe13f56d988900ade365c3d582bd03799d245c

Conflicts:
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
 2021-05-26 10:55:56 +02:00
SpiritCroc 63a608593f Automatic SchildiChat string correction 
Change-Id: I42fc475df42bf0f4a8c7f9b62610c6eff3583143
 2021-05-26 10:44:25 +02:00
SpiritCroc 6693b398bb Automatic upstream merge postprocessing 
Change-Id: Iff3f2521a41455cfc94afc1b4e0ad961c0d64ce8
 2021-05-26 10:44:23 +02:00
SpiritCroc 9f11fcf87e Automatic color correction 
Change-Id: Ie9ef96a3a4cfa5ef0d0618282a8727028589e9c7
 2021-05-26 10:44:23 +02:00
SpiritCroc 6c06462ec9 Merge tag 'v1.1.8' into sc 
Change-Id: Ied7cd01e47a76e9d8f546ae1c2d6f10b083c4480

Conflicts:
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.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/timeline/item/MessageTextItem.kt
	vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
 2021-05-26 10:44:19 +02:00
SpiritCroc 6e60fd7328 [TMP] Automatic upstream merge preparation 
Change-Id: Ic0b3e2a1ac115db029101589e77e16cf4b38d314
 2021-05-26 08:48:20 +02:00
SpiritCroc 1b6ddb5949 Automatic revert to unchanged upstream strings, pt.1 
Change-Id: Ib94348dd875279692a53465e4b4d13cfdbb27e16
 2021-05-26 08:48:19 +02:00
dependabot[bot] 2703097294
Bump daggerVersion from 2.35.1 to 2.36 
Bumps `daggerVersion` from 2.35.1 to 2.36.

Updates `dagger` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36)

Updates `dagger-compiler` from 2.35.1 to 2.36
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.35.1...dagger-2.36)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-26 06:00:27 +00:00
Benoit Marty 680837611a Version++ 2021-05-25 18:13:09 +02:00