manuroe 61626a332d Merge remote-tracking branch 'origin/pr/1458' into callkit ...

# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/AppDelegate.m
#	Riot/ViewController/SettingsViewController.m

2017-09-04 15:57:37 +02:00

..

API

Remove MXKAlert class use.

2017-07-14 16:41:25 +02:00

Assets

Merge remote-tracking branch 'origin/pr/1458' into callkit

2017-09-04 15:57:37 +02:00

Base.lproj

Dark Theme - Bug Fix

2017-08-14 16:43:30 +02:00

Categories

Merge remote-tracking branch 'origin/pr/1458' into callkit

2017-09-04 15:57:37 +02:00

Images.xcassets/AppIcon.appiconset

Rebranding: replace Vector by Riot everywhere in the git and github repos

2017-03-08 11:08:03 +01:00

libs/jitsi-meet

Jitsi widget: Improve cooking recipe for building jitsi-meet ios framework

2017-08-18 15:57:18 +02:00

Model

Jitsi widget: always accept to join ongoing jitsi conf. Only the creation is under the settings

2017-08-17 18:59:58 +02:00

Utils

Jitsi widget: Add notices for jitsi widget in rooms histories

2017-08-30 17:37:14 +02:00

ViewController

Merge remote-tracking branch 'origin/pr/1458' into callkit

2017-09-04 15:57:37 +02:00

Views

Add theme support

2017-08-31 12:20:18 +03:00

AppDelegate.h

Improvements in notification registration flow

2017-08-23 19:07:14 +03:00

AppDelegate.m

Merge remote-tracking branch 'origin/pr/1458' into callkit

2017-09-04 15:57:37 +02:00

empty.mm

Rebranding: replace Vector by Riot everywhere in the git and github repos

2017-03-08 11:08:03 +01:00

GoogleService-Info.plist

Rebranding: replace Vector by Riot everywhere in the git and github repos

2017-03-08 11:08:03 +01:00

Info.plist

Merge branch 'callkit' into sirikit_new

2017-08-31 17:16:51 +02:00

main.m

Rebranding: replace Vector by Riot everywhere in the git and github repos

2017-03-08 11:08:03 +01:00

Riot-Defaults.plist

UX Rework - Home: Put the new ordering behind a setting.

2017-06-16 15:18:33 +02:00

Riot.entitlements

Update entitlements

2017-08-26 15:40:40 +03:00

third_party_licenses.html

Jitsi widget: Add license notice for jitsi-meet

2017-08-18 09:32:06 +02:00