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

3415 Commits

Author SHA1 Message Date
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
Benoit Marty b44c1a1c77
Merge pull request #3383 from vector-im/feature/fga/authenticated_jitsi 
Feature/fga/authenticated jitsi
 2021-05-25 10:24:54 +02:00
Benoit Marty 6706a88a21
Merge pull request #3188 from vector-im/feature/bma/login_v2 
Login v2 - WIP
 2021-05-21 14:55:22 +02:00
Benoit Marty 40bb58c9cb
Merge branch 'develop' into feature/bca/fix_3371 2021-05-21 14:53:21 +02:00
Benoit Marty 697b9ff535
Merge branch 'develop' into feature/bca/spaces_quick_fixes 2021-05-21 14:49:12 +02:00
Benoit Marty fb5dda30bd Better handling of filename 2021-05-21 13:22:47 +02:00
Benoit Marty 762eb0db12 Format update 2021-05-21 13:00:37 +02:00
Valere ae5a5ec92b Spaces | Personal spaces add DM - Web Parity #3271 2021-05-21 11:46:13 +02:00
Valere 877a64fbce Don't create private spaces with encryption enabled #3363 2021-05-21 11:46:13 +02:00
Valere 8d3167cb66 Code review 2021-05-21 11:42:01 +02:00
Valere cb6f414c60 Fix | Explore room list: the RoomId is displayed instead of name (#3371) 2021-05-21 11:40:09 +02:00
ganfra 03f81258c4 Jitsi auth: clean after Benoits review 2021-05-20 20:16:37 +02:00
ganfra 894af10934 Jitsi auth: fix some mistakes and gives the jwt to Jitsi 2021-05-20 18:53:56 +02:00
ganfra e4b65053d4 Jitsi auth: fix openId API 2021-05-20 18:41:27 +02:00
Benoit Marty 8d94b5548d
Merge pull request #3316 from vector-im/feature/bma/secretstoring_migration 
Feature/bma/secretstoring migration
 2021-05-20 15:45:58 +02:00
Benoit Marty a7c1dc5cd9
Merge branch 'develop' into feature/bma/login_v2 2021-05-20 15:18:18 +02:00
SpiritCroc d3ca5d0db0 Invalidate the timeline when the DM state changes for a room 
We need to redraw messages when this changes, since we use different
layouts for DMs and non-direct chats.

Change-Id: Icf2df3a14655f7c9b6e5f7cdb29b590f393de4fd
 2021-05-20 13:22:37 +02:00
ganfra ca2f671286 Jitsi auth: introduce openid token 2021-05-19 19:34:06 +02:00
dependabot[bot] 5629d30932
Bump appcompat from 1.2.0 to 1.3.0 
Bumps appcompat from 1.2.0 to 1.3.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-19 06:20:33 +00:00
Benoit Marty 448eda8624 Replace unbreakable space by a regular space 2021-05-18 19:11:57 +02:00
Benoit Marty 36f397be48
Merge branch 'develop' into dependabot/gradle/kotlin_version-1.5.0 2021-05-17 12:15:19 +02:00
SpiritCroc d6b05925a9 Fix counting unread chats in spaces 
Change-Id: Ibd39e18e92b28105d6b4289eb5ecaf7caeca7574
 2021-05-16 10:39:37 +02:00
Benoit Marty 640b86ca9e
Merge pull request #3341 from vector-im/feature/bma/fix_migration_nightly 
Fix a problem with database migration on nightly builds (#3335)
 2021-05-14 16:32:28 +02:00
Benoit Marty 08aefa270e internal 2021-05-14 13:15:35 +02:00
Benoit Marty 4a94426d38 Fix warning 1.5: 'sumBy((T) -> Int): Int' is deprecated 2021-05-14 13:10:16 +02:00
Benoit Marty babbcedd87 Fix warning 1.5: 'Char.toByte(): Byte' is deprecated 2021-05-14 12:49:38 +02:00
Benoit Marty c70445a9a1 Fix warning 1.5: 'toUpperCase(Locale): String' and 'toLowerCase(Locale): String' are deprecated 2021-05-14 12:48:57 +02:00
Benoit Marty 7a28be941c Fix warning 1.5: 'Char.toInt(): Int' is deprecated 2021-05-14 12:47:09 +02:00
Benoit Marty 58a2fd8c77 Fix warning 1.5: String.capitalize is now deprecated 2021-05-14 12:45:33 +02:00
Benoit Marty 95714e55b0
Merge pull request #3324 from vector-im/feature/bma/doc_register 
Add documentation on LoginWizard and RegistrationWizard (#3303)
 2021-05-14 12:29:10 +02:00
Benoit Marty c27b7aec26 Add more doc 2021-05-14 11:44:44 +02:00
Benoit Marty d6e3bb59f4 Minor cleanup on the doc 2021-05-14 11:39:12 +02:00
Benoit Marty 946208a84d Add documentation on LoginWizard and RegistrationWizard (#3303) 
ee
 2021-05-14 11:39:12 +02:00
Benoit Marty dca4a31fc6 Fix a problem with database migration on nightly builds (#3335) 2021-05-14 11:26:24 +02:00
Benoit Marty 393ef3845e
Merge pull request #3330 from vector-im/dependabot/gradle/com.googlecode.libphonenumber-libphonenumber-8.12.23 
Bump libphonenumber from 8.12.22 to 8.12.23
 2021-05-13 11:15:14 +02:00
dependabot[bot] 90f6f9f7c1
Bump libphonenumber from 8.12.22 to 8.12.23 
Bumps [libphonenumber](https://github.com/google/libphonenumber) from 8.12.22 to 8.12.23.
- [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.22...v8.12.23)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-13 06:30:31 +00:00
dependabot[bot] cd9b8c55f4
Bump realm-gradle-plugin from 10.4.0 to 10.5.0 
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.4.0 to 10.5.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/v10.5.0/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.4.0...v10.5.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-13 06:27:41 +00:00
dependabot[bot] 58dfe0f924
Bump daggerVersion from 2.35 to 2.35.1 
Bumps `daggerVersion` from 2.35 to 2.35.1.

Updates `dagger` from 2.35 to 2.35.1
- [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...dagger-2.35.1)

Updates `dagger-compiler` from 2.35 to 2.35.1
- [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...dagger-2.35.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-12 14:50:20 +00:00
SpiritCroc db6cfd3054 Merge tag 'v1.1.7' into sc 
Change-Id: Icefe721894c7cd3d0702d07efbd0452f95775d32

Conflicts:
	.idea/codeStyles/Project.xml
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/features/grouplist/HomeSpaceSummaryItem.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/list/SpaceRoomListSectionBuilder.kt
	vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceSummaryController.kt
	vector/src/main/java/im/vector/app/features/spaces/SpacesListViewModel.kt
	vector/src/main/res/layout/item_timeline_event_base.xml
	vector/src/main/res/values-ca/strings.xml
	vector/src/main/res/values-cs/strings.xml
	vector/src/main/res/values-de/strings.xml
	vector/src/main/res/values-et/strings.xml
	vector/src/main/res/values-fa/strings.xml
	vector/src/main/res/values-fr/strings.xml
	vector/src/main/res/values-it/strings.xml
	vector/src/main/res/values-sq/strings.xml
	vector/src/main/res/values-sv/strings.xml
	vector/src/main/res/values-vi/strings.xml
	vector/src/main/res/values-zh-rTW/strings.xml
	vector/src/main/res/values/strings.xml
	vector/src/main/res/xml/vector_settings_labs.xml
 2021-05-12 16:01:36 +02:00
Benoit Marty 824a8a5c66 Fix copyright 2021-05-11 14:06:49 +02:00
Benoit Marty 91be2b6f3f Add test and handle system upgrade 2021-05-11 14:06:49 +02:00
Benoit Marty cef4cf09ec Create a BuildVersionSdkIntProvider to be able to inject it and do some test 
To merge with BuildVersionSdkIntProvider

To merge with fix add module

To merge with fix buildVersionSdkIntProvider
 2021-05-11 13:52:08 +02:00
Benoit Marty f31c44963b Cleanup the existing code 2021-05-11 13:52:08 +02:00
Valere f9820cde58 Fixes on unread badges 2021-05-11 11:36:17 +02:00
Valere 1ec08bec07 Fix spaces add room via server 2021-05-11 08:18:37 +02:00
Valere 80366ee938 Code review 2021-05-10 20:01:17 +02:00
Valere f9e608a790 Manage Spaces as Admin 2021-05-10 20:01:17 +02:00
Benoit Marty e6d4f9a1dc
Merge pull request #3298 from vector-im/feature/ypi/join_rules 
Add joinRules field to RoomSummary
 2021-05-10 19:54:44 +02:00
Benoit Marty 7ec44a5542
Merge pull request #3290 from vector-im/feature/bca/spaces_various_fixes 
Various fixes on spaces explore
 2021-05-10 19:52:45 +02:00
ganfra bea67bd7fd Join rules: fix migration 2021-05-10 19:03:34 +02:00