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
13166 commits 46 branches 261 tags 144 MiB
Commit graph

213 commits

Author SHA1 Message Date
Doug
510010f6f5 Prepare for new sprint 2021-11-17 18:00:36 +00:00
Doug
e324767d7d Merge branch 'master' into develop 
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
 2021-11-17 17:36:44 +00:00
Doug
eda34d6289 changelog.d: Upgrade MatrixKit version ([v0.16.10](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.10)). 2021-11-17 16:01:10 +00:00
David Langley
05309f6be4 Remove buildsetting 2021-11-16 15:02:52 +00:00
David Langley
e7ef9fd218 Ignore badge updates for virtual rooms. 2021-11-16 12:00:20 +00:00
Stefan Ceriu
30ff8a65fb vector-im/element-ios/issues/5114 - Poll creation screen 
- added input toolbar poll creation action.
- reordered input toolbar actions as per designs.
- added multiline text field and extracted common components.
 2021-11-11 11:24:28 +02:00
David Langley
3695b1a3f6 Set correct default for clientPermalinkBaseUrl 2021-11-05 11:08:51 +00:00
David Langley
f372e23e58 Update matrixPermalinkPaths -> permalinkSupportedHosts for consistency with android naming 2021-11-04 16:22:58 +00:00
David Langley
d41cf3c907 Expand on BuildingSetting description and add changelog 2021-11-04 12:29:49 +00:00
David Langley
4175f3fdc3 Add clientPermalinkBaseUrl and set in matrix-sdk options. 2021-10-29 11:07:22 +01:00
SBiOSoftWhare
ef7958fa08 Prepare for new sprint 2021-10-21 20:33:33 +02:00
SBiOSoftWhare
5bd1d6a44f Merge branch 'develop' into steve/4734_room_stack 2021-10-14 16:21:03 +02:00
manuroe
a7f531f81c Prepare for new sprint 2021-10-14 09:12:33 +02:00
SBiOSoftWhare
617afe0748 BuildSettings: Add property to allow split view detail view stacking. 2021-10-12 19:06:56 +02:00
manuroe
18ad9862f5 Prepare for new sprint 2021-10-12 13:45:01 +02:00
manuroe
6cd290c754 Prepare for new sprint 2021-10-12 13:41:53 +02:00
manuroe
02b1ad8fa6 changelog.d: Upgrade MatrixKit version ([v0.16.6](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.6)). 2021-10-12 12:57:24 +02:00
manuroe
e53bcee700 Prepare for new sprint 2021-10-08 17:51:22 +02:00
manuroe
9871307539 Prepare for new sprint 2021-09-30 23:51:20 +01:00
manuroe
756b14d403 Prepare for new sprint 2021-09-24 16:14:48 +02:00
manuroe
748cd081d7 changelog.d: Upgrade MatrixKit version ([v0.16.2](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.2)). 2021-09-24 15:26:44 +02:00
manuroe
e1d5a33c8e Prepare for new sprint 2021-09-16 15:02:49 +02:00
Stefan Ceriu
d4c7a2b0d1 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
manuroe
453b8d414c Prepare for new sprint 2021-09-09 11:13:37 +02:00
Doug
dfb63e1436 Revert "Add matrix.to to firstURLDetectionIgnoredHosts." 
This reverts commit ad618b4639.
 2021-09-08 16:35:16 +01:00
Doug
ad618b4639 Add matrix.to to firstURLDetectionIgnoredHosts. 2021-09-08 16:24:50 +01:00
Doug
1c7cef52a0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
Doug
a300cab626 Merge branch 'develop' into doug/4479_media_size_selection 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-09-06 17:04:22 +01:00
Stefan Ceriu
f2dd0e256b Revert "#4693 - Drop iOS 11 support." 
This reverts commit a2b359f219.
 2021-09-06 18:24:26 +03:00
Doug
2e04123337 Add setting to disable URL previews. 
Using a temporary position in the settings screen whilst waiting for feedback.
 2021-09-03 10:19:26 +01:00
Stefan Ceriu
a786cbb90a #4693 - Drop iOS 11 support. 2021-09-01 15:55:41 +03:00
SBiOSoftWhare
69c2004c9b Prepare for new sprint 2021-08-27 18:50:19 +02:00
Doug
04c63d4e33 Merge branch 'develop' into doug/4479_media_size_selection 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
 2021-08-27 16:30:01 +01:00
David Langley
45540f1d4f
Merge pull request #4752 from vector-im/langleyd/4467_account_notification_settings 
Account Notification Settings and Keywords
 2021-08-26 11:07:11 +01:00
Doug
b61135ffb7 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-23 12:49:06 +01:00
Doug
fc75307c54 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Doug
24ff73b413 Update from feedback. 
Set notificationBodyLocalizationKey in CommonConfiguration. Remove redundant customisation. Use MXRoomMemberEventContent.
 2021-08-18 12:32:32 +01:00
David Langley
48d69ba041 run template, add entrypoint and update BuildSetting 2021-08-17 15:00:20 +01:00
Doug
9031412c02 Add an (optional) prompt when sending a video to select its size. 
Use high quality when filming video in-app.
 2021-08-16 17:48:26 +01:00
SBiOSoftWhare
e8d9057209 Move app version from AppIdentifiers.xcconfig to AppVersion.xccconfig. 2021-08-16 11:34:15 +02:00
Doug
b7245935a1 Merge branch 'develop' into doug/4479_media_size_selection 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-08-16 10:01:54 +01:00
manuroe
6b31995d0d Prepare for new sprint 2021-08-12 16:28:03 +02:00
manuroe
33d8b0021d Prepare for new sprint 2021-08-11 15:21:10 +02:00
manuroe
6165b0f280 version++ 2021-08-11 14:48:25 +02:00
Doug
64758a98bb Merge branch 'develop' into doug/4609_support_functional_members 
# Conflicts:
#	CHANGES.rst
 2021-08-09 10:20:08 +01:00
Stefan Ceriu
66f248de2d Remove labs setting for voice messages, enable the feature by default. Fixed incorrect ffmpeg arguments. 2021-08-06 14:22:52 +03:00
Doug
8b480f0e56 Enable functional members by default. 2021-08-06 10:42:18 +01:00
Doug
cefe001295
Merge branch 'develop' into doug/4609_support_functional_members 2021-08-04 11:48:04 +01:00
Doug
8ddca6b0d1 Cherry-pick from fc058c7 and eae64dc. Update CHANGES.rst. 2021-08-04 10:12:50 +01:00
manuroe
37cd8000ce Prepare for new sprint 2021-08-03 15:16:36 +02:00