ismailgulek
da9407f062
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list
2021-12-10 11:07:27 +03:00
ismailgulek
1f918c921d
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-12-10 11:03:00 +03:00
ismailgulek
e3a47a59f9
Merge branch 'develop' into ismail/5068_start_thread
2021-12-09 15:25:14 +03:00
Stefan Ceriu
d5982e813b
vector-im/element-ios/issues/5114 - Polls in the timeline.
2021-12-09 09:37:02 +02:00
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
ismailgulek
7f53684742
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list
2021-11-30 01:34:44 +03:00
ismailgulek
5edcb644ea
Make remove actions destructive & move remove action to the bottom
2021-11-30 01:29:52 +03:00
ismailgulek
4c2e8485d7
Fix alert
2021-11-30 01:14:05 +03:00
ismailgulek
65335ce825
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list
2021-11-26 01:45:37 +03:00
ismailgulek
7cfa67b704
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-26 01:43:44 +03:00
ismailgulek
68ac7cd49d
Adapt to event changes
2021-11-26 01:42:53 +03:00
ismailgulek
310841704b
Fix view in room thread action when navigated from thread list
2021-11-22 17:36:28 +03:00
ismailgulek
e8222ad50c
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list
2021-11-22 14:59:07 +03:00
ismailgulek
415cf36854
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-22 12:26:41 +03:00
ismailgulek
fc87a3534d
Move more button out of the title view & remove weird constraints
2021-11-22 12:22:53 +03:00
ismailgulek
e7190f426f
Don't show thread list button in threads
2021-11-22 11:46:45 +03:00
ismailgulek
2873d1586e
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list
2021-11-19 14:46:51 +03:00
ismailgulek
6751896304
Fix alert
2021-11-19 14:43:38 +03:00
ismailgulek
f56be33f5a
Move view in room action to the top most
2021-11-19 14:37:09 +03:00
ismailgulek
5238165e63
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-19 14:35:11 +03:00
ismailgulek
c9f018f046
Push thread view instead of presenting
2021-11-19 14:19:23 +03:00
ismailgulek
1d76c39f57
Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list
2021-11-19 00:24:38 +03:00
ismailgulek
a0d7e1fa33
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-19 00:24:02 +03:00
ismailgulek
8723a69528
Merge branch 'develop' into ismail/5068_start_thread
2021-11-19 00:23:24 +03:00
Doug
e324767d7d
Merge branch 'master' into develop
...
# Conflicts:
# Podfile.lock
# Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +00:00
ismailgulek
485227b94e
Generate classes
2021-11-16 17:14:57 +03:00
ismailgulek
7c7706a607
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-16 15:55:57 +03:00
ismailgulek
342372b81d
Move copy action into the more action sheet if threading enabled for an event
2021-11-15 17:44:21 +03:00
ismailgulek
c3adbbd7a7
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
2021-11-15 13:51:11 +03:00
ismailgulek
cc466501b6
Highlight thread root event in the timeline
2021-11-15 13:50:08 +03:00
ismailgulek
1f5f8d1ba4
Hide thread context menu in the thread
2021-11-12 17:30:31 +03:00
ismailgulek
6dd5bf60a6
Implement bridge presenter delegate for opened thread
2021-11-12 17:26:49 +03:00
ismailgulek
ed390db60a
Add new action for the thread root event in thread view
2021-11-12 17:25:58 +03:00
ismailgulek
3766c49e74
Add eventId parameter to delegates
2021-11-12 17:24:58 +03:00
ismailgulek
a319f076b1
Merge branch 'develop' into ismail/5068_start_thread
2021-11-11 21:43:16 +03:00
ismailgulek
1126ae995b
Present threads with custom sized presentable
2021-11-11 15:17:01 +03: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
ismailgulek
16b1c8711f
Dismiss thread when close tapped
2021-11-11 01:07:12 +03:00
ismailgulek
c4fbb51fb8
Load correct instance of RoomViewController from the storyboard
2021-11-11 01:06:00 +03:00
ismailgulek
be95c95151
Introduce RoomDisplayConfiguration for room display options
2021-11-10 18:03:02 +03:00
ismailgulek
fe1b6d1e50
Implement opening thread modal when tapped
2021-11-10 15:42:42 +03:00
ismailgulek
d80aba0793
Add thread option to an event if the labs setting enabled
2021-11-09 15:24:08 +03: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
ismailgulek
0a8952170a
Initialize thread data source
2021-11-04 02:07:50 +03: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
ismailgulek
788e817617
Add context menu item
2021-11-03 13:36:18 +03:00