Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
1646 commits 46 branches 261 tags 144 MiB
Commit graph

5 commits

Author SHA1 Message Date
manuroe
4ec9d21924 Merge remote-tracking branch 'origin/develop' into public_rooms_search 
Conflicts:
	Vector/Utils/AvatarGenerator.m
	Vector/ViewController/HomeViewController.m
 2015-12-23 11:05:46 +01:00
manuroe
33bd9f40fb Public rooms search: AvatarGenerator: made generateRoomAvatar more generic to be used for public rooms 2015-12-22 11:37:52 +01:00
yannick
22e253819e room_rules_deletion_issue 
-> fix a crash in the rule update observer
 2015-12-21 12:04:04 +01:00
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
8fd73ebbd7 room_photo_selection 
Move MXRoom+Vector from Model/Room to Categories folder
 2015-12-17 12:01:40 +01:00
Renamed from Vector/Model/Room/MXRoom+Vector.m (Browse further)