giomfo 5c17d3fb3c Merge remote-tracking branch 'origin/develop' into riot_887 ... # Conflicts: # Vector/ViewController/StartChatViewController.m		2017-01-05 09:59:25 +01:00
..
API	Rageshake: Add e2e device key	2016-12-15 13:53:15 +01:00
Assets	Room Members / Invite screen: Split in two sections the search result.	2016-12-28 17:44:55 +01:00
Base.lproj	Bug Fix - App crashes when the user taps on an avatar in a search result.	2016-12-27 16:30:45 +01:00
Categories	Bug Fix - Chat screen: the vertical offset on encryption icon due to the timestamp	2016-11-16 15:36:35 +01:00
Images.xcassets/AppIcon.appiconset	Update Riot icons.	2016-12-13 19:30:20 +01:00
Model	Report MXEvent changes	2016-12-05 16:32:21 +01:00
Resources	replace matrixConsole project with Vector Xcode project.	2015-08-10 16:58:31 +02:00
Utils	Chat screen - Encrypted room: messages being encrypted are now displayed in green.	2016-12-19 16:47:18 +01:00
ViewController	Merge remote-tracking branch 'origin/develop' into riot_887	2017-01-05 09:59:25 +01:00
Views	Merge pull request #877 from vector-im/outgoing_msg_refactoring	2016-12-19 15:33:31 +01:00
AppDelegate.h	Bug Fix - Voip : decline call when room opened freeze riot	2016-11-24 15:09:04 +01:00
AppDelegate.m	Crypto: Show a popup when log out and in is required	2016-12-16 13:43:08 +01:00
empty.mm	replace matrixConsole project with Vector Xcode project.	2015-08-10 16:58:31 +02:00
GoogleService-Info.plist	Support GA services	2016-06-03 16:07:34 +02:00
Info.plist	version++	2016-12-23 12:32:03 +01:00
main.m	Support GA services	2016-06-03 16:07:34 +02:00
third_party_licenses.html	3rd party licenses: Add realm.io	2016-12-16 17:25:10 +01:00
Vector-Defaults.plist	Rollback the default IS	2016-09-15 15:03:35 +02:00
Vector.entitlements	Update universal links origin	2016-09-14 14:35:28 +02:00