Commit graph

410 commits

Author SHA1 Message Date
Gil Eluard
140c834d1c Make the application settings more configurable 2021-03-31 19:04:00 +02:00
manuroe
908e0b20cc Strings.swift: Update after M's commit to develop 2021-03-11 12:10:46 +01:00
Gil Eluard
d0e0dc856e Merge branch 'element_4014' into element_4013
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-03-09 13:22:13 +01:00
Gil Eluard
a9c0d5c589 Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
SBiOSoftWhare
e14a280b6c Settings: Add show NSFW public rooms toggle. 2021-03-03 16:32:05 +01:00
Gil Eluard
1e67bad138 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
bfccb32b22 merged element_4014 into element_4013 2021-03-02 22:06:24 +01:00
Gil Eluard
9a41f0d4b8 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
26bd006711 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
419efd886a 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
a250f4db44 RoomCreationIntroCellContentView: Improve add topic case. 2021-02-23 15:46:20 +01:00
Gil Eluard
2f774022e2 Improve the status of send messages (sending, sent, received, failed)
- First implementation
2021-02-22 13:51:25 +01:00
SBiOSoftWhare
2a3a4b5d38 Room creation intro: Add strings. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare
8c16983c51 Room creation intro: Add assets. 2021-02-22 00:11:59 +01:00
SBiOSoftWhare
a7bc32045b SettingsVC: Use mainSession property where needed. 2021-02-12 09:19:46 +01:00
SBiOSoftWhare
bc752cc2b6 Settings: Add UIA support when adding a new 3pid. 2021-02-11 15:06:29 +01:00
ismailgulek
f41efd90d9 Merge branch 'voip_2746' into voip_tiles
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-02-10 21:41:51 +03:00
ismailgulek
190e111f66 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
ismailgulek
ab92b8b3f4 Merge branch 'voip_2746' into voip_tiles 2021-02-10 00:38:49 +03:00
ismailgulek
d09c4c9f07 Merge branch 'voip_2746' into voip_dialpad 2021-02-10 00:38:23 +03:00
ismailgulek
1354f445c7
Merge branch 'develop' into voip_2746 2021-02-05 12:11:39 +03:00
SBiOSoftWhare
80738d25a3 Social login: Update separator wording. 2021-02-03 12:11:40 +01:00
ismailgulek
9d6beb1406 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-02 12:36:35 +03:00
ismailgulek
49bc653332 Merge branch 'voip_2746' into voip_tiles 2021-02-02 12:36:11 +03:00
ismailgulek
3614ce5cf2 Merge branch 'voip_2746' into voip_dialpad 2021-02-02 12:33:56 +03:00
ismailgulek
c9f84c2329 Merge branch 'develop' into voip_2746 2021-02-02 12:33:05 +03:00
SBiOSoftWhare
4a357a178b Social login: Add GitLab image. 2021-01-28 19:48:52 +01:00
ismailgulek
c9ff51363c Add localization for error case 2021-01-22 14:19:56 +03:00
ismailgulek
9e3c083fa9 Add call transfer module 2021-01-21 21:27:28 +03:00
ismailgulek
9807889673 Add localizations 2021-01-21 21:25:22 +03:00
ismailgulek
67c0ab349a Merge branch 'voip_2746' into voip_tiles 2021-01-20 16:28:28 +03:00
ismailgulek
bfc82b0b0f Merge branch 'voip_2746' into voip_dialpad
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2021-01-20 16:25:36 +03:00
ismailgulek
62652e9219 Merge branch 'develop' into voip_2746 2021-01-20 15:40:19 +03:00
ismailgulek
e0bf1df0f9 Add localizations 2021-01-20 13:10:18 +03:00
ismailgulek
ad6b422127 Add new video icon 2021-01-20 13:09:55 +03:00
mtoohey31
cfb977e654 Fixed cients spelling mistake 2021-01-16 22:51:37 -05:00
ismailgulek
6f3f7ddfd9 Merge branch 'develop' into voip_2746
# Conflicts:
#	Riot/Modules/Application/LegacyAppDelegate.m
2021-01-15 16:07:36 +03:00
ismailgulek
9b9af41a12 Move dialpad into room 2021-01-14 13:38:17 +03:00
ismailgulek
6431e6827e Add icons and strings 2021-01-13 21:49:20 +03:00
SBiOSoftWhare
1f0079a5c5
Merge pull request #3912 from vector-im/invite_friends 2021-01-13 09:19:11 +01:00
SBiOSoftWhare
86f8ccd659 Invite friends: Update invite friends action wording. 2021-01-12 18:14:52 +01:00
ismailgulek
acf918341f Create view controller class 2021-01-12 14:38:36 +03:00
SBiOSoftWhare
251af56b44 Invite friends: Make app name customizable in share text. 2021-01-12 11:34:05 +01:00
SBiOSoftWhare
7e3c9d38cd Invite friends: Add string and assets. 2021-01-11 18:23:37 +01:00
Gil Eluard
21f652b31a Merge branch 'develop' into element_3816
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/BugReport/BugReportViewController.m
2021-01-11 12:18:30 +01:00
Gil Eluard
94c355f2d9
Merge branch 'develop' into element_3881 2021-01-11 09:53:32 +01:00
ismailgulek
9084b89566 Fix on hold call blur effect, add new paused icon 2021-01-04 17:23:53 +03:00
Gil Eluard
6b2721c205 Added "Continue in background" button to bug report screen 2020-12-23 13:59:40 +01:00
SBiOSoftWhare
c25add92a8 Social login: Add strings. 2020-12-18 18:44:08 +01:00
SBiOSoftWhare
a96607bd3f Social login: Add social login buttons assets. 2020-12-18 18:44:08 +01:00