yannick 2a84654014 Merge remote-tracking branch 'origin/develop' into add_invite_rooms_section ...

Conflicts:
	Vector/Views/RoomList/RecentTableViewCell.xib

2015-12-10 13:52:20 +01:00

..

API

Update version of the pod dependencies

2015-09-24 11:53:56 +02:00

Assets

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

2015-12-10 12:44:17 +01:00

Base.lproj

HomeVC: storyboard: connected HomeVC to AuthVC and killed RecentsVC as HomeVC can do everything now

2015-12-09 17:28:39 +01:00

Images.xcassets/AppIcon.appiconset

replace matrixConsole project with Vector Xcode project.

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

Model

add_invite_rooms_section

2015-12-10 13:41:03 +01:00

Resources

replace matrixConsole project with Vector Xcode project.

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

Utils

add_invite_rooms_section

2015-12-09 16:09:46 +01:00

ViewController

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

2015-12-10 12:44:17 +01:00

Views

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

2015-12-10 13:52:20 +01:00

AppDelegate.h

HomeVC: Use it from the AppDelegate

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

AppDelegate.m

HomeVC: Use it from the AppDelegate

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

empty.mm

replace matrixConsole project with Vector Xcode project.

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

Info.plist

Info.plist: define the vector app bundle id

2015-11-26 14:27:28 +01:00

main.m

replace matrixConsole project with Vector Xcode project.

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

Vector-Defaults.plist

Defaults.plist: define pusher app ids for Vector

2015-11-26 14:27:59 +01:00