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 |
|
yannick
|
dd1b9c92e6
|
Update to the latest UI design
|
2015-12-10 14:17:02 +01:00 |
|
yannick
|
6c9784e40a
|
add_invite_rooms_section
fix some UI issues.
|
2015-12-10 10:16:22 +01:00 |
|
yannick
|
09567f1c29
|
add_invite_rooms_section
Plug the join/reject button
The join does not refresh properly the recents.
|
2015-12-10 09:00:57 +01:00 |
|
yannick
|
6169b39ae5
|
Improve the invite room display.
|
2015-12-09 17:38:39 +01:00 |
|
yannick
|
c96d6fb9cd
|
add_invite_rooms_section
-> add the customized invite cell.
not yet plugged.
|
2015-12-09 17:01:29 +01:00 |
|