Commit graph

284 commits

Author SHA1 Message Date
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
c9ff51363c Add localization for error case 2021-01-22 14:19:56 +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
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
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
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
Gil Eluard
c9848307b9 Added change PIN code feature from the settings 2020-12-16 14:15:41 +01:00
SBiOSoftWhare
db97912da3 AuthenticationVC: Update SSO button wording. 2020-12-16 13:09:01 +01:00
ismailgulek
5059df7fc9 Add localization for call bar return 2020-12-14 14:59:02 +03:00
ismailgulek
8c7ce98ab0 Remove unused strings 2020-12-10 13:04:20 +03:00
ismailgulek
dfa9dc8ff2
Merge branch 'develop' into voip_2746 2020-12-03 12:26:26 +03:00
ismailgulek
7f086c5782 Introduce CallBar view management 2020-12-02 23:17:06 +03:00
SBiOSoftWhare
530993147b HomeVC: Handle app name in empty view. 2020-11-30 18:22:59 +01:00
SBiOSoftWhare
0578c72fe5 Empty screens: Add strings. 2020-11-26 10:36:46 +01:00
ismailgulek
0221830738 New call UI including hold & resume 2020-11-25 16:11:52 +03:00
SBiOSoftWhare
573bc15d46 HomeEmptyView: Update wording. 2020-11-20 17:20:47 +01:00
SBiOSoftWhare
a1d0a2ca85 Implement home empty screen. 2020-11-20 14:53:27 +01:00
manuroe
054e5d2618 Update CHANGES after coming back to develop 2020-10-30 09:48:02 +01:00
manuroe
e52a9f895e Update Gems 2020-10-23 13:54:46 +02:00
SBiOSoftWhare
f725770586 Secure backup: Add possibility to not expose recovery key when creating a secure backup. 2020-10-15 15:27:26 +02:00
SBiOSoftWhare
da6020ba6c Self verification: Update complete security wording. 2020-10-13 10:45:56 +02:00
ismailgulek
f9b29983be Add less string 2020-10-06 17:27:53 +03:00
SBiOSoftWhare
1e9ab0fa8c Merge branch 'develop' into reset_4s 2020-09-30 17:51:28 +02:00
SBiOSoftWhare
9d992fde5f Secrets reset: Add new strings. 2020-09-30 17:21:43 +02:00
ismailgulek
e05d93884f Merge branch 'develop' into protection_fine_tuning
# Conflicts:
#	CHANGES.rst
#	Riot/Assets/en.lproj/Vector.strings
2020-09-30 15:19:32 +03:00
manuroe
b94840a022 PIN Code: Update explanation string 2020-09-30 11:22:44 +02:00
ismailgulek
309e1f1c26
Merge branch 'develop' into protection_fine_tuning 2020-09-29 18:33:22 +03:00
ismailgulek
6afd50926f Add localized alert message 2020-09-29 17:46:28 +03:00
ismailgulek
7ed79429c3 Update localization keys 2020-09-28 12:51:34 +03:00
ismailgulek
c7ed3365b4 Wording for room ID 2020-09-25 13:46:20 +03:00
ismailgulek
869106aaef Wording for no local addresses 2020-09-25 13:44:39 +03:00
ismailgulek
e9cc2061ad Wording for listing in directory 2020-09-25 13:43:02 +03:00