Commit graph

375 commits

Author SHA1 Message Date
SBiOSoftWhare
dcad18bfb4
Merge pull request #5219 from vector-im/steve/5020_matrixkit_merge
Merge MatrixKit repository into Element
2021-12-03 15:44:30 +01:00
Stefan Ceriu
ec00c52a0a vector-im/element-ios/issues/4753 - Allow audio file attachments to be played back inline by reusing the existing voice message UI. 2021-12-02 15:38:59 +02:00
SBiOSoftWhare
4081da3ebc Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
Doug
e324767d7d Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +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
Stefan Ceriu
c961a71f7f vector-im/element-ios/pull/5014 - Forward original message content and remove the need to re-upload media. 2021-11-09 10:41:21 +02:00
Phl-Pro
8246dc93e0
Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
Doug
fd93bb6fab
Merge pull request #5074 from vector-im/doug/5071_fix_presented_views
Fix more button not working.
2021-11-03 16:35:03 +00:00
SBiOSoftWhare
39c94682a9 Merge branch 'hotfix/1.6.7' into hotfix/1.6.7_2 2021-11-03 17:22:21 +01:00
Doug
458b8543cd Ensure DisabledRoomInputToolbarView is used. Fix previewing rooms. Fix favourited DMs in Home. 2021-11-03 10:18:27 +00:00
Doug
1415155eb6 Present alerts before assigning to currentAlert. 2021-11-01 15:05:02 +00:00
Finn Behrens
f284f2f983 Remember keyboard language for room
This adds a `textInputContextIdentifier` to the RoomViewController to save the current language per room.

Signed-off-by: Finn Behrens <me@kloenk.dev>
2021-10-31 19:58:21 +01:00
SBiOSoftWhare
e33f0779d2 RoomViewController: Fix a crash on before iOS 14. 2021-10-29 13:47:42 +02:00
SBiOSoftWhare
a05c488ed6 Update weak views usage. 2021-10-29 10:50:24 +02:00
SBiOSoftWhare
9fc412f41d RoomVC: Fix typo. 2021-10-28 18:51:25 +02:00
SBiOSoftWhare
03cdf3d732 RoomVC: Prevent retain cycles. 2021-10-28 17:41:16 +02:00
Philippe Loriaux
c6c3eaaec1 Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
SBiOSoftWhare
0d1f8305e9 Rename UniversalLinkPresentationParameters to ScreenPresentationParameters. 2021-10-21 10:00:37 +02:00
SBiOSoftWhare
ee573879a3 Merge develop into 4734_room_stack 2021-10-20 11:14:52 +02:00
SBiOSoftWhare
cb3025da19 RoomVC: Fix typo. 2021-10-20 09:21:02 +02:00
SBiOSoftWhare
9d6946ddf1 RoomVC: Update with UniversalLinkPresentationParameters. 2021-10-20 07:32:04 +02:00
ismailgulek
61ce79e50a
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-19 16:40:34 +03:00
SBiOSoftWhare
c62470bc3c RoomVC: Remove temporary space universal link handling. 2021-10-19 12:29:59 +02:00
Stefan Ceriu
12c167ba6c vector-im/element-ios/issues/5009 - Implemented multi-room forwarding and added various tweaks following code review. 2021-10-18 16:40:53 +03:00
Stefan Ceriu
e3f1bd25a9 vector-im/element-ios/issues/5009 - Refactored away the NSExtensionContext dependency from the ShareManager. Introduced different ShareItemProviders for the share extension and the main application. Improved item loading error handling. 2021-10-18 16:40:53 +03:00
Stefan Ceriu
aa790b24a8 vector-im/element-ios/issues/5009 - Fixed share extension setup and cleaned up code. 2021-10-18 16:40:53 +03:00
Stefan Ceriu
d7ab73524f vector-im/element-ios/issues/5009 - Moved files around, cleaned up imports and logs. 2021-10-18 16:40:53 +03:00
Stefan Ceriu
b6514349fb vector-im/element-ios/issues/5009 - Refactored share extension and started using the shared code directly in the main application. 2021-10-18 16:40:48 +03:00
SBiOSoftWhare
5bd1d6a44f Merge branch 'develop' into steve/4734_room_stack 2021-10-14 16:21:03 +02:00
ismailgulek
ba53cb6d41
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-13 14:34:20 +03:00
Stefan Ceriu
2e0aab11ea #1098 - Added extra top padding on first list item. Fixed various merge problems. 2021-10-13 11:46:43 +03:00
Stefan Ceriu
9b3e68a3db #1098 - Working real user suggestion inside the main application. 2021-10-13 11:26:22 +03:00
Stefan Ceriu
109a4e7157 #1098 - Added user suggestions to the main app timeline. 2021-10-13 11:25:36 +03:00
Stefan Ceriu
7de24ab628 #1098 - Generated UserSuggestion from template, got initial UI working and automatically updating. 2021-10-13 11:24:46 +03:00
SBiOSoftWhare
28278ab47d RoomVC: Update universal link management with UniversalLinkParameters. 2021-10-12 19:12:08 +02:00
ismailgulek
58df3d3309
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-12 11:49:55 +03: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
ismailgulek
efb495e95f
Merge branch 'develop' into ismail/4384_room_summary_store 2021-10-08 16:59:25 +03:00
Stefan Ceriu
d6ffc55477 vector-im/element-ios/issues/4899 - Fixed various localization issues. 2021-10-08 11:33:13 +03:00
SBiOSoftWhare
815106f831 Split view: Set navigationItem.leftItemsSupplementBackButton to YES for view controllers used as detail. 2021-10-05 10:48:51 +02:00
ismailgulek
129eb9553c
Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu
862464108b vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
ismailgulek
bc1d0d7172
Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
Gil Eluard
ca7bf18f76 [Spaces] M10.6.1 Handle space link #4498
- Update after code review
2021-09-23 17:15:32 +02:00
Gil Eluard
cc8ac58fd5 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard
cf51612864 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
David Langley
53563c996f
Merge pull request #4892 from vector-im/langleyd/4772_voice_message_drafts
Voice message draft persistence
2021-09-23 11:21:26 +00:00
David Langley
c1fd40c5bb Remove space 2021-09-23 09:39:09 +01:00
David Langley
007f72d51e Use RoomId for room by room drafts. 2021-09-23 08:48:15 +01:00
Gil Eluard
4d1dd1eb0a Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00