Commit graph

9894 commits

Author SHA1 Message Date
manuroe
9451a2340c Merge branch 'master' into develop 2021-01-15 17:57:09 +01:00
manuroe
ea8e4e083f Merge branch 'release/1.1.4/master' 2021-01-15 17:56:58 +01:00
manuroe
9f1445ed39 finish version++ 2021-01-15 17:56:58 +01:00
manuroe
6a5e9c131e
Merge pull request #3942 from vector-im/release/1.1.4/release
Release 1.1.4
2021-01-15 17:56:19 +01:00
manuroe
3e84f9a7ba version++ 2021-01-15 17:34:19 +01:00
manuroe
91f371847f
Merge pull request #3941 from vector-im/element_3940
AuthVC: Fix recaptcha view cropping
2021-01-15 17:29:32 +01:00
SBiOSoftWhare
03c39660c7 Update changes 2021-01-15 17:08:46 +01:00
SBiOSoftWhare
3abadd8624 TermsView: Improve rendering. 2021-01-15 17:06:21 +01:00
SBiOSoftWhare
2e547662c5 AuthVC: Fix recaptcha view cropping. 2021-01-15 17:05:45 +01:00
SBiOSoftWhare
c22da15c11
Merge pull request #3930 from vector-im/splitVC_logs
AppCoordinator & SplitViewCoordinator: Add detail navigation logs
2021-01-14 14:56:47 +01:00
manuroe
5df4fe9793 More logs in SplitVC 2021-01-14 14:54:34 +01:00
SBiOSoftWhare
c14c23735c AppCoordinator & SplitViewCoordinator: Add detail navigation logs. 2021-01-14 14:41:39 +01:00
manuroe
792b381462
Merge pull request #3927 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Translations update from Weblate
2021-01-14 11:56:37 +01:00
manuroe
ef83a4da68
Merge pull request #3926 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Translations update from Weblate
2021-01-14 11:56:18 +01:00
manuroe
95d9c59c07
Merge pull request #3925 from RiotTranslateBot/weblate-riot-ios-riot-ios
Translations update from Weblate
2021-01-14 11:55:48 +01:00
Gil Eluard
2e56fe4688
Merge pull request #3928 from vector-im/element_3924
Prevent navigation controller from pushing same view controller
2021-01-14 11:39:18 +01:00
Gil Eluard
731942c3b8 Updated CHANGES.rst 2021-01-14 10:59:33 +01:00
Gil Eluard
274d5968d1 Prevent navigation controller from pushing same view controller 2021-01-14 10:57:12 +01:00
Weblate
b5279ba3a5 Merge branch 'origin/develop' into Weblate. 2021-01-14 09:55:47 +00:00
Weblate
68845b42e4 Merge branch 'origin/develop' into Weblate. 2021-01-14 09:55:30 +00:00
Weblate
3cacc8a825 Merge branch 'origin/develop' into Weblate. 2021-01-14 09:51:22 +00: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
Thomas
464b8e012c Translated using Weblate (Chinese (Traditional))
Currently translated at 52.3% (594 of 1135 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hant/
2021-01-12 12:35:47 +00:00
vicdorke
0ac1c541a2 Translated using Weblate (Chinese (Simplified))
Currently translated at 88.2% (1002 of 1135 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/zh_Hans/
2021-01-12 12:35:45 +00:00
SBiOSoftWhare
251af56b44 Invite friends: Make app name customizable in share text. 2021-01-12 11:34:05 +01:00
SBiOSoftWhare
68ca3393b9 Update changes 2021-01-11 18:30:03 +01:00
SBiOSoftWhare
f1f588327e Update pbxproj 2021-01-11 18:28:21 +01:00
SBiOSoftWhare
9ec1065a75 StartChatVC: Add invite friends action. 2021-01-11 18:28:13 +01:00
SBiOSoftWhare
41d9e41296 Add InviteFriendsHeaderView table header view that presents invite friends action. 2021-01-11 18:26:54 +01:00
SBiOSoftWhare
cefe5f9d16 Invite friends: Add action to settings. 2021-01-11 18:26:06 +01:00
SBiOSoftWhare
9a6e84a026 Add InviteFriendsPresenter that enables to share current user contact to someone else. 2021-01-11 18:25:39 +01:00
SBiOSoftWhare
7e3c9d38cd Invite friends: Add string and assets. 2021-01-11 18:23:37 +01:00
SBiOSoftWhare
199ec0206e Add CustomRoundedButton: Button to customized from the outside. 2021-01-11 18:22:43 +01:00
Gil Eluard
81f39ccd1f
Merge pull request #3893 from vector-im/element_3816
Added "Continue in background" button to bug report screen
2021-01-11 15:18:56 +01:00
Gil Eluard
0abe36afde Reverted Podfile 2021-01-11 12:22:01 +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
66bc284744
Merge pull request #3882 from vector-im/element_3881
Added change PIN code feature from the settings
2021-01-11 10:21:24 +01:00
Gil Eluard
5660f1d4ee
Update Riot/Modules/BugReport/BugReportViewController.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:57:49 +01:00
Gil Eluard
0b7fbc69e9
Update Riot/Modules/BugReport/BugReportViewController.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:57:35 +01:00
Gil Eluard
4f31305549
Update Riot/Modules/BugReport/BugReportViewController.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:57:27 +01:00
Gil Eluard
768774a1c8
Update Riot/Modules/BugReport/BugReportViewController.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:57:19 +01:00
Gil Eluard
31398d277e
Update CHANGES.rst
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-01-11 09:56:51 +01:00
Gil Eluard
94c355f2d9
Merge branch 'develop' into element_3881 2021-01-11 09:53:32 +01:00
Ihor Hordiichuk
21fa3a875e Translated using Weblate (Ukrainian)
Currently translated at 18.5% (210 of 1135 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/uk/
2021-01-09 20:35:44 +00:00
Ludwig Bald
f187105a73 Translated using Weblate (German)
Currently translated at 99.9% (1134 of 1135 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
2021-01-09 20:35:43 +00:00
gkkulik
6f2840cec9 Added translation using Weblate (Silesian) 2021-01-08 22:28:36 +00:00
gkkulik
4f8bf92811 Added translation using Weblate (Silesian) 2021-01-08 22:28:21 +00:00
gkkulik
d9347070a4 Added translation using Weblate (Silesian) 2021-01-08 22:27:55 +00:00
SBiOSoftWhare
63da5b7b12
Merge pull request #3890 from vector-im/element_3846
Implement social login
2021-01-08 17:48:55 +01:00