manuroe 96c8d76702 Merge remote-tracking branch 'origin/develop' into email_invitation ...

Conflicts:
	Vector/Categories/MXKRoomBubbleTableViewCell+Vector.m

2016-02-08 11:17:56 +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

Sign in screen

2016-01-27 18:23:56 +01:00

AuthenticationViewController.m

VectorDesignValues: Load Vector colors at the app load time for the life of the app

2016-02-05 15:21:00 +01:00

AuthenticationViewController.xib

Fix wrong asset reference in xib

2016-01-29 13:15:30 +01: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

Empty cells: hide them where it is needed

2016-01-05 18:18:07 +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

HomeSearchViewController.h

Search API support: Customised search in user's rooms display according to the Vector design

2015-12-30 16:23:25 +01:00

HomeSearchViewController.m

Empty cells: hide them where it is needed

2016-01-05 18:18:07 +01: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

Bug fix: Replace People with Members #51

2016-01-14 15:23:58 +01:00

MediaAlbumContentViewController.h

Media Picker: Apply Ribot design

2016-01-19 18:59:40 +01:00

MediaAlbumContentViewController.m

Media Picker: Apply Ribot design

2016-01-19 18:59:40 +01:00

MediaAlbumContentViewController.xib

Media Picker: Apply Ribot design

2016-01-19 18:59:40 +01:00

MediaPickerViewController.h

Media Picker: Apply Ribot design

2016-01-19 18:59:40 +01:00

MediaPickerViewController.m

MediaPickerViewController: Bug Fix - Navigation Bar is not restored

2016-01-22 10:47:12 +01:00

MediaPickerViewController.xib

MediaPickerViewController: Remove wrong icon use

2016-01-22 10:47:47 +01:00

RecentsViewController.h

Public rooms search: Automatically scroll to the top on each new seach

2015-12-21 11:13:46 +01:00

RecentsViewController.m

VectorDesignValues: Load Vector colors at the app load time for the life of the app

2016-02-05 15:21:00 +01:00

RoomCreationStep1ViewController.h

Room Creation: Update existing room creation screen

2016-01-22 10:50:51 +01:00

RoomCreationStep1ViewController.m

Room Creation: Update existing room creation screen

2016-01-22 10:50:51 +01:00

RoomCreationStep2ViewController.h

RoomParticipants: move some code and add comments

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

RoomCreationStep2ViewController.m

Bug Fix: Room members: Swipe mode is not available on iphone 5c iOS 8 #70

2016-02-05 10:44:15 +01:00

RoomParticipantsViewController.h

room_members_search

2015-12-21 11:14:57 +01:00

RoomParticipantsViewController.m

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

2016-02-08 11:17:56 +01:00

RoomSearchViewController.h

Search background image: Made it generic and updated UIViewController+VectorSerch to add it programmatically

2016-01-05 16:03:58 +01:00

RoomSearchViewController.m

Search background image: UIViewController+VectorSerch: Keep Search background image bottom and keyboard top aligned

2016-01-05 16:27:50 +01:00

RoomSettingsViewController.h

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

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

RoomSettingsViewController.m

VectorDesignValues: Load Vector colors at the app load time for the life of the app

2016-02-05 15:21:00 +01:00

RoomViewController.h

Bug Fix: move further the chevron in room title view #48

2016-01-13 19:03:27 +01:00

RoomViewController.m

Chat: Bug Fix event timestamp is not aligned when username is hidden.

2016-01-21 17:57:02 +01:00

SegmentedViewController.h

Search background image: Use new UIViewController+VectorSerch feature in the search in the homeVC

2016-01-05 16:59:22 +01:00

SegmentedViewController.m

VectorDesignValues: Load Vector colors at the app load time for the life of the app

2016-02-05 15:21:00 +01:00

SegmentedViewController.xib

Search background image: Use new UIViewController+VectorSerch feature in the search in the homeVC

2016-01-05 16:59:22 +01:00

SettingsViewController.h

user_settings_page

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

SettingsViewController.m

VectorDesignValues: Load Vector colors at the app load time for the life of the app

2016-02-05 15:21:00 +01:00