mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-22 09:04:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
22741 commits 7 branches 123 tags 230 MiB
Commit graph

22741 commits

This branch
This branch
All branches
Author SHA1 Message Date
Onuray Sahin
913fb1e5dc UI review fixes. 2022-12-16 17:07:26 +01:00
Yoan Pintas
14290abfcf
Merge pull request #7806 from vector-im/yostyle/update_live_status 
[Voice Broadcast] Update live indicator color
 2022-12-16 14:27:28 +01:00
SpiritCroc
1eacd0cca3 Make it harder to not find "initial sync" option in settings 
Change-Id: Iff49485ebe036a14bf03e274791275d5ff27d864
 2022-12-16 13:00:13 +01:00
SpiritCroc
987ca6dec4 Revert "stop listening timeline collection changes when app is not resumed (#7734)" 
This makes the chat view get destroyed onPause, leading to
jump-to-bottom when clicking links, opening threads etc.

This reverts commit cf59c80100.

Change-Id: I56ae7027d0488013251bc88edd0e47a19dead315
 2022-12-16 12:59:47 +01:00
Maxime NATUREL
2b9f5c4298
Merge pull request #7804 from vector-im/feature/mna/make-other-sessions-header-not-sticky 
[Session manager] Other sessions list: header should not be sticky (PSG-1115)
 2022-12-16 11:43:13 +01:00
Maxime NATUREL
648f97ba78
Merge pull request #7779 from vector-im/feature/mna/relations-api-poll-end 
[Poll] When a poll is ended, use /relations API to ensure poll results are correct (PSG-1013)
 2022-12-16 10:40:39 +01:00
yostyle
f2d2c0cb27 Update live indicator color 2022-12-16 10:32:50 +01:00
Maxime NATUREL
414d03599e Updating the changelog entry title 2022-12-16 09:53:57 +01:00
Maxime NATUREL
c2d25c8564 Collapsing header in other sessions screen 2022-12-16 09:46:52 +01:00
Maxime NATUREL
301ecdf1f7 Adding changelog entry 2022-12-15 16:46:05 +01:00
Maxime NATUREL
d7a729740e Adding click listener on the whole custom view 2022-12-15 16:02:56 +01:00
Maxime NATUREL
3191688044 Adding changelog entry 2022-12-15 15:38:50 +01:00
Onuray Sahin
a213338a22 Add changelog. 2022-12-15 17:34:35 +03:00
Onuray Sahin
ce23b80698 Fix current session ip address visibility. 2022-12-15 17:29:37 +03:00
Onuray Sahin
bc9ca3fd12 Revert "Fix ip address visibility in the current session details." 
This reverts commit f0dc6e478d.
 2022-12-15 17:26:39 +03:00
Onuray Sahin
f0dc6e478d Fix ip address visibility in the current session details. 2022-12-15 16:48:32 +03:00
Maxime NATUREL
eb31174913 Toggle selection on long press even when in selection mode 2022-12-15 14:39:22 +01:00
dependabot[bot]
67edf66856
Bump sentry-android from 6.9.0 to 6.9.2 (#7731) 
Bumps [sentry-android](https://github.com/getsentry/sentry-java) from 6.9.0 to 6.9.2.
- [Release notes](https://github.com/getsentry/sentry-java/releases)
- [Changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-java/compare/6.9.0...6.9.2)

---
updated-dependencies:
- dependency-name: io.sentry:sentry-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-12-15 14:34:55 +01:00
Maxime NATUREL
9178426ec1 Adding changelog entry 2022-12-15 14:31:46 +01:00
Maxime NATUREL
a86f2e03cc Make the radiogroup scrollable to better support landscape on small devices 2022-12-15 14:14:48 +01:00
Onuray Sahin
6d40bd157f Add changelog. 2022-12-15 16:00:03 +03:00
Onuray Sahin
cc33c008ba Automatically show keyboard after learn more bottom sheet is dismissed. 2022-12-15 15:50:02 +03:00
SpiritCroc
05fc840b3b [merge] Fix gplay build 
Change-Id: I1fe6ca3a1b2e4355377da9e508b56c4e44eb7c26
 2022-12-15 11:45:48 +01:00
Maxime NATUREL
9736a8f571 Adding changelog entry 2022-12-15 11:26:12 +01:00
Maxime NATUREL
dcb8aea292 Hiding the filter icon in top bar when in selection mode 2022-12-15 11:02:59 +01:00
SpiritCroc
f6801a5be0 Revert "[TMP] merge_helpers.sh: Hardcode develop branch" 
This reverts commit d13494aa67.
 2022-12-15 11:02:24 +01:00
SpiritCroc
6fc5f6d378 Automatic SchildiChat string correction 
Change-Id: I81f8f9f911bc69dad440d782c3afc3349995704d
 2022-12-15 11:02:21 +01:00
SpiritCroc
b9d18a94fc Automatic upstream merge postprocessing 
Change-Id: I2512edeb09524f862eff2c0f287556d99e85aae8
 2022-12-15 11:02:20 +01:00
SpiritCroc
330f0cf5cc Merge tag 'v1.5.12' into sc 
Change-Id: I4c53d64845ee05ff395e5df436a0739c87798737

Conflicts:
	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/RoomSummaryUpdater.kt
	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/user/accountdata/AccountDataAPI.kt
	vector-app/build.gradle
	vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt
	vector-config/src/main/res/values/config-settings.xml
	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
	vector/src/main/java/im/vector/app/features/home/room/list/RoomSummaryItemFactory.kt
	vector/src/main/java/im/vector/app/features/notifications/NotificationUtils.kt
 2022-12-15 11:01:52 +01:00
Maxime NATUREL
cf98963cdb Adding changelog entry 2022-12-15 10:41:44 +01:00
SpiritCroc
5d30146a4b [TMP] Automatic upstream merge preparation 
Change-Id: If24c33d54a205bcd5721ad620725e9c2bf7ca7b3
 2022-12-15 10:39:04 +01:00
SpiritCroc
243af7358f Automatic revert to unchanged upstream strings, pt.1 
Change-Id: I03f5d0d1693253d23b9cd25b57228a288ca83a99
 2022-12-15 10:39:04 +01:00
SpiritCroc
d13494aa67 [TMP] merge_helpers.sh: Hardcode develop branch 
Change-Id: I3aecb7aae1d16b0f578a15b6271d2e66bc443cea
 2022-12-15 10:38:32 +01:00
Benoit Marty
8c49609aa6 version++ 2022-12-15 10:20:26 +01:00
Benoit Marty
7341e5c47b Merge branch 'release/1.5.12' into main 2022-12-15 10:18:25 +01:00
Benoit Marty
8a47ef756a Merge branch 'release/1.5.12' into develop 2022-12-15 10:18:24 +01:00
Benoit Marty
cf1a115c67 Merge branch 'release/1.5.12' into main 2022-12-15 10:16:25 +01:00
Benoit Marty
dd88ac597e Adding fastlane file for version 1.5.12 2022-12-15 10:16:02 +01:00
Benoit Marty
82ad08aced Changelog for version 1.5.12 2022-12-15 10:15:24 +01:00
Maxime NATUREL
e5663ec1c3 Fixing unit tests 2022-12-15 09:45:17 +01:00
Nikita Fedrunov
cf3abd6562
thread list loading (#7766) 2022-12-14 18:56:16 +01:00
Yoan Pintas
c74ea2dd16
Merge pull request #7719 from vector-im/feature/fre/voice_broadcast_last_message 
Voice Broadcast - Update last message in the room list
 2022-12-14 17:39:42 +01:00
Maxime NATUREL
4e4f72f241 Fixing code styling issues 2022-12-14 17:37:45 +01:00
Maxime NATUREL
dd13e1cb6d Fixing Copyright in SDK 2022-12-14 17:02:09 +01:00
Maxime NATUREL
66abda63ee Removing unused imports 2022-12-14 16:35:34 +01:00
Maxime NATUREL
bd7b6d6495 Adding unit test on task to fetch the poll response events 2022-12-14 16:33:27 +01:00
Nikita Fedrunov
e0a611a16e
changed copy for threads labs flag (#7776) 2022-12-14 15:13:24 +01:00
Maxime NATUREL
644803dcf3 Adding unit test on aggregation processor 2022-12-14 14:31:27 +01:00
Maxime NATUREL
9338ec9805 Mutualizing decryption of event 2022-12-14 11:49:41 +01:00
Maxime NATUREL
8b7c8e3351 Task to ensure aggregation of all poll responses when receiving ending poll event 2022-12-14 11:27:08 +01:00