Frank Rotermund
|
d9057cd0cb
|
Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' into feature/4068_merge_foss_1_9_15
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile.lock
# Riot/Assets/de.lproj/Localizable.strings
# Riot/Modules/Room/RoomViewController.m
# RiotNSE/NotificationService.swift
# fastlane/Fastfile
|
2023-01-16 12:11:51 +01:00 |
|
Alfonso Grillo
|
3f97f89e0a
|
Merge pull request #7231 from vector-im/alfogrillo/render_poll_end_event
Render poll ended event in the timeline (PSG-196)
|
2023-01-10 14:49:13 +01:00 |
|
Alfonso Grillo
|
0ed86d2b26
|
Fix ut build errors
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
2ec0777b06
|
Remove warnings
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
493c91b2da
|
Add warnings
|
2023-01-10 12:20:34 +01:00 |
|
Alfonso Grillo
|
d95a47ba80
|
Customize TimePollView for poll.end events
|
2023-01-10 12:18:00 +01:00 |
|
Alfonso Grillo
|
d982174efe
|
Push poll.end event to PollAggregator
|
2023-01-10 12:17:15 +01:00 |
|
Yoan Pintas
|
c3322ea747
|
Delete an existing broadcast (#7219)
|
2023-01-10 09:32:18 +00:00 |
|
Alfonso Grillo
|
9892fbfd70
|
Merge pull request #7206 from vector-im/alfogrillo/poll_decryption_message
Handle decryption errors in polls (PSG-1023)
|
2023-01-09 17:20:28 +01:00 |
|
Alfonso Grillo
|
9fe320f3de
|
Fix UTs
|
2023-01-09 16:17:21 +01:00 |
|
Alfonso Grillo
|
10b86f18ed
|
revert changes
|
2023-01-09 15:48:35 +01:00 |
|
Yoan Pintas
|
0dfa85d762
|
Delete during broadcasting (#7227)
|
2023-01-06 22:36:55 +01:00 |
|
Alfonso Grillo
|
0b37a58128
|
Cleanup code
|
2022-12-23 16:41:25 +01:00 |
|
Alfonso Grillo
|
ef2ad157d1
|
Show decryption error on TimelinePollView
|
2022-12-23 12:08:25 +01:00 |
|
Alfonso Grillo
|
d66bebfe8f
|
Handle decryption errors in TimelinePollProvider
|
2022-12-23 12:06:49 +01:00 |
|
Phl-Pro
|
7b55cf8c94
|
Merge pull request #7178 from vector-im/phlpro/voice_broadcast_live_buttons_layout
VoiceBroadcast: Update live badge layout for recorder and player cells
|
2022-12-19 14:44:00 +01:00 |
|
Frank Rotermund
|
67dd4f918e
|
Merge commit '35b2fdc538dfc1f8fac2585704526ab26148a9ab' into feature/3977_merge_element_1_9_13
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile.lock
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
# Riot/Modules/LaunchLoading/LaunchLoadingView.swift
# Riot/Modules/LaunchLoading/LaunchLoadingView.xib
# Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
# Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
# Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
# Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
# Riot/Modules/TabBar/MasterTabBarController.m
# fastlane/Fastfile
|
2022-12-19 14:36:30 +01:00 |
|
Velin92
|
b0dbdbf17c
|
Merge pull request #7169 from vector-im/mauroromito/inline_code
Rich Text Editor: Inline Code feature
|
2022-12-16 18:37:04 +01:00 |
|
Philippe Loriaux
|
8df53fb492
|
Update live badge layout for recorder and player VoiceBroadcast cells
|
2022-12-16 16:40:46 +01:00 |
|
Phl-Pro
|
0768b01fd3
|
Merge pull request #7172 from vector-im/phlpro/voice_broadcast_live_button
VoiceBroadcast: Link the live icon color to the recording state
|
2022-12-16 14:27:48 +01:00 |
|
Mauro Romito
|
7125cc60ee
|
Merge branch 'develop' into mauroromito/inline_code
|
2022-12-16 10:09:31 +01:00 |
|
Philippe Loriaux
|
b88f423013
|
Update Voice Broadcast recorder cell by adjusting some padding values
|
2022-12-15 17:01:52 +01:00 |
|
giomfo
|
30fc2697b3
|
Bug Fix : Crash on new voice broadcast if the room has avatar (#7173)
* Bug Fix : Crash if the room has avatar and voice broadcast tiles
* add logfile
* update logs
|
2022-12-15 16:46:09 +01:00 |
|
Philippe Loriaux
|
dbbb2d8dc2
|
Voice Broadcast - Link the live icon color to the recording state
|
2022-12-15 16:35:21 +01:00 |
|
Phl-Pro
|
fe44448efc
|
Update RiotSwiftUI/Modules/Room/VoiceBroadcastPlayback/MatrixSDK/VoiceBroadcastPlaybackViewModel.swift
Co-authored-by: Yoan Pintas <y.pintas@gmail.com>
|
2022-12-15 15:49:57 +01:00 |
|
Mauro Romito
|
fe6503aaa1
|
showing disabled state on format items
|
2022-12-15 00:33:28 +01:00 |
|
Philippe Loriaux
|
206be8eabb
|
Update Avatar size on Voice Broadcast playback cell
|
2022-12-14 17:36:46 +01:00 |
|
Philippe Loriaux
|
b077dec50b
|
Update global layout by adjusting some padding values
|
2022-12-14 17:36:46 +01:00 |
|
Philippe Loriaux
|
e012c9202e
|
Replace the player timeline
|
2022-12-14 17:36:46 +01:00 |
|
Phl-Pro
|
88061b97aa
|
Merge pull request #7146 from vector-im/phlpro/voice_broadcast_backward_forward
VoiceBroadcast: Add backward and forward buttons for playback
|
2022-12-14 17:34:49 +01:00 |
|
Arnfried Griesert
|
a8cf604873
|
New features html and text change for polls
|
2022-12-14 17:27:15 +01:00 |
|
Mauro Romito
|
02449544ce
|
inline code added
|
2022-12-14 17:12:06 +01:00 |
|
Mauro Romito
|
d679176137
|
tests completed
|
2022-12-13 18:12:47 +01:00 |
|
Mauro Romito
|
bbf4bf3047
|
view model fully tested
|
2022-12-13 17:06:12 +01:00 |
|
Mauro Romito
|
ea2881b614
|
editing that highlights the textfield behaviour added
|
2022-12-13 16:58:26 +01:00 |
|
Mauro Romito
|
7ca4c9c8e9
|
some tests
|
2022-12-13 15:58:33 +01:00 |
|
Philippe Loriaux
|
43b04a2c53
|
Fix PR comments
|
2022-12-13 15:07:21 +01:00 |
|
Mauro Romito
|
8b6327ece4
|
removed autocapitalization and improved the animation
|
2022-12-13 15:00:46 +01:00 |
|
Mauro Romito
|
f23b03cbd6
|
localisation added
|
2022-12-13 13:56:49 +01:00 |
|
Mauro Romito
|
a9cc5a71e7
|
fix
|
2022-12-12 19:09:22 +01:00 |
|
Mauro Romito
|
aa78c4d30c
|
fix
|
2022-12-12 19:09:15 +01:00 |
|
Mauro Romito
|
3aad54efde
|
implementation done, only tests, localisation and design feedback are left
|
2022-12-12 18:29:13 +01:00 |
|
Mauro Romito
|
31fd822f39
|
view is created and responsive, I need now to implement the result processing of the actions
|
2022-12-12 17:34:06 +01:00 |
|
Mauro Romito
|
6aae0c4444
|
changed name
|
2022-12-12 15:40:21 +01:00 |
|
Mauro Romito
|
8f965cb6f0
|
WIP
|
2022-12-12 15:39:57 +01:00 |
|
Philippe Loriaux
|
3c1a10dc5b
|
Add Voice Broadcast backward and forward buttons for playback
|
2022-12-08 14:54:13 +01:00 |
|
Mauro Romito
|
4543aec25d
|
boilerplate setup completed
|
2022-12-07 19:22:33 +01:00 |
|
Mauro Romito
|
34ca74d0c2
|
creating the coordinator for the link action view
|
2022-12-07 18:17:28 +01:00 |
|
Philippe Loriaux
|
f5889bfb6f
|
Add the last sequence number in the paused/stopped state event
|
2022-12-02 16:26:34 +01:00 |
|
Philippe Loriaux
|
c93a6fba44
|
Remove useless dependency with avatar service
|
2022-12-01 16:36:24 +01:00 |
|