Commit Graph

409 Commits

Author SHA1 Message Date
manuroe acd0c6dffc Strings.swift: Update after M's commit to develop 2021-03-11 12:10:46 +01:00
Gil Eluard 5014af92d3 Merge branch 'element_4014' into element_4013
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-03-09 13:22:13 +01:00
Gil Eluard 2a63baa202 Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
SBiOSoftWhare b0cd50e77c Settings: Add show NSFW public rooms toggle. 2021-03-03 16:32:05 +01:00
Gil Eluard f763ad90d7 Retrying & deleting failed messages
- If users press on Retry, send again the message and display a loading wheel
- code and UI tweaks
2021-03-03 10:27:08 +01:00
Gil Eluard ab7ec48aae merged element_4014 into element_4013 2021-03-02 22:06:24 +01:00
Gil Eluard bcb1682a11 Retrying & deleting failed messages
- Display an exclamation mark (on a red background). In case of a multi-line message
- When a message with an error is selected, show a bottom bar with the 4 following actions: Retry - Delete - Edit - Copy
- If users press on Delete, a confirmation dialog is displayed
- When error messages occur, a general error message appears above the composer. Selecting Delete will delete all error messages. Pressing on Retry will attempt to resend error messages
- If users press on Delete, a confirmation dialog is displayed
- In room lists, decorate rooms with errored messages with the error icon. Rooms with errors should be sorted first
2021-03-02 21:56:50 +01:00
Gil Eluard 99560e2d61 Retrying & deleting failed messages
- When a message with an error is selected, show a bottom bar with the 4 following actions: Retry - Delete - Edit - Copy
2021-02-25 16:51:39 +01:00
Gil Eluard dd720a68fb Merge branch 'develop' into element_4014
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-02-25 15:49:53 +01:00
SBiOSoftWhare 1731a2a0f3 RoomCreationIntroCellContentView: Improve add topic case. 2021-02-23 15:46:20 +01:00
Gil Eluard c7e3155949 Improve the status of send messages (sending, sent, received, failed)
- First implementation
2021-02-22 13:51:25 +01:00
SBiOSoftWhare d2aa72d20e Room creation intro: Add strings. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 6d31f5901a Room creation intro: Add assets. 2021-02-22 00:11:59 +01:00
SBiOSoftWhare 69b0692e4f SettingsVC: Use mainSession property where needed. 2021-02-12 09:19:46 +01:00
SBiOSoftWhare a1b2bef3a1 Settings: Add UIA support when adding a new 3pid. 2021-02-11 15:06:29 +01:00
ismailgulek c018da167c Merge branch 'voip_2746' into voip_tiles
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-02-10 21:41:51 +03:00
ismailgulek 295e86a905 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
ismailgulek dc8afd1b29 Merge branch 'voip_2746' into voip_tiles 2021-02-10 00:38:49 +03:00
ismailgulek 690afd773d Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
ismailgulek c4da49568d Merge branch 'develop' into voip_2746 2021-02-05 12:11:39 +03:00
SBiOSoftWhare 4c6950028c Social login: Update separator wording. 2021-02-03 12:11:40 +01:00
ismailgulek 98df68c618 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-02 12:36:35 +03:00
ismailgulek de52413c75 Merge branch 'voip_2746' into voip_tiles 2021-02-02 12:36:11 +03:00
ismailgulek 2385a02a5f Merge branch 'voip_2746' into voip_dialpad 2021-02-02 12:33:56 +03:00
ismailgulek 4471725976 Merge branch 'develop' into voip_2746 2021-02-02 12:33:05 +03:00
SBiOSoftWhare 64ba310002 Social login: Add GitLab image. 2021-01-28 19:48:52 +01:00
ismailgulek 9d187a665c Add localization for error case 2021-01-22 14:19:56 +03:00
ismailgulek c00a4e0094 Add call transfer module 2021-01-21 21:27:28 +03:00
ismailgulek 28c290b326 Add localizations 2021-01-21 21:25:22 +03:00
ismailgulek a4c17b78b8 Merge branch 'voip_2746' into voip_tiles 2021-01-20 16:28:28 +03:00
ismailgulek a75a19330b Merge branch 'voip_2746' into voip_dialpad
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-01-20 16:25:36 +03:00
ismailgulek 4e7a3bbb8f Merge branch 'develop' into voip_2746 2021-01-20 15:40:19 +03:00
ismailgulek d3d6ac6abc Add localizations 2021-01-20 13:10:18 +03:00
ismailgulek 9526b8ef1a Add new video icon 2021-01-20 13:09:55 +03:00
mtoohey31 cda1e49679 Fixed cients spelling mistake 2021-01-16 22:51:37 -05:00
ismailgulek 85b5b9cefa Merge branch 'develop' into voip_2746
# Conflicts:
#	Riot/Modules/Application/LegacyAppDelegate.m
2021-01-15 16:07:36 +03:00
ismailgulek 585617bb7b Move dialpad into room 2021-01-14 13:38:17 +03:00
ismailgulek 3151a1b5f0 Add icons and strings 2021-01-13 21:49:20 +03:00
SBiOSoftWhare e0396b002e Merge pull request #3912 from vector-im/invite_friends 2021-01-13 09:19:11 +01:00
SBiOSoftWhare 9d86db9d53 Invite friends: Update invite friends action wording. 2021-01-12 18:14:52 +01:00
ismailgulek 742910117e Create view controller class 2021-01-12 14:38:36 +03:00
SBiOSoftWhare b59b010a10 Invite friends: Make app name customizable in share text. 2021-01-12 11:34:05 +01:00
SBiOSoftWhare 1e95e24d21 Invite friends: Add string and assets. 2021-01-11 18:23:37 +01:00
Gil Eluard 2c2dd41677 Merge branch 'develop' into element_3816
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/BugReport/BugReportViewController.m
2021-01-11 12:18:30 +01:00
Gil Eluard 4ce874c876 Merge branch 'develop' into element_3881 2021-01-11 09:53:32 +01:00
ismailgulek 546a57934d Fix on hold call blur effect, add new paused icon 2021-01-04 17:23:53 +03:00
Gil Eluard 7867db9287 Added "Continue in background" button to bug report screen 2020-12-23 13:59:40 +01:00
SBiOSoftWhare 89550a41ae Social login: Add strings. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare 77350c83f1 Social login: Add social login buttons assets. 2020-12-18 18:44:08 +01:00
Gil Eluard 20dd233866 Added change PIN code feature from the settings 2020-12-16 14:15:41 +01:00