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

1259 Commits

Author SHA1 Message Date
ericdecanini 9e1235d51f Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo034.kt
 2022-07-20 16:44:33 +02:00
Onuray Sahin 7f821f1285
Merge pull request #6587 from vector-im/feature/ons/fix_live_location_sharing_permission 
Check user power level before sharing live location (PSG-620)
 2022-07-20 15:01:32 +03:00
Maxime NATUREL 7639f158d7
Merge pull request #6600 from vector-im/bugfix/mna/lls-ended-too-soon 
[Location Share] - Live is considered as ended while still active (PSG-617)
 2022-07-20 14:01:05 +02:00
Valere a8cd77c267
Merge pull request #6585 from vector-im/feature/bca/fix_backup_regression 
fix backup looping same keys
 2022-07-20 13:52:47 +02:00
Onuray Sahin 26a677edc2
Merge branch 'develop' into feature/ons/fix_live_location_sharing_permission 2022-07-20 13:40:55 +03:00
Eric Decanini 38ba61f144
Merge pull request #6200 from vector-im/bugfix/eric/upgrade-room-deduplication 
Fixes room not being in space after upgrade
 2022-07-20 12:30:42 +02:00
ericdecanini ee941cf88d Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo033.kt
 2022-07-20 10:56:07 +02:00
Maxime NATUREL a48d33dc3c Adding changelog entry 2022-07-20 09:57:54 +02:00
Valere 51376cc202 add change log 2022-07-20 09:57:31 +02:00
Maxime NATUREL 448b6e1c74
Merge pull request #6539 from vector-im/bugfix/mna/lls-status-bar-disappearing 
[Location Share] - Wrong room live location status bar visibility in timeline (PSG-625)
 2022-07-20 09:55:06 +02:00
Maxime NATUREL c3105c8bb1
Merge pull request #6486 from vector-im/feature/mna/delete-lls 
[Location sharing] - Delete action on a live message (PSG-523)
 2022-07-19 16:43:41 +02:00
Maxime NATUREL b08337e3a7
Merge pull request #6501 from vector-im/feature/mna/collapse-deleted-events 
[Timeline] - Collapse redacted events (PSG-523)
 2022-07-19 16:39:45 +02:00
Onuray Sahin 9976b3b8ac
Merge pull request #6567 from vector-im/feature/ons/share_location_with_other_apps 
Share location with other apps (PSG-242)
 2022-07-19 17:08:36 +03:00
Benoit Marty 70c62233d0
Merge pull request #6569 from vector-im/feature/adm/ftue-copy-review 
FTUE - Copy review
 2022-07-19 14:49:28 +02:00
Benoit Marty 70c8703b2b
Merge pull request #6545 from vector-im/feature/adm/ftue-combined-register-copy-review 
FTUE - Combined register copy review
 2022-07-19 14:44:29 +02:00
Maxime NATUREL d2d24cbcbe Adding a changelog entry 2022-07-19 14:43:33 +02:00
Maxime NATUREL e26759fa89 Adding changelog entry 2022-07-19 14:05:13 +02:00
Maxime NATUREL 578d90e463 Adding changelog entry 2022-07-19 14:04:08 +02:00
Eric Decanini 221cb24de8
Merge pull request #6584 from vector-im/task/eric/new_layout_feature_flag 
Adds NewAppLayoutEnabled Feature Flag
 2022-07-19 12:24:16 +01:00
Onuray Sahin 8b6e4dd4d4
Merge pull request #6579 from vector-im/feature/ons/fix_remove_live_location_logs 
Do not log the live location of the user (PSG-63)
 2022-07-19 12:18:58 +03:00
ericdecanini e926871570 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
 2022-07-19 11:17:14 +02:00
Onuray Sahin 5fb10ab287 Changelog added. 2022-07-18 18:52:37 +03:00
Benoit Marty 428942d407 Changelog 2022-07-18 17:22:49 +02:00
ericdecanini b769eafcc3 Adds changelog file 2022-07-18 16:57:54 +02:00
ericdecanini c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
 2022-07-18 15:05:04 +02:00
ericdecanini 67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-18 15:03:42 +02:00
Benoit Marty 4ed24b5571
Merge pull request #6478 from vector-im/feature/bma/nightly 
Nightly build published on Firebase
 2022-07-18 14:22:15 +02:00
Onuray Sahin 82fed20145 Changelog added. 2022-07-18 13:53:18 +03:00
Maxime NATUREL 6b403ec224
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text 
[Location Share] - Standardise "Stop" texts for live (PSG-622)
 2022-07-18 10:43:43 +02:00
Nikita Fedrunov 79762d9133
font scale setting screen (#6453) 2022-07-18 09:49:57 +02:00
Benoit Marty cdbc197426
Merge pull request #6549 from vector-im/feature/bma/fix_6514 
Just go back to the timeline if the user is already viewing the DM with the other user.
 2022-07-18 09:48:44 +02:00
Maxime NATUREL cedeb8fa50 Adding changelog entry 2022-07-18 09:43:33 +02:00
Adam Brown 42ceb1f7f2 Merge branch 'feature/adm/ftue-combined-register-copy-review' into feature/adm/ftue-copy-review 2022-07-15 18:09:40 +01:00
Adam Brown 0879e1581c adding changelog entry 2022-07-15 18:09:04 +01:00
Adam Brown 347c07ec35 adding changelog entry 2022-07-15 16:02:46 +01:00
Onuray Sahin 619da0e84d Changelog added. 2022-07-15 15:45:00 +03:00
Valere e8bd7ea967 fix olm session proliferation 2022-07-15 14:17:44 +02:00
Nikita Fedrunov c7b54b8d3d
legacy groups removal (#6268) 2022-07-15 12:25:10 +02:00
Jorge Martín 6c1016caff Fixes wrong voice message being displayed and played on the timeline. 2022-07-14 17:21:16 +02:00
Benoit Marty d10d8d740f Changelog 2022-07-13 22:48:58 +02:00
Benoit Marty a85ebbfc34 Run towncrier 2022-07-13 12:42:20 +02:00
Florian Renaud 909ce290c8
Merge pull request #6051 from vector-im/feature/fre/start_dm_on_first_msg 
Start DM on first message (UI)
 2022-07-12 15:12:17 +02:00
Florian Renaud 68bd55fef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop: (156 commits)
  adding test case for showing html entities are processed
  adding tests around the event html rendering - the test helper is a little hacky in order to covert the spans to something human readable
  removing extra line
  adding changelog entry
  overriding the default list handler with an implementation that takes into account the initial starting position
  trigger CI
  Use executeTransactionAwait (need realm refresh in this case)
  Bump flipper from 0.152.0 to 0.153.0
  Use executeTransactionAwait (need realm refresh in this case)
  generating 1.4.27 changelog and updating version
  Fixing crash when sharing plain text, such as a url
  Fix crashes when opening Thread (#6463)
  Timeline: fix validation of timeline event changes
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix crashes when opening Thread (#6463)
  suppressing unused string resource
  Changelog
  Fix ConcurrentModificationException on BackgroundDetectionObserver
  Fix typo
  adding changelog entry
  ...
 2022-07-11 12:03:24 +02:00
Adam Brown bdc370474e migrating the previous orphaned rooms settings in order to fix the inconsistent value 
- only uses the previous value if the key exists, otherwise we end up defaulting to true instead of false (which the preferences screen expects)
- manually deletes the key after migrating the value
 2022-07-08 11:20:49 +01:00
Adam Brown ff2fc3e0a7 adding changelog entry 2022-07-07 13:47:42 +01:00
Adam Brown 67d5289f01
Merge pull request #6462 from vector-im/feature/fga/fix_6461 
Timeline: fix validation of timeline event changes
 2022-07-07 11:25:33 +01:00
Adam Brown 3e770f9efa
Merge pull request #6474 from vector-im/feature/fga/fix_6463 
Fix crashes when opening Thread (#6463)
 2022-07-07 11:12:28 +01:00
Adam Brown 4126e6418b
Merge pull request #6469 from vector-im/feature/bma/fix_crash_on_DefaultBackgroundDetectionObserver 
Fix ConcurrentModificationException on BackgroundDetectionObserver
 2022-07-07 10:58:26 +01:00
Benoit Marty 253480fd2b Changelog 2022-07-06 15:38:06 +02:00
Adam Brown 89348995c2
Merge pull request #6467 from vector-im/feature/adm/share-text-crash 
Crash - Sharing text
 2022-07-06 11:24:56 +01:00