element-ios/Vector/Views/RoomBubbleList
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
..
RoomIncomingAttachmentBubbleCell.h Chat screen implementation 2015-12-11 14:01:56 +01:00
RoomIncomingAttachmentBubbleCell.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingAttachmentBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingAttachmentWithoutSenderInfoBubbleCell.h Chat screen implementation 2015-12-11 14:01:56 +01:00
RoomIncomingAttachmentWithoutSenderInfoBubbleCell.m Chat screen implementation 2015-12-11 14:01:56 +01:00
RoomIncomingAttachmentWithoutSenderInfoBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingAttachmentWithPaginationTitleBubbleCell.h Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingAttachmentWithPaginationTitleBubbleCell.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingAttachmentWithPaginationTitleBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingTextMsgBubbleCell.h Chat screen implementation 2015-12-11 14:01:56 +01:00
RoomIncomingTextMsgBubbleCell.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingTextMsgBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingTextMsgWithoutSenderInfoBubbleCell.h Chat screen implementation 2015-12-11 14:01:56 +01:00
RoomIncomingTextMsgWithoutSenderInfoBubbleCell.m Chat screen implementation 2015-12-11 14:01:56 +01:00
RoomIncomingTextMsgWithoutSenderInfoBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingTextMsgWithPaginationTitleBubbleCell.h Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingTextMsgWithPaginationTitleBubbleCell.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomIncomingTextMsgWithPaginationTitleBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingAttachmentBubbleCell.h Chat screen: Update bubble layout 2015-12-08 10:10:59 +01:00
RoomOutgoingAttachmentBubbleCell.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingAttachmentBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.h Chat screen: rename cell view classes 2015-12-08 10:54:48 +01:00
RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.m The read receipts are displayed for incoming messages. 2015-12-09 09:50:03 +01:00
RoomOutgoingAttachmentWithoutSenderInfoBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingAttachmentWithPaginationTitleBubbleCell.h Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingAttachmentWithPaginationTitleBubbleCell.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingAttachmentWithPaginationTitleBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingTextMsgBubbleCell.h Chat screen: Update bubble layout 2015-12-08 10:10:59 +01:00
RoomOutgoingTextMsgBubbleCell.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingTextMsgBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.h Chat screen: rename cell view classes 2015-12-08 10:54:48 +01:00
RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.m The read receipts are displayed for incoming messages. 2015-12-09 09:50:03 +01:00
RoomOutgoingTextMsgWithoutSenderInfoBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingTextMsgWithPaginationTitleBubbleCell.h Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingTextMsgWithPaginationTitleBubbleCell.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
RoomOutgoingTextMsgWithPaginationTitleBubbleCell.xib Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00