filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,024 Commits 7 Branches 122 Tags 228 MiB
Commit Graph

43 Commits

Author SHA1 Message Date
SpiritCroc af489701a8 Automatic upstream merge postprocessing 
Change-Id: I0fa90d77fe47074d677355b0025e1611e598d565
 2021-10-25 19:30:04 +02:00
SpiritCroc 65bc997acc Merge tag 'v1.3.5' into sc 
Change-Id: I3e9f85a6228649c1d8a2e886a2b234c59331c619
 2021-10-25 19:29:59 +02:00
SpiritCroc d1468a50d2 [TMP] Automatic upstream merge preparation 
Change-Id: I52165397a64804cfc00893eb6484e73cf648f3bb
 2021-10-25 19:29:51 +02:00
Benoit Marty f877965550 Fastlane files 2021-10-25 12:38:53 +02:00
SpiritCroc 5d83211995 Automatic upstream merge postprocessing 
Change-Id: Iae698de2ab9d37e10f4ad845d3e28f047bc69df3
 2021-10-21 17:42:29 +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
SpiritCroc 969fa9fb26 [TMP] Automatic upstream merge preparation 
Change-Id: I40d5b4920f7f5f8e75167ae3382d585b8a5d38aa
 2021-10-21 16:27:34 +02:00
Benoit Marty d5f2a6179d Fastlane change 2021-10-20 10:44:20 +02:00
SpiritCroc 57a9ea4617 Merge tag 'v1.3.3' into sc 
Change-Id: Ie2c7157dba2c23916e99669ee5c3705c2f6cea30
 2021-10-11 12:42:06 +02:00
Benoit Marty 9acec43a48 fastlane 2021-10-11 12:04:24 +02:00
SpiritCroc bba7a691e0 Automatic upstream merge postprocessing 
Change-Id: I28aa960c79bf4807aab871ff8128d2339309342c
 2021-10-11 10:39:16 +02:00
Benoit Marty bcf6342312 Fastlane changelog 2021-10-08 15:49:58 +02:00
Benoit Marty 6e72287464 Fastlane changelog 2021-09-29 14:28:08 +02:00
Benoit Marty 0cd3bcaf15 Fastlane changelog 2021-09-27 13:06:52 +02:00
Benoit Marty 13d379badf Create changelog for fastlane 2021-09-08 17:56:01 +02:00
Benoit Marty e72bc699e9 Fix issue in link 2021-09-08 17:53:13 +02:00
Onuray Sahin dfc2460189 Changelog added. 2021-08-12 02:32:54 +03:00
Onuray Sahin 5f6541fbb5 Changelog added. 2021-08-09 00:33:18 +03:00
Onuray Sahin 3900a3ef33 fastlane changelog added. 2021-07-30 17:44:09 +03:00
Benoit Marty ba7c5acd92 fastlane change 2021-07-23 11:50:46 +02:00
Benoit Marty 60a9f6fcb8 Changelog - fastlane 2021-07-19 13:38:08 +02:00
Benoit Marty 9673b3b15b Release: fastlane 2021-07-05 09:56:27 +02:00
Benoit Marty b76fd5dd4e Prepare release 1.1.11 2021-06-22 12:27:36 +02:00
Benoit Marty d737d81458 Release 1.1.10: fastlane 2021-06-18 21:38:38 +02:00
Benoit Marty a1ebf1a3bc Prepare release 1.1.9 - fastlane 2021-06-02 11:45:03 +02:00
Benoit Marty 504507a6cc Prepare release 1.1.8 2021-05-25 18:11:26 +02:00
Benoit Marty 2f37c703a4 Prepare release 1.1.7 2021-05-12 15:13:51 +02:00
Benoit Marty 72515ee635 Prepare corrective release 1.1.6 2021-04-16 14:33:00 +02:00
Benoit Marty ccf7dd9583 Add changelog file 2021-04-14 22:41:57 +02:00
Benoit Marty 5ee8cf7ebf Prepare release 1.1.4 2021-04-09 12:40:11 +02:00
Benoit Marty 1eda7fa5bb Prepare release 1.1.3 2021-03-18 10:35:03 +01:00
Benoit Marty 2d64fe96c1 Prepare release 1.1.2 2021-03-16 22:08:29 +01:00
Benoit Marty ac02d1d48a Prepare release 1.1.1 2021-03-10 22:03:57 +01:00
Benoit Marty 809c0e720e Prepare release 1.1.0 2021-02-19 19:30:38 +01:00
Benoit Marty a8086ceb43 Prepare release 1.0.17 2021-02-09 21:07:25 +01:00
Benoit Marty e51f2b8bc1 Prepare release 1.0.16 2021-02-04 13:25:12 +01:00
Benoit Marty 061f3c6919 Prepare release 1.0.15 2021-02-03 17:07:49 +01:00
Benoit Marty f0f0aafa1b Prepare release 1.0.14 2021-01-15 11:13:36 +01:00
Benoit Marty d53650c8ae Prepare release 1.0.13 2020-12-18 10:59:43 +01:00
Benoit Marty e230cd8ee3 Prepare release 1.0.12 2020-12-15 14:16:08 +01:00
Benoit Marty 9a8f45fc6f Prepare version 1.0.11 2020-11-27 13:59:23 +01:00
Benoit Marty 619ec4faa4 Prepare release v1.0.10 2020-11-04 15:57:56 +01:00
Benoit Marty 4b2fbd4344 Prepare changelog for F-Droid (#2296) 2020-10-30 12:16:52 +01:00