Commit Graph

249 Commits

Author SHA1 Message Date
Stefan Ceriu 4fe6d9a5ad 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
ismailgulek c6db4e7e0f Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-02 12:46:00 +03:00
SBiOSoftWhare 6a2401b463 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 2b93cdb430 BuildSettings: Disable message bubble setting atm. 2022-02-01 15:25:53 +01:00
ismailgulek d0fd2951e1 Merge branch 'develop' into ismail/5096_thread_notifications 2022-02-01 01:23:00 +03:00
SBiOSoftWhare 1a41f5e40d BuildSettings: Enable temporary message bubble setting. 2022-01-31 14:43:06 +01:00
David Langley 1e9fb6b625 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 fa346db145 Disable refresh tokens and revert pod and lockfile 2022-01-31 00:28:31 +00:00
ismailgulek 9062febe20 Feed threading option in the SDK 2022-01-28 04:32:06 +03:00
Doug 0035dffb84 Prepare for new sprint 2022-01-25 14:26:35 +00:00
Doug de2e8cc57f 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 21ec650e8f 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 9f72ba5138 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 cf04adb421 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 79fd2e3ec4 Add build setting to hide social login 2022-01-18 22:36:50 +00:00
David Langley 74026d7aeb Add sideMenuShowInviteFriends and remove the non functioning settingsScreenShowInviteFriends 2022-01-18 22:13:10 +00:00
Stefan Ceriu c6409b535c Enabled location sharing for testing purposes. 2022-01-18 20:05:10 +02:00
David Langley 4dfa1706b7 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 f91a7990d2 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 2fd1f94f81 Prepare for new sprint 2022-01-11 14:27:27 +00:00
David Langley dc32c77f44 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 608dd0c7a6 Rename RoomTimelineStyle enum to RoomTimelineStyleIdentifier. 2022-01-04 17:53:15 +01:00
Stefan Ceriu 43a9371214 vector-im/element-ios/issues/5298 - Various tweaks following code review. 2022-01-04 17:33:32 +02:00
Stefan Ceriu e1505d70c5 vector-im/element-ios/issues/5298 - Added build setting + ui and unit tests. 2022-01-04 17:33:32 +02:00
Stefan Ceriu 5a3bab92ec 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 31f2698e22 Add build settings for timeline style configuration. 2022-01-03 18:16:49 +01:00
Doug 3332203788 Improve iPad layout. Add separate debug configuration. 2021-12-16 17:01:22 +00:00
Doug 1f6b19eed3 Move string formatting to Tools.
Revert contacts tracking from MatrixKit.
Final tweaks before PR.
2021-12-16 17:01:22 +00:00
Doug b5f3a56666 Remove cocoapods-keys. Use UUID for analytics.
Make configuration optional.
2021-12-16 16:59:45 +00:00
Doug 8ec27e8579 Begin migration from Matomo to PostHog
Add CocoaPods-Keys.
2021-12-16 16:59:26 +00:00
Doug 40f89fa17a Prepare for new sprint 2021-12-14 15:02:19 +00:00
manuroe b7bd7a4e83 Prepare for new sprint 2021-12-14 10:18:19 +01:00
David Langley 14886788d6 Add first refresh token implementation pass. Account credential persistence and NotificationService handling. 2021-12-09 17:28:56 +00:00
Stefan Ceriu dc574ab0a6 vector-im/element-ios/issues/5114 - Polls in the timeline. 2021-12-09 09:37:02 +02:00
SBiOSoftWhare 844ce8dd4b Prepare for new sprint 2021-12-07 22:45:35 +01:00
SBiOSoftWhare fe84f0d862 Remove MatrixKit import from Swift files. 2021-11-29 17:50:30 +01:00
Doug 648c4e2645 Prepare for new sprint 2021-11-17 18:00:36 +00:00
Doug c946f2962a Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
Doug f89aad9edd 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 08b6b25e01 Remove buildsetting 2021-11-16 15:02:52 +00:00
David Langley 81f1a946f6 Ignore badge updates for virtual rooms. 2021-11-16 12:00:20 +00:00
Stefan Ceriu 1ea0308895 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 ee2385a246 Set correct default for clientPermalinkBaseUrl 2021-11-05 11:08:51 +00:00
David Langley 7f313ca4f5 Update matrixPermalinkPaths -> permalinkSupportedHosts for consistency with android naming 2021-11-04 16:22:58 +00:00
David Langley 055c30e75b Expand on BuildingSetting description and add changelog 2021-11-04 12:29:49 +00:00
David Langley 276f5e0458 Add clientPermalinkBaseUrl and set in matrix-sdk options. 2021-10-29 11:07:22 +01:00
SBiOSoftWhare e5f912f382 Prepare for new sprint 2021-10-21 20:33:33 +02:00
SBiOSoftWhare 4e4e0bd9be Merge branch 'develop' into steve/4734_room_stack 2021-10-14 16:21:03 +02:00
manuroe ea0ce5f58a Prepare for new sprint 2021-10-14 09:12:33 +02:00
SBiOSoftWhare dcaddb91e7 BuildSettings: Add property to allow split view detail view stacking. 2021-10-12 19:06:56 +02:00