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

12351 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
6b31995d0d Prepare for new sprint 2021-08-12 16:28:03 +02:00
manuroe
89043074fb Merge branch 'master' into develop 2021-08-12 16:27:59 +02:00
manuroe
5e12c7e5ca Merge branch 'release/1.5.1/master' 2021-08-12 16:27:55 +02:00
manuroe
d8408328a0 finish version++ 2021-08-12 16:27:55 +02:00
manuroe
218e8c0197
Merge pull request #4704 from vector-im/release/1.5.1/release 
Release 1.5.1
 2021-08-12 16:22:45 +02:00
manuroe
dea1d5f401 version++ 2021-08-12 15:49:07 +02:00
manuroe
c5f818bd92 Remove changelog files by hand 2021-08-12 15:11:41 +02:00
manuroe
751c37c568 Remove changelog files by hand 2021-08-12 15:03:53 +02:00
David Langley
3dfdb0fa83 Fix avatar service not returning generated image on network error. Fix padding and make nav buttons private. 2021-08-12 13:49:56 +01:00
Doug
0311be1694
Merge pull request #4699 from vector-im/doug/4698_fix_dm_border_crash 
Fix crash when showing an invite in the People tab.
 2021-08-12 13:11:19 +01:00
David Langley
33aea8588f Remove visibility modifier 2021-08-12 12:42:26 +01:00
Doug
8cc9340806 Localise contacts disabled alert strings. 2021-08-12 12:29:20 +01:00
Doug
9619a3b36d Fix bug where RequestContactsAccessFooterView could still be visible beneath the contacts. 2021-08-12 12:20:08 +01:00
David Langley
7fa2f135cc add towncrier 2021-08-12 12:03:36 +01:00
David Langley
7d1b893db6 Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/4669_room_notification_settings_swiftui 2021-08-12 11:52:50 +01:00
David Langley
c6ba23ec70 Add theming support, and support for other top level configuration to swiftui views with VectorHostingViewController, VectorContentModifier. Add VisibilityModifier. Move from List to VStack. 2021-08-12 11:52:06 +01:00
Doug
744e747c61 Add changelog entry. 2021-08-12 10:07:08 +01:00
Doug
2049891e8c Remove additional directRoomBorderView from RecentRoomTableViewCell (share extension). 2021-08-12 10:03:49 +01:00
Doug
3682d5c5be Remove directRoomBorderView from InviteRecentTableViewCell.xib. 2021-08-12 09:50:18 +01:00
Doug
730c7f93c9 Update the value of notificationBodyLocalizationKey to "NOTIFICATION". 2021-08-12 09:35:30 +01:00
ismailgulek
cbe5b22990
Add changelog 2021-08-12 11:08:40 +03:00
ismailgulek
24a57512ca
Merge branch 'develop' into element_4471 2021-08-12 11:08:29 +03:00
Doug
5e8da21cff Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-11 17:18:09 +01:00
Doug
0d4856866e Merge branch 'develop' into doug/4484_contacts_access 2021-08-11 17:15:23 +01:00
Doug
32f4fccadf Use areAllTermsAgreed instead of hasAccountDataIdentityServerValue. Move identity server terms modal from LegacyAppDelegate into ContactsTableViewController. 2021-08-11 17:13:15 +01:00
manuroe
23f99bbe69 Remove changelog files by hand 
There was a bug in the release script
 2021-08-11 15:32:13 +02:00
manuroe
33d8b0021d Prepare for new sprint 2021-08-11 15:21:10 +02:00
manuroe
6f8490d02a Merge branch 'master' into develop 2021-08-11 15:21:08 +02:00
manuroe
c2cc28c553 Merge branch 'release/1.5.0/master' 2021-08-11 15:21:04 +02:00
manuroe
eee5e17b34 finish version++ 2021-08-11 15:21:04 +02:00
manuroe
e71d5b009f
Merge pull request #4694 from vector-im/release/1.5.0/release 
Release 1.5.0
 2021-08-11 15:20:26 +02:00
manuroe
6165b0f280 version++ 2021-08-11 14:48:25 +02:00
manuroe
decb39ae6b
Merge pull request #4692 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Translations update from Weblate
 2021-08-11 12:36:39 +02:00
manuroe
0e145b5f83
Merge pull request #4691 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Translations update from Weblate
 2021-08-11 12:36:09 +02:00
manuroe
3605b69be0
Merge pull request #4690 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-08-11 12:35:39 +02:00
Weblate
9c10038aa7 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:58 +00:00
Weblate
560009b90d Merge branch 'origin/develop' into Weblate. 2021-08-11 10:25:53 +00:00
Weblate
f910f4c2f6 Merge branch 'origin/develop' into Weblate. 2021-08-11 10:22:48 +00:00
Doug
c0f0a115e1
Merge pull request #4643 from vector-im/doug/4609_support_functional_members 
Add support for functional members
 2021-08-11 11:21:57 +01:00
manuroe
2276fc8fc9
Merge pull request #4684 from HonkXL/develop 
fixed typo "adress" - fixes issue #4480
 2021-08-11 12:21:32 +02:00
manuroe
058d4ea2ff
Merge pull request #4689 from vector-im/manu/4393_towncrier_release_script 
Make Towncrier compatible with the release script
 2021-08-11 12:07:28 +02:00
manuroe
3414460414 changelog 2021-08-11 11:47:39 +02:00
manuroe
db3a6b490a Make Towncrier compatible with the release script 2021-08-11 11:45:01 +02:00
Doug
834cb7f38d Match StartChatViewController colours to latest Figma. 2021-08-10 13:05:11 +01:00
Doug
57e5534e9a Disable the contact access footer view in Unified Search. 2021-08-10 12:32:07 +01:00
Doug
d1b9c9ebd6 Take into account the identity server when setting the default value of showLocalContacts. 2021-08-10 12:03:28 +01:00
Doug
4b3e6e3682
Merge pull request #4681 from vector-im/doug/4677_fix_contacts_warnings 
Fix warnings in Contacts module
 2021-08-10 11:04:24 +01:00
Thomas Weiland
01bd464191
Create 4480.bugfix 2021-08-10 11:52:16 +02:00
Doug
dfa4c90f35 Fix localisation key. 2021-08-10 10:45:33 +01:00
Doug
4a26465ee3 Add changelog entries. 2021-08-10 10:31:34 +01:00