Commit graph

12830 commits

Author SHA1 Message Date
ismailgulek
678f7e2e96
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 14:30:25 +03:00
ismailgulek
f95391009f
Add unit tests for NSArray mapping 2021-10-12 14:29:40 +03:00
ismailgulek
bffee105cf
Add docs and rename block parameter 2021-10-12 14:29:16 +03:00
Stefan Ceriu
fa05233998 Fixes #4976 - Replaced HPGrowingTextView with GrowingTextView. Reduced inheritance chain. 2021-10-12 14:17:06 +03:00
Doug
e84255f2a3
Merge pull request #4990 from vector-im/doug/4989_sync_contacts_state
Move call to validateSyncLocalContactsState into MatrixKit.
2021-10-12 12:14:31 +01:00
Doug
17110e2a91 Move call to validateSyncLocalContactsState into MatrixKit. 2021-10-12 11:17:20 +01:00
ismailgulek
58df3d3309
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03:00
Doug
93e70896ba
Merge pull request #4980 from vector-im/doug/4978_room_avatar_colours
Fix generated avatar colours not matching Element Web.
2021-10-11 16:54:17 +01:00
SBiOSoftWhare
f891cce4bb
Merge pull request #4960 from vector-im/steve/4734_master_tab_bar_refacto
Split view: Improve detail view management and add possibility to stack views on it
2021-10-11 17:23:20 +02:00
Doug
bd56dbe731 Fix generated avatar colours not matching Element Web. 2021-10-11 16:06:15 +01:00
SBiOSoftWhare
b7a2ac17a8 NavigationRouter: Update controllers pop notification order sending. 2021-10-11 16:51:12 +02:00
Doug
cbd86d63eb
Merge pull request #4975 from vector-im/doug/4974_viewframereader_preferencekey
Add FramePreferenceKey for use in ViewFrameReader.
2021-10-11 13:06:47 +01:00
Doug
bd1982adee Add FramePreferenceKey for use in ViewFrameReader. 2021-10-11 12:18:10 +01:00
SBiOSoftWhare
52fafa1132
Update Riot/Modules/TabBar/TabBarCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-10-11 11:11:13 +02:00
SBiOSoftWhare
e594865a6b
Update Riot/Routers/NavigationRouterStoreProtocol.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-10-11 11:10:26 +02:00
Doug
60bc34d26d
Merge pull request #4709 from vector-im/doug/4484_contacts_access
Add FindYourContactsFooterView to ContactsTableViewController
2021-10-11 10:09:39 +01:00
manuroe
e53bcee700 Prepare for new sprint 2021-10-08 17:51:22 +02:00
manuroe
1d55e8ae23 Merge branch 'master' into develop 2021-10-08 17:51:20 +02:00
manuroe
588c2d9d0e Merge branch 'release/1.6.2/master' 2021-10-08 17:51:15 +02:00
manuroe
6c9ad945d4 finish version++ 2021-10-08 17:51:15 +02:00
manuroe
9bb9ce2a9a
Merge pull request #4973 from vector-im/release/1.6.2/release
Release 1.6.2
2021-10-08 17:40:12 +02:00
SBiOSoftWhare
feef2baa95 NavigationStore: Update public method signature. 2021-10-08 17:15:14 +02:00
manuroe
3ebed0cc1f version++ 2021-10-08 17:04:44 +02:00
manuroe
e004201577 changelog.d: Upgrade MatrixKit version ([v0.16.5](https://github.com/matrix-org/matrix-ios-kit/releases/tag/v0.16.5)). 2021-10-08 17:04:44 +02:00
SBiOSoftWhare
b2fc0b6337
Update Riot/Routers/NavigationRouterStore.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-10-08 17:03:45 +02:00
SBiOSoftWhare
c8d9b0afa3
Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-10-08 16:39:49 +02:00
SBiOSoftWhare
adc429f6cc
Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-10-08 16:39:09 +02:00
SBiOSoftWhare
d0ff3cd85f NavigationRouter: Fix issues when setting the same presentable instances. 2021-10-08 16:25:14 +02:00
SBiOSoftWhare
ac79e07665 Update MasterTabBarController. 2021-10-08 16:06:23 +02:00
SBiOSoftWhare
119186bb6b RoomCoordinator: Refactor room loading methods. 2021-10-08 16:00:56 +02:00
ismailgulek
efb495e95f
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-08 16:59:25 +03:00
ismailgulek
eb7dbec5f9
Merge remote-tracking branch 'origin/ismail/4384_room_summary_store' into ismail/4384_room_summary_store 2021-10-08 16:58:08 +03:00
ismailgulek
c267fa0ea9
Do not expose session from the protocol 2021-10-08 16:57:54 +03:00
ismailgulek
511c3010af
Update Riot/Modules/Common/Recents/Model/DiscussionsCount.swift
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-10-08 16:52:56 +03:00
ismailgulek
9cb67b96bb
Remove old code piece 2021-10-08 16:52:09 +03:00
SBiOSoftWhare
73919b1791 Array: Update convenient method signature. 2021-10-08 15:45:53 +02:00
Stefan Ceriu
1d53e95a49 Fixes #4970 - Fixed unintentional voice message drafts on automatically cancelled recordings. 2021-10-08 16:28:42 +03:00
manuroe
73f1225388
Merge pull request #4972 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2021-10-08 15:23:50 +02:00
Weblate
5651c31af0 Merge branch 'origin/develop' into Weblate. 2021-10-08 13:15:50 +00:00
SBiOSoftWhare
33984b6678 ContactDetailsViewController: Update initializer. 2021-10-08 15:08:58 +02:00
SBiOSoftWhare
cd1029b9e5 GroupDetailsViewController: Update initializer. 2021-10-08 14:34:42 +02:00
Doug
494987d11a Update Analytics from Steve's comments. 2021-10-08 12:50:39 +01:00
SBiOSoftWhare
f83aba6c79 RoomCoordinatorProtocol: Update comment description. 2021-10-08 13:47:40 +02:00
SBiOSoftWhare
6b1cd8ddb5 TabBarCoordinator: Fix some typos. 2021-10-08 13:46:33 +02:00
ismailgulek
3095ab6a88
Adapt api changes 2021-10-08 14:43:19 +03:00
SBiOSoftWhare
4e6abae45d
Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-10-08 13:28:46 +02:00
SBiOSoftWhare
2877943ab5
Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-10-08 13:28:40 +02:00
SBiOSoftWhare
0d4f92301d
Update Riot/Modules/SplitView/SplitViewCoordinator.swift
Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>
2021-10-08 13:28:26 +02:00
Stefan Ceriu
093b10bfc5 Fixes #4935 - Enable voice message scrubbing pan gesture only after long press. 2021-10-08 14:18:53 +03:00
Doug
bf52311bda Merge remote-tracking branch 'origin/develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Modules/ServiceTerms/Modal/ServiceTermsModalCoordinatorBridgePresenter.swift
2021-10-08 11:45:43 +01:00