Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
18300 commits 46 branches 261 tags 144 MiB
Commit graph

18300 commits

This branch
This branch
All branches
Author SHA1 Message Date
Flavio Alescio
51841534d7 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
762af03aaf added view in timeline action, added tests 2023-01-27 15:07:32 +01:00
Doug
204b9d032f Prepare for new sprint 2023-01-26 17:17:21 +00:00
Doug
78a427238d Merge branch 'master' into develop 2023-01-26 17:17:17 +00:00
Doug
8bc71349f0 Merge branch 'release/1.9.17/master' 2023-01-26 17:17:12 +00:00
Doug
a5ae619412 finish version++ 2023-01-26 17:17:12 +00:00
Doug
68d8386595
Merge pull request #7307 from vector-im/release/1.9.17/release 
Release 1.9.17
 2023-01-26 17:16:00 +00:00
Doug
99891f3c32 version++ 2023-01-26 16:24:32 +00:00
Alfonso Grillo
87d8aec9e9
Merge pull request #7303 from vector-im/alfogrillo/poll_history_load_more 
Poll history: load more polls (PSG-1093)
 2023-01-26 17:17:45 +01:00
Doug
487347ac78
Merge pull request #7306 from vector-im/doug/space-switcher 
Fix Space Switcher avatars
 2023-01-26 16:16:44 +00:00
Alfonso Grillo
fc8ee97c1b Use Calendar to compute target dates 2023-01-26 15:16:48 +01:00
Alfonso Grillo
6caf8d707d Fix alert presentation 2023-01-26 14:52:33 +01:00
Anderas
0e0f9e842b
Merge pull request #7304 from vector-im/andy/tracking_changes 
Ensure E2EE never tracks UnknownError
 2023-01-26 12:12:29 +00:00
Doug
4f61755b17 Fix avatar loading in SwiftUI. 2023-01-26 11:59:19 +00:00
Andy Uhnak
3e286d1abb Ensure E2EE never tracks UnknownError 2023-01-26 11:23:25 +00:00
Alfonso Grillo
13a317e5eb Add changelog.d file 2023-01-26 10:38:41 +01:00
Alfonso Grillo
0a4b507ffb Improve tests 2023-01-26 10:29:30 +01:00
Alfonso Grillo
f9c570e187 Cleanup unused code 2023-01-26 10:14:26 +01:00
Alfonso Grillo
8138410e1e Improve error handling 2023-01-26 10:09:47 +01:00
Alfonso Grillo
31ca4e3e38 Refine timestamp logics 2023-01-26 10:09:28 +01:00
Alfonso Grillo
ef6910a5f9 Add UTs 2023-01-25 20:16:24 +01:00
Alfonso Grillo
48e80b5e26 Add ui tests 2023-01-25 19:58:02 +01:00
Alfonso Grillo
51f612186a Add more MockPollHistoryScreenState cases 2023-01-25 19:41:48 +01:00
Alfonso Grillo
d51938e544 Improve MockPollHistoryScreenState 2023-01-25 19:21:56 +01:00
Alfonso Grillo
a69c4d24e9 Add alert on error 2023-01-25 18:40:09 +01:00
Alfonso Grillo
ce52d5bf7c Cleanup code 2023-01-25 18:19:48 +01:00
Alfonso Grillo
63ee508e36 Handle live polls 2023-01-25 17:52:39 +01:00
Nicolas Mauri
f3b4c09994
Merge pull request #7300 from vector-im/nimau/hotfix_deadlock_update_room_summary 
Fix a deadlock when updating the summary of a room that has a voice broadcast
 2023-01-25 16:43:33 +01:00
Alfonso Grillo
78df44d263 Fix pagination reset 2023-01-25 16:23:38 +01:00
Alfonso Grillo
6dcebf785a Remove dynamic poll updates 2023-01-25 16:14:41 +01:00
Flavio Alescio
f4c9e66dfa fix strings after merge 2023-01-25 16:06:40 +01:00
Alfonso Grillo
8ab4d1b15e Restore default constants 2023-01-25 16:06:16 +01:00
Alfonso Grillo
69891f1417 Disable load more button if needed 2023-01-25 16:04:47 +01:00
Flavio Alescio
304ae705c4 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
619b0cd3a2 Add live synced days 2023-01-25 15:12:19 +01:00
Nicolas Mauri
06c572e203 Add Towncrier file. 2023-01-25 14:29:41 +01:00
Nicolas Mauri
9fcebb2241 Fix a deadlock when updating the summary of a room that has a voice broadcast 2023-01-25 14:15:00 +01:00
Alfonso Grillo
cbededa449 Disable load more button when there is no content 2023-01-25 12:56:36 +01:00
Alfonso Grillo
a1a885e203 Handle number of batches / last batch 2023-01-25 12:35:51 +01:00
Alfonso Grillo
085ee66a02 Support load more in PollHistoryService 2023-01-25 12:06:04 +01:00
Alfonso Grillo
a47d7dcff0 Fix TimelinePollAnswerOptionButton layout 2023-01-25 11:41:16 +01:00
Flavio Alescio
96538f80e7 added view poll in timeline button 2023-01-25 10:27:21 +01:00
Gil Eluard
971a9f0cfe
Merge pull request #7299 from vector-im/gil/7298-Remove_the_What_New_bottom_sheet_for_App_Layout 
App Layout: Removed the onboarding flow
 2023-01-25 06:45:26 +01:00
Gil Eluard
ddd264a5f8 App Layout: Removed the onboarding flow 2023-01-24 21:25:58 +01:00
Alfonso Grillo
82d2ad8e34
Merge pull request #7293 from vector-im/alfogrillo/fetch_poll_history 
Fetch poll history (PSG-1043)
 2023-01-24 16:31:27 +01:00
Doug
3490fbb73a Prepare for new sprint 2023-01-24 14:14:07 +00:00
Doug
73856955fd Merge branch 'master' into develop 2023-01-24 14:14:05 +00:00
Doug
ae87624614 Merge branch 'release/1.9.16/master' 2023-01-24 14:13:59 +00:00
Doug
c0b819f895 finish version++ 2023-01-24 14:13:59 +00:00
Doug
ef009fdba5
Merge pull request #7296 from vector-im/release/1.9.16/release 
Release 1.9.16
 2023-01-24 14:13:32 +00:00