Commit Graph

1315 Commits

Author SHA1 Message Date
ismailgulek ac28d2f534 Merge branch 'ismail/5092_thread_list' into ismail/5094_thread_links 2021-11-26 01:46:32 +03:00
ismailgulek 5c7b0ed5b2 Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-26 01:45:37 +03:00
ismailgulek 779a02452d Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-26 01:45:37 +03:00
ismailgulek 5b9ccbdaa0 Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-26 01:43:44 +03:00
ismailgulek a9c8b4271c Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-26 01:43:44 +03:00
ismailgulek fbe64bab10 Adapt to event changes 2021-11-26 01:42:53 +03:00
ismailgulek 3118b3b56c Adapt to event changes 2021-11-26 01:42:53 +03:00
ismailgulek e862f77440 Implement actions for a thread 2021-11-25 14:55:44 +03:00
ismailgulek 09fb1d0c9d Implement actions for a thread 2021-11-25 14:55:44 +03:00
ismailgulek ea2bc4b67f Fix view in room thread action when navigated from thread list 2021-11-22 17:36:28 +03:00
ismailgulek 2b622ba2c4 Fix view in room thread action when navigated from thread list 2021-11-22 17:36:28 +03:00
ismailgulek 2f34603f1c Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-22 14:59:07 +03:00
ismailgulek 65d86154d3 Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-22 14:59:07 +03:00
ismailgulek 84cfd33700 Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-22 12:26:41 +03:00
ismailgulek 2a455c30ce Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-22 12:26:41 +03:00
ismailgulek 1490f3e118 Move more button out of the title view & remove weird constraints 2021-11-22 12:22:53 +03:00
ismailgulek d588f0b7ac Move more button out of the title view & remove weird constraints 2021-11-22 12:22:53 +03:00
ismailgulek 3e88563915 Don't show thread list button in threads 2021-11-22 11:46:45 +03:00
ismailgulek 067ccb4553 Don't show thread list button in threads 2021-11-22 11:46:45 +03:00
ismailgulek c2ba51d6ee Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-19 14:46:51 +03:00
ismailgulek e9a50e6454 Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-19 14:46:51 +03:00
ismailgulek 35925181eb Fix alert 2021-11-19 14:43:38 +03:00
ismailgulek 3d14b9aaf7 Fix alert 2021-11-19 14:43:38 +03:00
ismailgulek 98ed6c07cf Move view in room action to the top most 2021-11-19 14:37:09 +03:00
ismailgulek 0e90270a96 Move view in room action to the top most 2021-11-19 14:37:09 +03:00
ismailgulek 768f68ab2a Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-19 14:35:11 +03:00
ismailgulek 7ac0bdc78d Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-19 14:35:11 +03:00
ismailgulek c312ea13c2 Push thread view instead of presenting 2021-11-19 14:19:23 +03:00
ismailgulek ee2d3ca4ec Push thread view instead of presenting 2021-11-19 14:19:23 +03:00
ismailgulek db463bae53 Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-19 00:24:38 +03:00
ismailgulek df37904397 Merge branch 'ismail/5117_thread_message_actions' into ismail/5092_thread_list 2021-11-19 00:24:38 +03:00
ismailgulek ad4ddabe44 Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-19 00:24:02 +03:00
ismailgulek c2d613801c Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-19 00:24:02 +03:00
ismailgulek bcec32f8da Merge branch 'develop' into ismail/5068_start_thread 2021-11-19 00:23:24 +03:00
ismailgulek 98802857b8 Merge branch 'develop' into ismail/5068_start_thread 2021-11-19 00:23:24 +03:00
Doug 6dd471045f Merge branch 'master' into develop
# Conflicts:
#	Podfile.lock
#	Riot/Modules/Room/RoomViewController.m
2021-11-17 17:36:44 +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
ismailgulek d937d86b18 Generate classes 2021-11-16 17:14:57 +03:00
ismailgulek 20319407c6 Generate classes 2021-11-16 17:14:57 +03:00
ismailgulek 38f169c3e3 Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-16 15:55:57 +03:00
ismailgulek 715d46ab9c Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-16 15:55:57 +03:00
ismailgulek dfdb81b9e8 Move copy action into the more action sheet if threading enabled for an event 2021-11-15 17:44:21 +03:00
ismailgulek b8de8a6412 Move copy action into the more action sheet if threading enabled for an event 2021-11-15 17:44:21 +03:00
ismailgulek b15be88833 Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-15 13:51:11 +03:00
ismailgulek 69132b2fd9 Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions 2021-11-15 13:51:11 +03:00
ismailgulek 3b0d241208 Highlight thread root event in the timeline 2021-11-15 13:50:08 +03:00
ismailgulek 068db8eaaa Highlight thread root event in the timeline 2021-11-15 13:50:08 +03:00
ismailgulek 4b9a8ecefa Hide thread context menu in the thread 2021-11-12 17:30:31 +03:00
ismailgulek ad4741b9d8 Hide thread context menu in the thread 2021-11-12 17:30:31 +03:00
ismailgulek e052a2bc87 Implement bridge presenter delegate for opened thread 2021-11-12 17:26:49 +03:00