Weblate b90a2be45a Merge branch 'develop' of https://github.com/vector-im/riot-ios into develop ...

Conflicts:
	Riot/Assets/fr.lproj/Vector.strings

2018-02-07 10:41:51 +00:00

..

API

Make code compatible with !use_frameworks in Podfile

2017-11-23 16:09:19 +01:00

Assets

Merge branch 'develop' of https://github.com/vector-im/riot-ios into develop

2018-02-07 10:41:51 +00:00

Base.lproj

Groups: self-management of membership of groups

2017-12-12 16:03:26 +01:00

Categories

Groups: self-management of membership of groups

2017-12-20 12:32:40 +01: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

AppDelegate - Groups: handle links to groups

2017-12-31 16:24:47 +01:00

Utils

Widgets: Make sure we have a scalar token before opening one (#1723).

2018-01-04 12:25:32 +01:00

ViewController

Merge pull request #1762 from vector-im/settings_flair

2018-02-07 01:37:03 -08:00

Views

Settings: Enhance flair handling

2018-02-06 23:38:12 +01:00

AppDelegate.h

Merge branch 'develop' into groups

2017-12-22 14:50:40 +01:00

AppDelegate.m

Groups: Display flair for users in room history.

2018-02-04 17:13:44 +01: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

version++

2018-01-03 14:48:19 +01:00

main.m

Should fix spontaneous logout.

2017-11-15 15:49:54 +01:00

Riot-Defaults.plist

Piwik: Point to the piwik API URL, not the site landing page

2018-01-30 15:10:26 +01:00

Riot.entitlements

Update entitlements

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

third_party_licenses.html

Podfile: Update the minimal iOS version to 9.0

2018-02-07 10:18:45 +01:00