manuroe 9b0d035ed8 Merge remote-tracking branch 'origin/develop' into smaller_membership ...

# Conflicts:
#	Riot.xcodeproj/project.pbxproj

2017-07-06 13:46:20 +02:00

..

API

Bug report: Remove the old requirement for an existing email account

2017-06-29 17:24:54 +02:00

Assets

Fix Dutch Vector.strings and add nl.proj to pbxproj

2017-07-05 15:51:07 +02:00

Base.lproj

Bug Fix - Chat screen: the search icon is missing after switching in live from a non live timeline

2017-06-22 10:51:40 +02:00

Categories

Merge pull request #1341 from aramsargsyan/read-receipts-details

2017-06-30 10:33:06 +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

Model

RoomVC: Make membership events use less screen

2017-07-05 14:54:12 +02:00

Utils

UX Rework: Apply a different colour scheme on each application tab.

2017-05-11 10:22:18 +02:00

ViewController

Merge remote-tracking branch 'origin/master' into smaller_membership

2017-07-05 14:57:31 +02:00

Views

RoomVC: Make membership events use less screen

2017-07-05 14:13:38 +02:00

AppDelegate.h

Import RageShakeManager.h and RiotDesignValues.h in App Delegate header

2017-04-07 11:52:53 +02:00

AppDelegate.m

GA: Disable GA in debug as it pollutes stats and crashes

2017-06-30 13:37:36 +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

version++

2017-07-05 12:05:33 +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

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

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

third_party_licenses.html

Third-party notices: We now use cmark in place of GHMarkdownParser

2017-04-28 15:46:49 +02:00