filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-24 16:51:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,475 Commits 7 Branches 124 Tags 229 MiB
c73c36eb26
Commit Graph

1227 Commits

Author SHA1 Message Date
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
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
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
Benoit Marty
7616912411
Merge pull request #6436 from vector-im/feature/bma/activity_fragment_1_5_0 
Upgrade androidx activity and fragment to 1.5.0
 2022-07-06 11:44:22 +02:00
ganfra
0743140973 Fix crashes when opening Thread (#6463) 2022-07-05 17:00:01 +02:00
Benoit Marty
b68e01cda4 Changelog 2022-07-05 12:11:50 +02:00
Adam Brown
3c092c4e2a adding changelog entry 2022-07-05 10:37:41 +01:00
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
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