mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-24 16:53:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
22727 commits 7 branches 125 tags 235 MiB
Commit graph

1763 commits

Author SHA1 Message Date
ganfra
f58ba13ef0 Timeline: fix validation of timeline event changes 2022-07-05 10:41:22 +02:00
Benoit Marty
a51d626fe8 Changelog 2022-07-05 09:40:27 +02:00
Adam Brown
2c444527bd
Merge pull request #6447 from cloudrac3r/fix-html-entities 
Fix HTML entities being displayed in messages
 2022-07-04 17:31:34 +01:00
Benoit Marty
d43c802c90 Changelog 2022-07-04 17:48:35 +02:00
Maxime NATUREL
f3e7d0daff
Merge pull request #6431 from vector-im/fix/mna/closed-poll-visible-votes 
[Poll] - Wrong votes in closed poll after removing 2 previous polls (PSG-590)
 2022-07-04 11:33:26 +02:00
Maxime NATUREL
906fe8be76
Merge pull request #6425 from vector-im/fix/mna/undisclosed-poll-description 
[Poll] - Add a description under undisclosed poll when not ended (PSB-134)
 2022-07-04 11:20:59 +02:00
Cadence Ember
b8734a23a9 Gallery picker can pick external images 2022-07-04 16:42:43 +12:00
Cadence Ember
84bb11c1bf Fix HTML entities being displayed in messages 
Initially reported in #6445. Fixes #6445.
This was a regression from #6357.

The fix is to enable Markwon's HTML entities processor.
 2022-07-04 01:07:14 +12:00
Benoit Marty
93b7e1094c
Merge pull request #6434 from vector-im/feature/bca/check_serialized_frozen 
Simple check to prevent frozen class modificaiton
 2022-07-01 18:01:08 +02:00
Valere
8dc57fe2f0
Merge pull request #5853 from vector-im/feature/aris/crypto_share_room_keys_past_messages 
Share Megolm session keys when inviting a new user
 2022-07-01 17:33:43 +02:00
Eric Decanini
bdb49f5946
Merge pull request #5398 from vector-im/bugfix/eric/softlogout-ux-broken 
Fixes broken SoftLogout UX for homeservers that support both Password and SSO
 2022-07-01 15:52:48 +01:00
ericdecanini
b437996208 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-01 15:47:30 +01:00
Maxime NATUREL
d5b375e82b
Merge pull request #6414 from vector-im/feature/mna/reply-to-lls 
[Location sharing] - Reply action on a live message (PSG-343)
 2022-07-01 16:03:02 +02:00
Valere
a92fae6d25 add change log 2022-07-01 12:00:26 +02:00
Artjom König
03da067e44 fixed issues with reporting sync state events from different threads 2022-07-01 11:03:29 +02:00
ariskotsomitopoulos
45c80de333 Add changelog 2022-07-01 09:42:31 +02:00
Florian Renaud
33a19c1ef5 Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop: (91 commits)
  Remove unused import
  Update versions
  Update CHANGES
  Improve readability.
  Weblate: also clean trads
  Changelog
  Format file
  Add android:hasFragileUserData="true" to the manifest. See details in #2352
  Clean the TODO delete (UnusedResource not compatible with string template)
  showing a toast on password reset confirmation
  lifting duplicated event_base layout to the base class, with the option for children to override
  using vector model for consistency
  Replace 5 manual steps to 1 command line step
  Translated using Weblate (Italian)
  Translated using Weblate (Swedish)
  Translated using Weblate (Swedish)
  Translated using Weblate (Russian)
  extracting common breaker background selection to ftue extensions
  removing unused imports
  adding changelog entry
  ...
 2022-07-01 09:35:40 +02:00
Benoit Marty
c77ecc6a21
Merge pull request #6288 from deepbluev7/nico/stable-aliases 
Use stable endpoint for alias management
 2022-06-30 22:30:14 +02:00
Benoit Marty
58580f1e6a
Merge pull request #6413 from vector-im/feature/bma/room_member_loading 
Show a loader if all the Room Member are not yet loaded.
 2022-06-30 17:13:50 +02:00
Benoit Marty
98a7f7df4d
Merge pull request #6429 from vector-im/feature/bma/fragile_data 
Add `android:hasFragileUserData="true"` in the manifest
 2022-06-30 17:11:27 +02:00
ganfra
415b0d4820 Merge branch 'release/v1.4.26' into develop 2022-06-30 16:55:52 +02:00
Adam Brown
72c4af0026
Merge pull request #6263 from vector-im/feature/adm/ftue-forgot-password 
[FTUE] Forgot password
 2022-06-30 15:40:09 +01:00
Adam Brown
ea71a8b5c2
Merge pull request #6415 from vector-im/feature/adm/replacing-epoxy-layout-id 
Replacing epoxy item annotation layout references with getDefaultLayoutId
 2022-06-30 14:58:46 +01:00
Benoit Marty
90e851a4bc
Merge pull request #6392 from vector-im/feature/bma/safe_clearWith 
Ensure clearWith lambda is deleting all the list item
 2022-06-30 15:46:53 +02:00
Maxime NATUREL
18efa84e3a Adding changelog entry 2022-06-30 14:58:32 +02:00
Benoit Marty
0c98a2f81f Changelog 2022-06-30 14:20:45 +02:00
Florian Renaud
3f087eb632 Merge branch 'develop' into feature/fre/start_dm_on_first_msg 
* develop: (174 commits)
  Bump libphonenumber from 8.12.50 to 8.12.51
  LoadRoomMember: fix presence
  Cleanup
  LoadRoomMembers: add changelog
  LoadRoomMembers: handle room member event a bit more efficiently
  LoadRoomMembers: exclude Membership.Leave
  LoadRoomMembers: divide by chunk
  Bump soloader from 0.10.3 to 0.10.4
  Code review fix.
  Try no using the gradle daemon on CI
  Harmonize values of `CI_GRADLE_ARG_PROPERTIES`
  removing unused dependencies and marking soloader and ignored from dependency check (as it's dynamic)
  Remove non necessary prefix in logs
  Adding changelog entry
  Updating the unit tests
  Stopping existing active live when starting a new one
  Avoid multiple PR from Dependabot when Flipper is upgraded.
  Change context inside the get live summary use case
  Use a TestDispatcher in the FakeSession
  Code review fixes.
  ...
 2022-06-30 11:48:55 +02:00
Maxime NATUREL
55bb6fa21a Adding changelog entry 2022-06-30 10:13:41 +02:00
ganfra
778269f831
Merge pull request #6410 from vector-im/feature/fga/load_room_members_by_chunk 
Feature/fga/load room members by chunk
 2022-06-30 08:56:43 +02:00
Adam Brown
85264401cc adding changelog entry 2022-06-29 17:35:45 +01:00
ericdecanini
9350053214 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
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo030.kt
 2022-06-29 17:05:28 +02:00
ericdecanini
4cf97d48c9 Merge remote-tracking branch 'origin/develop' into bugfix/eric/softlogout-ux-broken 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/DefaultAuthenticationService.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/auth/registration/DefaultRegistrationWizard.kt
#	vector/src/main/java/im/vector/app/features/login/LoginActivity.kt
#	vector/src/main/java/im/vector/app/features/signout/soft/SoftLogoutController.kt
 2022-06-29 15:53:22 +02:00
Maxime NATUREL
0a0eb08de9 Adding changelog entry 2022-06-29 15:04:57 +02:00
Onuray Sahin
abea68557b
Merge pull request #6350 from vector-im/feature/ons/promote_live_location_labs_flag 
Promote live location labs flag [PSF-959]
 2022-06-29 15:26:39 +03:00
Benoit Marty
7c4df42aa8 changelog 2022-06-29 12:24:10 +02:00
ericdecanini
e87d97083f Merge remote-tracking branch 'origin/develop' into bugfix/eric/upgrade-room-deduplication 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/VersioningState.kt
 2022-06-29 12:02:34 +02:00
ganfra
1a33f6e094
Merge branch 'develop' into feature/fga/load_room_members_by_chunk 2022-06-29 11:45:52 +02:00
ganfra
9233007d97 LoadRoomMembers: add changelog 2022-06-29 11:37:15 +02:00
Maxime NATUREL
e7a68907f9
Merge pull request #6365 from vector-im/feature/mna/start-lls-from-other-device 
[Location sharing] - Stop any active live before starting a new one (PSF-942)
 2022-06-29 09:47:26 +02:00
Maxime NATUREL
d112f860a2
Merge pull request #6356 from vector-im/fix/mna/stop-lls-from-other-device 
[Location sharing] - Make stop of a live from another device possible (PSF-1060)
 2022-06-29 09:45:44 +02:00
Benoit Marty
6fda2cc7b3
Merge pull request #6101 from chagai95/native-lookup-fixes 
Native lookup fixes
 2022-06-28 15:43:35 +02:00
Maxime NATUREL
ca7b469d28 Adding changelog entry 2022-06-28 14:36:38 +02:00
Benoit Marty
c50c9b9ae8
Merge pull request #6396 from vector-im/feature/manu/pr-optional-2nd-review 
Update the PR process doc to come back to one reviewer
 2022-06-28 14:20:52 +02:00
Valere
a2aa0471c5
Merge pull request #6328 from vector-im/feature/bca/verif_resist_no_age 
Feature/bca/verif resist no age
 2022-06-28 14:13:37 +02:00
manuroe
65b634fe95 Update the PR process doc to come back to one reviewer 
with optional additional reviewers
 2022-06-28 12:32:01 +02:00
Valere
c0a2b39f6d add change log 2022-06-28 12:24:14 +02:00
Benoit Marty
98df2d82db Changelog 2022-06-28 12:03:34 +02:00
Maxime NATUREL
af3718d202
Merge pull request #6376 from vector-im/fix/mna/geo-uri-pattern 
[Location Share] - Adding missing prefix "u=" for uncertainty in geo URI (PSF-945)
 2022-06-28 09:24:55 +02:00
Benoit Marty
a398391908
Merge pull request #6366 from vector-im/feature/ons/poll_view_state_unit_tests 
Poll view state unit tests [PSF-1130]
 2022-06-27 19:59:13 +02:00
Adam Brown
71d1024fe9 adding changelog entry 2022-06-27 13:08:32 +01:00