manuroe 68fd187509 Merge remote-tracking branch 'origin/develop' into public_rooms_search ...

Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/Model/RoomList/RecentsDataSource.m

2015-12-21 10:35:48 +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

DirectoryViewController.h

Public rooms search: Directory page starts to work (with cells from MatrixKit)

2015-12-18 17:17:03 +01:00

DirectoryViewController.m

Public rooms search: Added selection in the directory screen

2015-12-18 18:25:39 +01: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

Public rooms search: Directory page starts to work (with cells from MatrixKit)

2015-12-18 17:17:03 +01:00

HomeViewController.m

Public rooms search: Directory page starts to work (with cells from MatrixKit)

2015-12-18 17:17:03 +01:00

MediaPickerViewController.h

MediaPickerViewController: improve video attavhmnet handling

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

MediaPickerViewController.m

Merge remote-tracking branch 'origin/develop' into public_rooms_search

2015-12-21 10:35:48 +01: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

Merge remote-tracking branch 'origin/develop' into public_rooms_search

2015-12-21 10:35:48 +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

Merge remote-tracking branch 'origin/develop' into public_rooms_search

2015-12-21 10:35:48 +01:00

RoomSettingsViewController.m

Merge remote-tracking branch 'origin/develop' into public_rooms_search

2015-12-21 10:35:48 +01:00

RoomViewController.h

display_room_avatars

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

RoomViewController.m

Merge remote-tracking branch 'origin/develop' into public_rooms_search

2015-12-21 10:35:48 +01:00

SegmentedViewController.h

SegmentedVC improvement: Renamed displayedViewController to selectedViewController to be uniform with selectedIndex

2015-12-15 17:31:16 +01:00

SegmentedViewController.m

SegmentedVC improvement: Oops. Fixed buggy renaming.

2015-12-15 18:22: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

Merge remote-tracking branch 'origin/develop' into public_rooms_search

2015-12-21 10:35:48 +01:00