Commit Graph

255 Commits

Author SHA1 Message Date
Frank Rotermund
4b1ca0ff7f Feature/2897 restricted user 2022-03-22 14:37:58 +00:00
Frank Rotermund
c2108a2178 MESSENGER-2762 Initial Merge 2022-03-17 15:51:23 +01:00
Stefan Ceriu
35eb1b1889 changelog.d: Upgrade MatrixSDK version ([v0.22.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.1)). 2022-02-16 12:42:00 +02:00
Doug
5a652fcd46 changelog.d: Upgrade MatrixSDK version ([v0.22.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.22.0)). 2022-02-09 17:57:55 +00:00
SBiOSoftWhare
e090fef42e Merge branch 'develop' into steve/5210_bubble_polls 2022-02-04 16:32:33 +01:00
Stefan Ceriu
40bc43b0f6 vector-im/element-ios/issues/5298 - Add .well-known configuration support for tile server and map styles. 2022-02-04 11:33:55 +02:00
SBiOSoftWhare
719f900045 BuildSettings: Enable message bubbles setting. 2022-02-03 19:05:37 +01:00
ismailgulek
e84e78b1e7 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-02 12:46:00 +03:00
SBiOSoftWhare
22f72fdf28 Merge pull request #5461 from vector-im/steve/5209_media_bubbles_2
Message bubbles: Layout for media (part 2)
2022-02-01 17:52:19 +01:00
SBiOSoftWhare
e8026b54f5 BuildSettings: Disable message bubble setting atm. 2022-02-01 15:25:53 +01:00
ismailgulek
cf2420669f Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-01 01:23:00 +03:00
SBiOSoftWhare
301a380bf2 BuildSettings: Enable temporary message bubble setting. 2022-01-31 14:43:06 +01:00
David Langley
7378847594 Merge pull request #5293 from vector-im/langleyd/5292_refresh_tokens
App: Refresh Tokens Implementation
2022-01-31 08:59:19 +00:00
David Langley
e6ee4a7381 Disable refresh tokens and revert pod and lockfile 2022-01-31 00:28:31 +00:00
ismailgulek
1b055a7dcd Feed threading option in the SDK 2022-01-28 04:32:06 +03:00
Doug
aa0180749e Prepare for new sprint 2022-01-25 14:26:35 +00:00
Doug
f8d76afabd changelog.d: Upgrade MatrixSDK version ([v0.21.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.21.0)). 2022-01-25 12:58:20 +00:00
David Langley
583d5b32fe Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-24 12:19:45 +00:00
Stefan Ceriu
ec1fbed87d vector-im/element-ios/issues/5298 - Removed cocoapods-keys and moved the MapTiler key to the buildSettings. 2022-01-19 16:11:35 +02:00
David Langley
5c847cdcf1 Merge pull request #5405 from vector-im/langleyd/5404_add_build_setting_to_hide_social_login
Add build setting to hide social login
2022-01-19 09:20:18 +00:00
David Langley
9af4bcd23f Add build setting to hide social login 2022-01-18 22:36:50 +00:00
David Langley
03aa277a9e Add sideMenuShowInviteFriends and remove the non functioning settingsScreenShowInviteFriends 2022-01-18 22:13:10 +00:00
Stefan Ceriu
07dac3ecc2 Enabled location sharing for testing purposes. 2022-01-18 20:05:10 +02:00
David Langley
4bc9df0549 Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-14 11:43:09 +00:00
SBiOSoftWhare
3b82f6e56e Merge pull request #5342 from vector-im/steve/5321_bubbles_lauching
Message bubbles: Add settings and build flag
2022-01-13 09:50:23 +01:00
Doug
20db108f31 Prepare for new sprint 2022-01-11 14:27:27 +00:00
David Langley
6df4713eba Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens 2022-01-06 22:43:20 +00:00
SBiOSoftWhare
d9601c0c9b Rename RoomTimelineStyle enum to RoomTimelineStyleIdentifier. 2022-01-04 17:53:15 +01:00
Stefan Ceriu
49c787d987 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
8d97959cac vector-im/element-ios/issues/5298 - Added build setting + ui and unit tests. 2022-01-04 17:33:32 +02:00
Stefan Ceriu
5543c7dee0 vector-im/element-ios/issues/5298 - Improved error messages and moved map configuration to the BuildSettings 2022-01-04 17:33:32 +02:00
SBiOSoftWhare
ef4f796a8e Add build settings for timeline style configuration. 2022-01-03 18:16:49 +01:00
Doug
53d3ff92af Improve iPad layout. Add separate debug configuration. 2021-12-16 17:01:22 +00:00
Doug
ecd4bbd63b Move string formatting to Tools.
Revert contacts tracking from MatrixKit.
Final tweaks before PR.
2021-12-16 17:01:22 +00:00
Doug
0b08bddc76 Remove cocoapods-keys. Use UUID for analytics.
Make configuration optional.
2021-12-16 16:59:45 +00:00
Doug
efdbdcd117 Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
Doug
d56302eb18 Prepare for new sprint 2021-12-14 15:02:19 +00:00
manuroe
d224a33806 Prepare for new sprint 2021-12-14 10:18:19 +01:00
David Langley
c08b717564 Add first refresh token implementation pass. Account credential persistence and NotificationService handling. 2021-12-09 17:28:56 +00:00
Stefan Ceriu
17f2f71634 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
SBiOSoftWhare
7fb67111fe Prepare for new sprint 2021-12-07 22:45:35 +01:00
SBiOSoftWhare
6677622eb0 Remove MatrixKit import from Swift files. 2021-11-29 17:50:30 +01:00
Doug
ccfe3afb7d Prepare for new sprint 2021-11-17 18:00:36 +00:00
Doug
f1b341d8e7 Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
Doug
d99d798faf 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
0c965c4afc Remove buildsetting 2021-11-16 15:02:52 +00:00
David Langley
4fca1e7f9b Ignore badge updates for virtual rooms. 2021-11-16 12:00:20 +00:00
Stefan Ceriu
3f1700d516 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
81780b006e Set correct default for clientPermalinkBaseUrl 2021-11-05 11:08:51 +00:00
David Langley
7ba7decab5 Update matrixPermalinkPaths -> permalinkSupportedHosts for consistency with android naming 2021-11-04 16:22:58 +00:00