Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
18964 commits 46 branches 261 tags 144 MiB
Commit graph

18964 commits

This branch
This branch
All branches
Author SHA1 Message Date
aringenbach
9d55eb0ce6 Bump composer version to 2.0.0 and fix PillAttachmentViewProvider 2023-04-11 14:45:44 +02:00
aringenbach
e61c2f18ec Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-11 14:21:31 +02:00
Nicolas Mauri
dadeef7efa Fix: Continue to display pills for matrix.to permalinks if a custom permalinkBaseUrl is set. 2023-04-07 16:40:34 +02:00
Stefan Ceriu
0aef339783 Pin Xcode version to 14.2. The app is currently failing ASC validation on using private symbols from Down. 2023-04-05 12:55:01 +03:00
Stefan Ceriu
0e25cf1238 Prepare for new sprint 2023-04-04 15:00:52 +03:00
Stefan Ceriu
673d1a3100 Merge branch 'master' into develop 2023-04-04 15:00:50 +03:00
Stefan Ceriu
9b2c7a613e Merge branch 'release/1.10.9/master' 2023-04-04 15:00:45 +03:00
Stefan Ceriu
bfbaf09f08 finish version++ 2023-04-04 15:00:45 +03:00
Stefan Ceriu
e8865b2a5d
Merge pull request #7474 from vector-im/release/1.10.9/release 
Release 1.10.9
 2023-04-04 14:47:48 +03:00
Stefan Ceriu
78700ffc95 version++ 2023-04-04 14:06:58 +03:00
Stefan Ceriu
e7dd531899 changelog.d: Upgrade MatrixSDK version ([v0.26.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.6)). 2023-04-04 14:06:57 +03:00
Anderas
5334087ffd
Merge pull request #7471 from vector-im/andy/event_shield 
No event decoration if no decryption result
 2023-04-04 08:28:35 +01:00
Andy Uhnak
dfb4d7ca64 No event decoration if no decryption result 2023-04-03 17:36:45 +01:00
Anderas
d3b7fbbd90
Merge pull request #7469 from vector-im/andy/qr_code 
Start QR scanning when camera ready
 2023-04-03 17:36:23 +01:00
Andy Uhnak
220fc3e605 Start QR scanning when camera ready 2023-04-03 16:16:39 +01:00
Nicolas Mauri
eeb0abeecb
Merge pull request #7461 from vector-im/nimau/7420-readmarker 
Fix: Update the read marker position even if it is not displayed
 2023-04-03 14:34:42 +02:00
Hugh Nimmo-Smith
54800f33e2
Support for MSC3906 v2 (#7407) 2023-04-01 11:56:56 -04:00
Nicolas Mauri
f63efbe843 Code cleanup 2023-03-31 16:47:37 +02:00
Anderas
de5ece66b7
Merge pull request #7466 from vector-im/andy/crypto_rollout 
Expand rust crypto rollout to 50% users
 2023-03-31 14:51:08 +01:00
Andy Uhnak
75743a5e22 Expand rust crypto rollout to 50% users 2023-03-31 12:25:52 +01:00
Nicolas Mauri
dc18e22686 Fix comments 2023-03-30 10:31:33 +02:00
Nicolas Mauri
4913396b9f Fix: read marker update 2023-03-30 10:15:15 +02:00
Nicolas Mauri
6d24e00d40 Fix: read marker update 2023-03-30 10:15:15 +02:00
Nicolas Mauri
c061171de3 Fix: Update the read marker position even if it is not displayed 2023-03-30 10:15:15 +02:00
Nicolas Mauri
45668e6009
Merge pull request #7455 from vector-im/nimau/7413-pills-max-width 
Fix: truncate pills if they are too long
 2023-03-30 10:12:47 +02:00
Nicolas Mauri
334a116a05 Fix: do not encode the maximum width of a Pill 2023-03-30 10:09:27 +02:00
Andy Uhnak
57cfec0286 Merge branch 'develop' of github.com:vector-im/element-ios into develop 2023-03-28 18:01:06 +01:00
Andy Uhnak
c4e33103b4 Prepare for new sprint 2023-03-28 17:53:21 +01:00
Andy Uhnak
44dc083dec Merge branch 'master' into develop 2023-03-28 17:53:17 +01:00
Andy Uhnak
75b00aaea9 Merge branch 'release/1.10.8/master' 2023-03-28 17:53:11 +01:00
Andy Uhnak
02e18cf8f3 finish version++ 2023-03-28 17:53:11 +01:00
Anderas
d2112c13c3
Merge pull request #7460 from vector-im/release/1.10.8/release 
Release 1.10.8
 2023-03-28 17:52:33 +01:00
Doug
20fd4a7f23
Replace Ts&Cs with Acceptable Use Policy. (#7459) 2023-03-28 17:38:58 +01:00
Andy Uhnak
bfaf89e3e3 version++ 2023-03-28 16:54:37 +01:00
Andy Uhnak
43907ecc39 changelog.d: Upgrade MatrixSDK version ([v0.26.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.5)). 2023-03-28 16:54:37 +01:00
Anderas
183123be50
Merge pull request #7454 from vector-im/andy/upgrade_security 
Display upgrade verification prompt
 2023-03-28 15:00:43 +01:00
Andy Uhnak
8202617b70 Update copy 2023-03-28 14:52:08 +01:00
Anderas
a28e8ed0a5
Merge pull request #7458 from vector-im/andy/crypto_version 
Display correct version of Crypto SDK
 2023-03-28 14:20:13 +01:00
Doug
71a69d04ff
Add user suggestions for @room. (#7453) 2023-03-28 14:03:39 +01:00
Andy Uhnak
abe99025d7 Display correct version of Crypto SDK 2023-03-28 13:18:43 +01:00
Nicolas Mauri
97762330b2 Fix: truncate pills if they are too long 2023-03-28 11:59:52 +02:00
Anderas
6e4869259b
Merge pull request #7440 from vector-im/andy/trust_shields 
Simplify event encryption decoration
 2023-03-27 17:16:52 +01:00
Andy Uhnak
bff0b28b4b Display upgrade verification prompt 2023-03-27 15:44:44 +01:00
Andy Uhnak
39fdbc901e Simplify event encryption decoration 2023-03-27 14:58:10 +01:00
Kat Gerasimova
7dafa67e6f Fix typo in issue automation 2023-03-24 10:29:44 +00:00
aringenbach
3f9d6540dd Add changelog 2023-03-23 17:16:57 +01:00
aringenbach
f83599b83f Bump composer version to 1.4.0 2023-03-23 17:16:57 +01:00
aringenbach
052acddc3b Update environment object setup and view model context wrapping to restore SwiftUI UI tests 2023-03-23 17:16:57 +01:00
aringenbach
b38ba7306f Fix wrong condition for highlight test 2023-03-23 17:16:57 +01:00
aringenbach
7b5a46f29e Allow displaying UserSuggestionList without shadow 2023-03-23 17:16:57 +01:00