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

60 commits

Author SHA1 Message Date
SpiritCroc
65bc997acc Merge tag 'v1.3.5' into sc 
Change-Id: I3e9f85a6228649c1d8a2e886a2b234c59331c619
 2021-10-25 19:29:59 +02:00
Benoit Marty
201d558925 Update previous Changelog (the file was not in the correct folder) 2021-10-25 12:37:41 +02:00
SpiritCroc
978056e01f Merge tag 'v1.3.4' into sc 
Conflicts:
	dependencies.gradle
	gradle.properties
	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/sync/parsing/RoomSyncAccountDataHandler.kt
	vector/build.gradle
	vector/src/gplay/java/im/vector/app/push/fcm/FcmHelper.kt
	vector/src/main/java/im/vector/app/core/pushers/PushersManager.kt
	vector/src/main/java/im/vector/app/core/pushers/VectorMessagingReceiver.kt
	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/timeline/TimelineEventController.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItem.kt
	vector/src/main/java/im/vector/app/features/settings/notifications/VectorSettingsNotificationPreferenceFragment.kt
	vector/src/main/java/im/vector/app/features/settings/troubleshoot/TestTokenRegistration.kt
	vector/src/main/java/im/vector/app/features/spaces/SpaceListViewState.kt

Parts of conflict resolution taken from

    commit 3302ab563ea549684f1e7d7604da01d6856c8d8d
    Merge: 06f52832b 1f74bc986
    Author: S1m <git@sgougeon.fr>
    Date:   Fri Oct 15 09:36:46 2021 +0200

        Merge remote-tracking branch 'upstream/develop' into unifiedpush

Change-Id: I25ad98c59df8b8057147260d790eb2a86d6a6e9b
 2021-10-21 17:31:11 +02:00
Philipp Neumann
214deaa474 added dynamic shortcut for priority conversations for Android 11+ 2021-10-05 14:59:54 +02:00
SpiritCroc
133579d066 Merge tag 'v1.2.1' into sc 
Change-Id: I7446b0a3b8f2bbeee76e337e78eb722cbd05ef2a

Conflicts:
	build.gradle
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
	vector/src/main/java/im/vector/app/core/di/VectorComponent.kt
	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.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/VoiceMessageRecorderView.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
	vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsBaseFragment.kt
	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
 2021-09-09 10:51:12 +02:00
Benoit Marty
b2a31c62f1 Move files to the correct folder. 
The changelog will be a bit wrong, but this is not a big deal.
 2021-09-07 11:35:14 +02:00
S1m
6c153d04da Merge remote-tracking branch 'upstream/develop' into unifiedpush 2021-07-07 00:49:54 +02:00
Benoit Marty
9bbe002988
Merge pull request #3531 from vector-im/feature/fga/auto_accept_invite 
Feature/fga/auto accept invite
 2021-06-28 16:40:10 +02:00
Benoit Marty
f5ecaa0339
Merge pull request #3520 from vector-im/feature/fga/timeline_virtual_room 
Feature/fga/timeline virtual room
 2021-06-24 14:43:00 +02:00
Valere
43a1e283c5
Merge pull request #3514 from vector-im/feature/bca/fix_join_errors 
Add error feedback when joining space rooms
 2021-06-24 09:56:32 +02:00
Benoit Marty
eea18fb71c Rename towncrier folder from newsfragment to changelog.d 2021-06-18 21:33:50 +02:00
ganfra
4b6484d317 Merge branch 'develop' into feature/fga/auto_accept_invite 2021-06-18 17:37:24 +02:00
ganfra
c551cf3058 Clean and add towncrier 2021-06-18 17:30:32 +02:00
Valere
b6b80120b2 update change log 2021-06-18 10:41:24 +02:00
Valere
1de74b1c92 Update change log 2021-06-17 14:44:24 +02:00
Benoit Marty
da19992f3f
Merge pull request #3516 from vector-im/feature/fga/dial_pad_improvements 
Feature/fga/dial pad improvements
 2021-06-17 14:31:48 +02:00
ganfra
4a8a6d170b Clean and add towncrier file 2021-06-17 12:49:05 +02:00
ganfra
1bb32eff45 Clean code and add towncrier file. 2021-06-17 12:42:55 +02:00
Valere
e277deece5 Add error feedback when joining space rooms 2021-06-16 17:35:25 +02:00
Benoit Marty
b5cc023fff
Merge pull request #3490 from vector-im/feature/bca/fix_3485 
Add warning to private space creation flow
 2021-06-16 14:47:12 +02:00
Benoit Marty
1eee3fa0e8 Changelog 2021-06-16 10:26:46 +02:00
Valere
52f0d8a1d2 Add warning to private space creation flow 2021-06-15 14:01:03 +02:00
Benoit Marty
dfb01a462e
Merge pull request #3456 from vector-im/feature/fga/dial_pad_tab 
Feature/fga/dial pad tab
 2021-06-11 12:23:19 +02:00
ganfra
68143ab2cf Merge branch 'develop' into feature/fga/voip_asserted_identity 2021-06-10 16:01:48 +02:00
ganfra
880da9ecd5 Merge branch 'develop' into feature/fga/dial_pad_tab 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/call/dialpad/DialPadFragment.kt
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
 2021-06-10 15:37:24 +02:00
ganfra
0d6994dd43
Merge pull request #3468 from vector-im/feature/fga/voip_change_hold_direction 
VoIP: Change hold direction to send-only
 2021-06-10 10:56:41 +02:00
ganfra
dfcffb9464 Merge branch 'develop' into feature/fga/account_data_rework 2021-06-09 18:58:47 +02:00
ganfra
d19dffe45f Clean and add towncrier file 2021-06-09 18:57:35 +02:00
Benoit Marty
5d69bc934a
Merge pull request #3182 from vector-im/feature/ons/message_composer_ui 
Message Composer Design Update
 2021-06-09 18:26:55 +02:00
Benoit Marty
2f4aecd590 Composer update 
Author: Onuray. Update colors by bmarty and squashed
 2021-06-09 17:35:44 +02:00
Benoit Marty
8dccdf7339 change 2021-06-09 15:41:06 +02:00
Benoit Marty
047c59eba0 Rework colors management 2021-06-09 15:36:20 +02:00
Benoit Marty
d4f48da7f0
Merge pull request #3435 from vector-im/feature/bma/debounced_click 
Debounced click
 2021-06-08 19:12:03 +02:00
ganfra
bc2233866b VoIP: Change hold direction to send-only 2021-06-07 14:46:12 +02:00
ganfra
a421f37e70 VoIP : clean and add changelog 2021-06-03 19:50:09 +02:00
ganfra
2c767e7345 Add towncrier files 2021-06-03 19:48:53 +02:00
Benoit Marty
ded3b19a44 Prepare release 1.1.9 - towncrier 2021-06-02 11:43:27 +02:00
Benoit Marty
701f549881
Merge pull request #3405 from vector-im/feature/bma/olm_upgrade 
Upgrade Olm dependency to 3.2.4
 2021-06-02 11:29:23 +02:00
Benoit Marty
68833b0180 Upgrade Olm dependency to 3.2.4 2021-06-02 10:05:14 +02:00
S1m
1e8d8b24fd 3448: newsfragment 
Signed-off-by: S1m <git@sgougeon.fr>
 2021-06-02 08:36:00 +02:00
Valere
00ee61a2a0 stable ids for MSC 2858 2021-06-01 12:13:06 +02:00
Benoit Marty
f6ac3d22ab Towncrier file 2021-05-31 17:29:13 +02:00
Benoit Marty
90a16ebbaf /snow -> /snowfall and update wording (iso Element Web) (#3430) 2021-05-31 11:03:02 +02:00
Benoit Marty
575ebdc3e8
Merge pull request #3421 from vector-im/feature/fga/call_transfer 
Feature/fga/call transfer
 2021-05-28 16:48:01 +02:00
Benoit Marty
270a195478
Merge pull request #3425 from vector-im/feature/fga/fix_crash_signout 
Fix crash on signout
 2021-05-28 15:44:02 +02:00
Benoit Marty
5657da3493
Merge pull request #3401 from vector-im/feature/bca/spaces_fix_3386 
Fixes #3386 show space description in explore header
 2021-05-28 15:27:49 +02:00
ganfra
cc6263b20f Fix crash on signout 2021-05-28 10:29:21 +02:00
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
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