giomfo 4051cf4fdb Merge remote-tracking branch 'origin/develop' into with-contacts ... Conflicts: samples/matrixConsole/matrixConsole.xcodeproj/project.pbxproj samples/matrixConsole/matrixConsole/AppDelegate.m		2015-01-23 15:53:39 +01:00
..
ContactsViewController.h	Offer to send invitation to non Matrix user (by email or SMS).	2015-01-21 13:25:13 +01:00
ContactsViewController.m	Merge remote-tracking branch 'origin/develop' into with-contacts	2015-01-23 15:53:39 +01:00
HomeViewController.h	Home: Add search option in public rooms	2014-12-08 09:32:21 +01:00
HomeViewController.m	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
LoginViewController.h	Rename directories of sample sources (matrixConsole)	2014-11-24 10:38:23 +01:00
LoginViewController.m	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
MasterTabBarController.h	Do not display alert when a media picker is displayed.	2015-01-08 17:30:46 +01:00
MasterTabBarController.m	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
MemberViewController.h	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
MemberViewController.m	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
RecentsViewController.h	Recents: add search option	2014-12-02 15:25:00 +01:00
RecentsViewController.m	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
RoomViewController.h	First implementation of multiLines textInput (SYIOS-53).	2015-01-14 15:17:20 +01:00
RoomViewController.m	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00
SettingsViewController.h	Fix second half of SYIOS-38 - bad UX when updating avator & display name in settings	2015-01-05 16:55:51 +01:00
SettingsViewController.m	Rename MatrixHandler to MatrixSDKHandler	2015-01-23 15:36:05 +01:00