Commit Graph

1025 Commits

Author SHA1 Message Date
Frank Rotermund 19ff9e0371 Feature/2821 server maintenance info 2023-02-07 12:48:46 +00:00
Frank Rotermund cdb37aaab7 Feature/4014 new layout notes room 2023-01-27 10:18:49 +00:00
JanNiklas Grabowski fb92b09f64 MESSENGER-4016 add netiquette 2023-01-23 14:42:33 +00:00
Frank Rotermund 3288335a79 MESSENGER-4068 buildfixes 2023-01-16 14:37:53 +01:00
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
Frank Rotermund cc5a9ed847 MESSENGER-4078 permalinks only in open rooms, better texts and icons 2023-01-16 08:06:13 +01:00
Alfonso Grillo d95a47ba80 Customize TimePollView for poll.end events 2023-01-10 12:18:00 +01: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
Nicolas Mauri bbb13516bf Send voice message should not be allowed during a voice broadcast recording (#7235) 2023-01-06 17:45:48 +01:00
Yoan Pintas 7032ff831e Update sub label (#7228) 2023-01-05 13:59:28 +01:00
Alfonso Grillo ef2ad157d1 Show decryption error on TimelinePollView 2022-12-23 12:08:25 +01:00
Alfonso Grillo e2783c7aef Merge pull request #7180 from vector-im/alfogrillo/design_review_fixes
UI/UX fixes on device manager after design review (PSG-1100)
2022-12-19 19:36:05 +01:00
Yoan Pintas f6670ec5d0 Update the room description in the rooms list in case of live broadcast (incoming or outgoing) (#7160) 2022-12-19 19:26:55 +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
Alfonso Grillo da532695a8 Update copy 2022-12-16 17:44:54 +01:00
Mauro Romito 7125cc60ee Merge branch 'develop' into mauroromito/inline_code 2022-12-16 10:09:31 +01:00
Frank Rotermund 11bf16ccf5 MESSENGER-3870 small fixes for support urls and downtime ui 2022-12-16 07:43:20 +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
Mauro Romito 02449544ce inline code added 2022-12-14 17:12:06 +01:00
Velin92 ed7107bd1e Merge pull request #7158 from vector-im/mauroromito/rich_text_editor_links
Rich Text Editor: Adding/Editing Links feature
2022-12-14 13:31:15 +01:00
Mauro Romito f23b03cbd6 localisation added 2022-12-13 13:56:49 +01:00
Gil Eluard 8e3acb8430 Use cross-platform consistent naming for threads in labs 2022-12-09 15:10:41 +01:00
Philippe Loriaux 3c1a10dc5b Add Voice Broadcast backward and forward buttons for playback 2022-12-08 14:54:13 +01:00
Frank Rotermund 90ead59c71 MESSENGER-3710 Layout and text fixes 2022-12-08 11:47:21 +01:00
Alfonso Grillo c76dbb7a5b Update copies 2022-12-05 17:20:20 +01:00
Phl-Pro d4c3f07333 Merge pull request #7131 from vector-im/phlpro/localize_authentication_errors
Add localization mechanism for authentication errors
2022-12-05 10:44:46 +01:00
Frank Rotermund d67c3f49d1 Feature/3616 privacy on login 2022-12-04 10:47:42 +00:00
Philippe Loriaux a1314aeb5e Prompt the user before ending a voice broadcast 2022-12-01 16:36:04 +01:00
Frank Rotermund 8b9f1d1975 MESSENGER-3662 Infodialog 2022-12-01 11:11:35 +00:00
Frank Rotermund 513720ec8d MESSENGER-3707 new login flow and welcome integration 2022-11-30 18:10:20 +01:00
Philippe Loriaux 0a6d7b7f68 Add localization for authentication errors 2022-11-30 15:51:05 +01:00
Philippe Loriaux 898defbbb4 Be able to pause the playback when it is buffering 2022-11-29 16:21:00 +01:00
Frank Rotermund c30040c3a8 Feature/3732 pin login in new login flow 2022-11-29 10:56:18 +00:00
Phl-Pro 1997b5b6e0 Merge pull request #7103 from vector-im/phlpro/voicebroadcast_left_time
Add the left time in the Voice Broadcast tile recorder
2022-11-25 09:28:21 +01:00
Andy Uhnak 32271438ab Display sync progress on the loading screen 2022-11-23 10:58:15 +00:00
Philippe Loriaux d36d12a4d9 Add Voice Broadcast left time countdown 2022-11-23 10:17:32 +01:00
Frank Rotermund 323724c8be MESSENGER-3861 better url management && use our poll german texts 2022-11-21 13:59:55 +01:00
Frank Rotermund 3c7398ba8f MESSENGER-3791 remove terms of service for all our apps 2022-11-18 08:15:17 +01:00
Alfonso Grillo 59b3b25050 Add localisation for UserSessionCardViewData 2022-11-16 10:42:08 +01:00
Aleksandrs Proskurins 79580ff572 Merge pull request #7056 from vector-im/aleksandrs/7043_unverified_sessions_alert
Unverified sessions alert
2022-11-10 09:23:21 +02:00
Alfonso Grillo 6d5bc35ce4 Refine bottom sheet layout 2022-11-08 18:04:42 +01:00
Alfonso Grillo 671dfa660d Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-08 17:04:20 +01:00
aringenbach 107962b3d8 Remove indication about plain text mode coming soon 2022-11-07 15:24:39 +01:00
aringenbach 476f5f6ab6 Merge branch 'develop' into resilience-rc
# Conflicts:
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	RiotSwiftUI/Modules/Room/Composer/View/Composer.swift
#	project.yml
2022-11-07 15:05:25 +01:00
paleksandrs 3268e3ba3d Changed title and body 2022-11-07 10:16:26 +02:00
Alfonso Grillo 1501afb504 Amend copies 2022-11-04 12:53:57 +01:00
Alfonso Grillo e2a073c655 Merge branch 'develop' into alfogrillo/learn_more_sheet
# Conflicts:
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift
#	RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift
2022-11-03 18:25:06 +01:00
Alfonso Grillo a868165173 Merge branch 'develop' into alfogrillo/learn_more_sheet 2022-11-03 17:29:01 +01:00
Alfonso Grillo fcc18d23d1 Add location feature in UserSessionsOverview 2022-11-03 14:46:19 +01:00