Giom Foret ae1ad4ca88 Merge branch 'develop' into callkit ...

# Conflicts:
#	Riot/AppDelegate.m

2017-10-09 16:23:18 +02:00

..

API

Rageshake: Add a setting to enable (disable) it.

2017-10-04 11:09:02 +02:00

Assets

Merge branch 'develop' into callkit

2017-10-09 16:23:18 +02:00

Base.lproj

Merge pull request #1511 from vector-im/widget_manager_2

2017-09-15 16:55:28 +02:00

Categories

Merge branch 'develop' into callkit

2017-09-19 09:50:21 +02:00

Images.xcassets/AppIcon.appiconset

Add missing marketing icon

2017-10-04 12:25:49 +02:00

libs/jitsi-meet

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

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

Model

Handle the room display name and its avatar at the room summary level.

2017-09-14 16:00:50 +02:00

Utils

EventFormatter: Improve updateRoomSummary:withStateEvents: to avoid to compute room avatar & displayname on almost every state events.

2017-10-05 09:34:17 +02:00

ViewController

Merge branch 'develop' into callkit

2017-10-09 16:23:18 +02:00

Views

Merge pull request #1537 from vector-im/fix_ios_11

2017-09-28 09:57:00 +02:00

AppDelegate.h

Pushkit: Remove APNS use.

2017-09-19 16:06:44 +02:00

AppDelegate.m

Merge branch 'develop' into callkit

2017-10-09 16:23:18 +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 'develop' into callkit

2017-10-09 16:23:18 +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

Merge branch 'develop' into callkit

2017-10-09 16:23:18 +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