manuroe e99b575968 Merge remote-tracking branch 'origin/develop' into search_api_support ...

Conflicts:
	Vector.xcodeproj/project.pbxproj

2015-12-09 18:28:53 +01:00

..

AccountDetailsViewController.h

replace matrixConsole project with Vector Xcode project.

2015-08-10 16:58:31 +02:00

AccountDetailsViewController.m

Update Vector storyboard:

2015-08-12 09:32:45 +02:00

AuthenticationViewController.h

replace matrixConsole project with Vector Xcode project.

2015-08-10 16:58:31 +02:00

AuthenticationViewController.m

Authentication: prepare C-S auth API v2 support

2015-09-28 10:23:33 +02:00

GlobalNotificationSettingsViewController.h

replace matrixConsole project with Vector Xcode project.

2015-08-10 16:58:31 +02:00

GlobalNotificationSettingsViewController.m

replace matrixConsole project with Vector Xcode project.

2015-08-10 16:58:31 +02:00

HomeViewController.h

HomeVC: Added missing comments

2015-12-09 18:20:00 +01:00

HomeViewController.m

HomeVC: Use it from the AppDelegate

2015-12-09 18:12:42 +01:00

MediaPickerViewController.h

MediaPickerViewController: improve video attavhmnet handling

2015-09-08 17:22:39 +02:00

MediaPickerViewController.m

MediaPicker: use the new MXKMediaCollectionViewCell class.

2015-10-22 17:22:10 +02:00

MediaPickerViewController.xib

MediaPicker: use the new MXKMediaCollectionViewCell class.

2015-10-22 17:22:10 +02:00

RecentsViewController.h

HomeVC: Moved code (opening room and maintaining the current one) from RecentsVC to HomeVC - Part 2/2

2015-12-09 16:48:43 +01:00

RecentsViewController.m

HomeVC: Moved code (opening room and maintaining the current one) from RecentsVC to HomeVC - Part 2/2

2015-12-09 16:48:43 +01:00

RoomCreationStep1ViewController.h

Add first implementation of Room creation screens

2015-08-14 09:21:39 +02:00

RoomCreationStep1ViewController.m

Remove the TabBarController

2015-11-18 00:15:52 +01:00

RoomCreationStep2ViewController.h

RoomParticipants: move some code and add comments

2015-09-11 13:51:33 +02:00

RoomCreationStep2ViewController.m

Remove the TabBarController

2015-11-18 00:15:52 +01:00

RoomParticipantsViewController.h

RoomParticipants: move some code and add comments

2015-09-11 13:51:33 +02:00

RoomParticipantsViewController.m

display_room_avatars :

2015-12-03 18:09:32 +01:00

RoomSettingsViewController.h

-> MXKRoomDetailsViewController becomes MXKSettingsDetailsViewController

2015-11-26 16:47:24 +01:00

RoomSettingsViewController.m

Rename addNavBarButtons to setNavBarButtons

2015-12-02 08:32:39 +01:00

RoomViewController.h

display_room_avatars

2015-12-04 16:58:18 +01:00

RoomViewController.m

Fix a crash in refreshTypingView

2015-12-08 17:45:03 +01:00

SegmentedViewController.h

HomeVC: made selectionContainerHeightConstraint accessible

2015-12-08 14:28:53 +01:00

SegmentedViewController.m

Search: SegmentedViewController: Made displayedViewController public

2015-12-07 13:52:38 +01:00

SegmentedViewController.xib

HomeVC: made selectionContainerHeightConstraint accessible

2015-12-08 14:28:53 +01:00

SettingsViewController.h

user_settings_page

2015-12-07 16:05:50 +01:00

SettingsViewController.m

user_settings_page

2015-12-08 17:37:59 +01:00