ismailgulek 31c89bf4f8 Merge branch 'develop' into xcode11 ...

# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist

2020-07-01 09:59:29 +03:00

..

DeactivateAccount

Override preferredStatusBarStyle for missing pages and ensure setNeedsStatusBarAppearanceUpdate will be called

2020-05-22 12:10:27 +03:00

Discovery

Settings/Bind: Ask the user to validate the email again if they have not validated it yet

2019-10-04 14:11:24 +02:00

IdentityServer

ServiceTermsModal: Setup all the plumbery for the "Decline" button

2019-10-10 14:44:58 +02:00

KeyBackup

Cross-signing: Follow API change on MXDeviceInfo.trustLevel

2020-01-16 09:24:40 +01:00

Language

Override preferredStatusBarStyle for missing pages and ensure setNeedsStatusBarAppearanceUpdate will be called

2020-05-22 12:10:27 +03:00

PhoneCountry

Merge branch 'develop' into xcode11

2020-05-29 09:51:51 +02:00

Security

Merge branch 'develop' into xcode11

2020-07-01 09:59:29 +03:00

SignOut

Sign out: Make sure there is a secure backup

2020-06-30 18:00:56 +02:00

Views

reskin: Create ThemeService.shared

2019-01-11 11:45:27 +01:00

SettingsViewController.h

Make SettingsViewController directly instantiable.

2020-05-04 19:58:06 +02:00

SettingsViewController.m

Merge branch 'develop' into xcode11

2020-07-01 09:59:29 +03:00