0807de501e
Merge pull request #1396 from vector-im/MELS_BF
...
MELS: bug fixing
2017-07-17 16:26:55 +02:00
1e9d544bf5
MELS: Reset the event selection before collapsing
...
This fixes a crash
2017-07-17 16:15:49 +02:00
3a7610a714
MELS: For now, do not merge VoIP conference events
2017-07-17 15:59:43 +02:00
33d3817a80
Merge pull request #1391 from vector-im/remove_mxk_alert
...
Remove mxk alert
2017-07-17 14:33:17 +02:00
22cf380b72
Merge pull request #1390 from vector-im/MELS
...
MELS
2017-07-17 10:41:28 +02:00
a5c8eb344a
MELS: s/serie/series
2017-07-17 10:30:46 +02:00
720475bb4e
MELS: Simplify check condition
2017-07-17 10:17:16 +02:00
d7352a9b6d
MELS: Fix typo
2017-07-17 09:15:41 +02:00
1e34aa5e1b
Remove MXKAlert class use.
...
UIAlertController is directly used.
2017-07-14 16:41:25 +02:00
130d999a26
Prepare MXKAlert withdrawal
2017-07-14 00:36:11 +02:00
bcae8f96e9
MELS: Improve detection on how to configure a cell
2017-07-13 17:10:15 +02:00
b78eac20f2
Merge pull request #1389 from vector-im/room_table_cell
...
RoomTableViewCell: Replace the direct chat icon with a green ring
2017-07-13 09:32:02 +02:00
034191a726
RoomTableViewCell: Replace the direct chat icon with a green ring
2017-07-12 15:51:28 +02:00
6d5961c1f2
Merge pull request #1388 from vector-im/riot_686
...
Bug Fix: Camera preview is broken after a second try
2017-07-12 09:18:40 +02:00
509975b8ef
Bug Fix: Camera preview is broken after a second try
...
The camera preview was set up with a wrong frame value. We wait for the first `viewDidLayoutSubviews` call before setting up the preview.
#686
+ fix the wrong preview layout on iPad described in PR #1372 MediaPicker xib layout fix.
2017-07-11 17:48:18 +02:00
40eefa4140
MELS: Force use of Riot style placeholder in collapsed cells
2017-07-11 17:02:23 +02:00
d723c99145
MELS: Do not show read receipts on collapsed bubbles
2017-07-11 16:51:31 +02:00
4c4b2f254f
MELS: Make RoomEmptyBubbleCell really empty (ie, height = 0)
2017-07-11 16:33:45 +02:00
d4dc9784d9
MELS: Fix call of bubbleCell.blurred when selected an event
2017-07-11 16:26:59 +02:00
1fc0c9bbfe
MELS: Remove attributedTextMessageBackup and let MXKRoomBubleCellDataStoring implementation display attributedTextMessage or collapsedAttributedTextMessage
2017-07-11 15:35:11 +02:00
09b406d202
MXKRoomBubbleCellData: Add the hasAttributedTextMessage property to avoid to do recomputation in MXKRoomBubbleCellData.attributedTextMessage when there is no strings to compose
2017-07-11 11:47:18 +02:00
560b8e2ebe
Merge pull request #1385 from vector-im/riot_meta_75_fix
...
Bug Fix - Home: Fix the flickering effects observed when user edits a…
2017-07-11 09:34:25 +02:00
45fd94d718
Bug Fix - Home: Fix the flickering effects observed when user edits a room on iOS < 10
...
https://github.com/vector-im/riot-meta/issues/75
2017-07-10 18:33:27 +02:00
6a4b1468c4
Bug Fix - Home: On iOS <= 9.0, the rooms collection scrolls to the left on room edition.
...
https://github.com/vector-im/riot-meta/issues/75
2017-07-10 17:18:11 +02:00
011c830b92
MELS: Add RoomMembershipExpandedWithPaginationTitleBubbleCell
2017-07-10 15:05:21 +02:00
194ba271cd
MELS: Add RoomMembershipCollapsedWithPaginationTitleBubbleCell
2017-07-10 14:30:53 +02:00
38c039512b
MELS: Rename RoomMembershipBubbleCellWithPaginationTitleBubbleCell to RoomMembershipWithPaginationTitleBubbleCell
2017-07-10 10:25:06 +02:00
2d3085b691
Merge pull request #1383 from vector-im/riot_meta_75
...
UX Rework: Add edition mode in home page
2017-07-10 09:37:35 +02:00
6da9ee0ed6
UX Rework: Add home page
...
- Add edition mode support.
https://github.com/vector-im/riot-meta/issues/75
2017-07-09 18:32:40 +02:00
cb07a34fe5
MELS: some i18n
2017-07-07 17:58:39 +02:00
cba62c229e
MELS: Use normal membership cell for single membership event
2017-07-07 17:47:58 +02:00
4cda8e1acf
MELS: Do not expand cell with single membership event
2017-07-07 17:46:37 +02:00
3132f42b2e
MELS: EventFormater: provide a string for membership events as simple as possible for now
2017-07-07 15:26:30 +02:00
e584123037
MELS: implement [MXKRoomBubbleCellDataStoring collaspseWith:]
2017-07-07 14:32:49 +02:00
e4f2915f8c
MELS: Implement onCollapseButtonTap with matrix-kitty way
2017-07-07 11:53:49 +02:00
57ba927ab6
MELS: Uncheck :installed" in xibs
2017-07-07 11:14:05 +02:00
a4708ccb8e
MELS: Add RoomMembershipExpandedBubbleCell that displays the first membership event of serie that can be collapsable.
2017-07-07 11:11:42 +02:00
865bf3670f
MELS: expand them on collapsed cell tap
2017-07-07 08:36:47 +02:00
c444f14596
MELS: Add RoomMembershipCollapsedBubbleCell to display collapsed membership cells.
2017-07-07 08:21:53 +02:00
e4d73f23e2
MELS: Add RoomMembershipCollapsedBubbleCell to display collapsed membership cells.
2017-07-06 22:52:08 +02:00
8b60b8b340
MELS: membership events are collapsable. Collapse them by default
2017-07-06 18:21:24 +02:00
5efacd090d
RoomVC: Use the condition on bubbleData.hasNoDisplay to display RoomEmptyBubbleCell
2017-07-06 17:55:13 +02:00
a45f4ac132
Merge pull request #1380 from vector-im/riot_1102
...
Bug Fix: Add the m.audio attachments support
2017-07-06 14:02:49 +02:00
aa8ee59f3b
Merge pull request #1373 from vector-im/smaller_membership
...
Smaller memberships
2017-07-06 13:46:51 +02:00
9b0d035ed8
Merge remote-tracking branch 'origin/develop' into smaller_membership
...
# Conflicts:
# Riot.xcodeproj/project.pbxproj
2017-07-06 13:46:20 +02:00
8c42555d58
Bug Fix: Add the m.audio attachments support
...
We support here the display of the attached audio files, but we are still not able to attach audio file.
#1102
2017-07-06 11:06:12 +02:00
55d75b6f96
Fix Dutch Vector.strings and add nl.proj to pbxproj
2017-07-05 15:51:07 +02:00
cd76680cdc
Merge remote-tracking branch 'origin/pr/1317' into develop
2017-07-05 15:29:08 +02:00
486f386eae
Merge branch 'master' into patch-1
2017-07-05 15:21:44 +02:00
df3189e097
Merge remote-tracking branch 'origin/master' into smaller_membership
2017-07-05 14:57:31 +02:00
manuroe
manuroe
giomfo