 JanNiklas Grabowski
|
b4d4330109
|
Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' into feature/4260_merge_foss_1_10_2
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile
# Podfile.lock
# Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
# Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
# Riot/Modules/Application/LegacyAppDelegate.m
# Riot/Modules/Authentication/AuthenticationCoordinator.swift
# Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
# Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
# Riot/Modules/Home/AllChats/AllChatsViewController.swift
# Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
# Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
# Riot/Modules/Room/Settings/RoomSettingsViewController.m
# fastlane/Fastfile
|
2023-02-15 14:56:55 +01:00 |
|
 Andy Uhnak
|
599e20ea01
|
Fix some crashes
|
2023-02-09 08:44:31 +00:00 |
|
 Alfonso Grillo
|
18d202f3bd
|
Improve SegmentedPicker UI
|
2023-02-06 12:36:31 +01:00 |
|
 Flescio
|
67f3401bce
|
Merge pull request #7314 from vector-im/flescio/1040-poll_detail
Details screen of a poll (PSG-1039)
|
2023-02-01 15:46:08 +01:00 |
|
 Nicolas Mauri
|
a7d48ea97b
|
Merge pull request #7321 from vector-im/nimau/7311_vb_error_handling
Improve error handling during a voice broadcast playback
|
2023-02-01 14:44:34 +01:00 |
|
 Nicolas Mauri
|
bea7421c5e
|
Cleanup
|
2023-02-01 14:43:38 +01:00 |
|
|
Flavio Alescio
|
14c96a78b0
|
removed view from viewModel
|
2023-02-01 12:41:05 +01:00 |
|
|
Flavio Alescio
|
5b7bfc5642
|
fix embedding pattern
|
2023-02-01 11:15:22 +01:00 |
|
|
Flavio Alescio
|
d1333a8c45
|
Merge commit '32beb2393ceb08e585e8d62c145d133d9bba5ce6' into flescio/1040-poll_detail
|
2023-02-01 10:13:28 +01:00 |
|
 aringenbach
|
32beb2393c
|
Merge pull request #7317 from vector-im/aringenbach/7316_indentation_support
Labs: Rich text editor: enable list items indentation
|
2023-02-01 09:44:45 +01:00 |
|
|
Flavio Alescio
|
368892d2ad
|
Merge commit '35d6d9ada3d92068f328e31b547a348ef035380b' into flescio/1040-poll_detail
|
2023-01-31 16:03:49 +01:00 |
|
|
Flavio Alescio
|
7b4333e9af
|
code restyle for poll detail
|
2023-01-31 16:03:38 +01:00 |
|
|
Nicolas Mauri
|
328f0675a7
|
Improve error handling during a voice broadcast playback
|
2023-01-31 11:16:59 +01:00 |
|
|
Nicolas Mauri
|
f6229d1b65
|
Merge pull request #7302 from vector-im/nimau/7189_vb_decryption_error
Inform the user about decryption errors during a voice broadcast
|
2023-01-31 10:23:47 +01:00 |
|
 aringenbach
|
a903196e48
|
Labs: Rich text editor: enable list items indentation
|
2023-01-30 15:38:56 +01:00 |
|
|
Flavio Alescio
|
bb384f837e
|
added alert to show possible error, improved tests
|
2023-01-27 17:10:16 +01:00 |
|
|
Flavio Alescio
|
4e4ad5074c
|
Merge branch 'develop' into flescio/1040-poll_detail
# Conflicts:
# Riot/Generated/Strings.swift
# RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift
# RiotSwiftUI/Modules/Room/PollHistory/PollHistoryModels.swift
# RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
|
2023-01-27 15:22:15 +01:00 |
|
|
Flavio Alescio
|
21eafa2383
|
added view in timeline action, added tests
|
2023-01-27 15:07:32 +01:00 |
|
|
Alfonso Grillo
|
1598c56e9f
|
Use Calendar to compute target dates
|
2023-01-26 15:16:48 +01:00 |
|
|
Alfonso Grillo
|
7a6e6199e4
|
Fix alert presentation
|
2023-01-26 14:52:33 +01:00 |
|
|
Alfonso Grillo
|
c98510d786
|
Improve tests
|
2023-01-26 10:29:30 +01:00 |
|
|
Alfonso Grillo
|
cc728954d9
|
Cleanup unused code
|
2023-01-26 10:14:26 +01:00 |
|
|
Alfonso Grillo
|
96aca0b99d
|
Improve error handling
|
2023-01-26 10:09:47 +01:00 |
|
|
Alfonso Grillo
|
c7b4692112
|
Refine timestamp logics
|
2023-01-26 10:09:28 +01:00 |
|
|
Alfonso Grillo
|
214500ab12
|
Add UTs
|
2023-01-25 20:16:24 +01:00 |
|
|
Alfonso Grillo
|
fcdf77e48b
|
Add ui tests
|
2023-01-25 19:58:02 +01:00 |
|
|
Alfonso Grillo
|
74254315f2
|
Add more MockPollHistoryScreenState cases
|
2023-01-25 19:41:48 +01:00 |
|
|
Alfonso Grillo
|
684a5d03dc
|
Improve MockPollHistoryScreenState
|
2023-01-25 19:21:56 +01:00 |
|
|
Alfonso Grillo
|
844da02c74
|
Add alert on error
|
2023-01-25 18:40:09 +01:00 |
|
|
Alfonso Grillo
|
9408efebbc
|
Cleanup code
|
2023-01-25 18:19:48 +01:00 |
|
|
Alfonso Grillo
|
d2c6506ac6
|
Handle live polls
|
2023-01-25 17:52:39 +01:00 |
|
|
Nicolas Mauri
|
13b7f78de7
|
Inform the user about decryption errors during a voice broadcast
|
2023-01-25 17:23:42 +01:00 |
|
|
Alfonso Grillo
|
bbd1ab7a96
|
Fix pagination reset
|
2023-01-25 16:23:38 +01:00 |
|
|
Alfonso Grillo
|
2bc460f7e5
|
Remove dynamic poll updates
|
2023-01-25 16:14:41 +01:00 |
|
|
Alfonso Grillo
|
2e2705ed77
|
Restore default constants
|
2023-01-25 16:06:16 +01:00 |
|
|
Alfonso Grillo
|
b0dab86871
|
Disable load more button if needed
|
2023-01-25 16:04:47 +01:00 |
|
|
Flavio Alescio
|
a8c82abd35
|
Merge branch 'develop' into flescio/1040-poll_detail
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Strings.swift
|
2023-01-25 15:49:40 +01:00 |
|
|
Alfonso Grillo
|
95b09afc51
|
Add live synced days
|
2023-01-25 15:12:19 +01:00 |
|
|
Alfonso Grillo
|
245758e6eb
|
Disable load more button when there is no content
|
2023-01-25 12:56:36 +01:00 |
|
|
Alfonso Grillo
|
7582668aa8
|
Handle number of batches / last batch
|
2023-01-25 12:35:51 +01:00 |
|
|
Alfonso Grillo
|
412452952c
|
Support load more in PollHistoryService
|
2023-01-25 12:06:04 +01:00 |
|
|
Alfonso Grillo
|
215dbf1e44
|
Fix TimelinePollAnswerOptionButton layout
|
2023-01-25 11:41:16 +01:00 |
|
|
Flavio Alescio
|
9199407f2f
|
added view poll in timeline button
|
2023-01-25 10:27:21 +01:00 |
|
 Gil Eluard
|
04f85ad8b8
|
App Layout: Removed the onboarding flow
|
2023-01-24 21:25:58 +01:00 |
|
 Alfonso Grillo
|
9436c634f9
|
Merge pull request #7293 from vector-im/alfogrillo/fetch_poll_history
Fetch poll history (PSG-1043)
|
2023-01-24 16:31:27 +01:00 |
|
|
Alfonso Grillo
|
ce626bfb6f
|
Update tests
|
2023-01-24 12:25:27 +01:00 |
|
|
Alfonso Grillo
|
c5f649a530
|
Refactor next() -> nextBatch()
|
2023-01-24 10:47:58 +01:00 |
|
|
Alfonso Grillo
|
c974add57d
|
Refactor TimelinePollAnswerOptionButton
|
2023-01-24 10:42:45 +01:00 |
|
|
Alfonso Grillo
|
85c2cf3323
|
Add emptyPollsText in the view model
|
2023-01-24 09:49:12 +01:00 |
|
|
Alfonso Grillo
|
8bb7cd412f
|
Refactor PollKind conversion
|
2023-01-24 09:33:51 +01:00 |
|