 manuroe
|
33974c6c2d
|
Merge remote-tracking branch 'origin/develop' into smaller_membership
# Conflicts:
# Riot.xcodeproj/project.pbxproj
|
2017-07-06 13:46:20 +02:00 |
|
 Giom Foret
|
fdeff3db49
|
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 |
|
|
manuroe
|
962c1d9f00
|
Fix Dutch Vector.strings and add nl.proj to pbxproj
|
2017-07-05 15:51:07 +02:00 |
|
|
manuroe
|
8fe5865010
|
Merge remote-tracking branch 'origin/pr/1317' into develop
|
2017-07-05 15:29:08 +02:00 |
|
 manuroe
|
58a880531d
|
Merge pull request #1374 from vector-im/revert-1317-patch-1
Revert "Dutch translation of the strings"
|
2017-07-05 15:23:44 +02:00 |
|
|
manuroe
|
0d9cfc8521
|
Revert "Dutch translation of the strings"
|
2017-07-05 15:23:08 +02:00 |
|
|
manuroe
|
30b6121168
|
Merge pull request #1317 from nvbln/patch-1
Dutch translation of the strings
|
2017-07-05 15:22:25 +02:00 |
|
|
manuroe
|
d5e1816e0a
|
Merge branch 'master' into patch-1
|
2017-07-05 15:21:44 +02:00 |
|
|
manuroe
|
c83ed38e25
|
Merge remote-tracking branch 'origin/master' into smaller_membership
|
2017-07-05 14:57:31 +02:00 |
|
|
manuroe
|
abf3a78421
|
RoomVC: Make membership events use less screen
Fix senderInformation (avatar and displayname) for the 1st message when an user joins and talks in a row
|
2017-07-05 14:54:12 +02:00 |
|
|
manuroe
|
e0b3d65a7b
|
RoomVC: Make membership events use less screen
If the text was moved down (because of last message), do the same for the icon
|
2017-07-05 14:13:38 +02:00 |
|
|
manuroe
|
cdfeeb1180
|
RoomVC: Make membership events use less screen
Move icon and text of membership cells to the right to be aligned with other cells.
|
2017-07-05 14:06:53 +02:00 |
|
|
manuroe
|
09b27c84f5
|
RoomVC: Make membership events use less screen
Add RoomMembershipBubbleCellWithPaginationTitleBubbleCell
|
2017-07-05 12:29:54 +02:00 |
|
|
Giom Foret
|
f023617633
|
version++
|
2017-07-05 12:05:33 +02:00 |
|
|
Giom Foret
|
01da6a5477
|
Update the bundle display name with "Riot.im"
Update Riot logo in Authentication screen
|
2017-07-05 11:58:18 +02:00 |
|
|
manuroe
|
f29fa8e8ef
|
RoomVC: Make membership events use less screen
If the text was moved down, do the same for the icon
|
2017-07-05 09:55:21 +02:00 |
|
|
manuroe
|
a35906893a
|
RoomVC: Make membership events use less screen
Use MXKRoomBubbleCellDataStoring.tag to identify membership cells
|
2017-07-05 09:05:23 +02:00 |
|
|
manuroe
|
01e5086a02
|
RoomVC: Make membership events use less screen
Reduce height of RoomMembershipBubbleCell from 44 to 34
|
2017-07-05 07:50:42 +02:00 |
|
|
manuroe
|
0165a7cc6c
|
RoomVC: Make membership events use less screen
Add RoomMembershipBubbleCell to display a single membership event
|
2017-07-05 07:38:07 +02:00 |
|
 Nathan van Beelen
|
af4715246c
|
Remove duplicates
|
2017-07-01 22:03:16 +02:00 |
|
|
Giom Foret
|
22b2abcea2
|
version++
|
2017-06-30 17:42:53 +02:00 |
|
|
giomfo
|
a735d09b05
|
Merge pull request #1371 from vector-im/room_name_on_2_lines
Room name on 2 lines
|
2017-06-30 17:40:09 +02:00 |
|
|
Giom Foret
|
6e6a483dbd
|
Home: display the room name on 2 lines
|
2017-06-30 17:37:43 +02:00 |
|
|
Giom Foret
|
10acccc29d
|
Home: display the room name on 2 lines
|
2017-06-30 17:06:23 +02:00 |
|
|
giomfo
|
3e976e1919
|
Merge pull request #1369 from vector-im/rr_details_close_btn
Read Receipts Details - Add close button
|
2017-06-30 15:13:14 +02:00 |
|
|
Giom Foret
|
0ff3dd6665
|
Read Receipts Details - Add close button
|
2017-06-30 14:57:11 +02:00 |
|
|
manuroe
|
1ba89bb451
|
Merge pull request #1368 from vector-im/disable_ga_in_debug
GA: Disable GA in debug as it pollutes stats and crashes
|
2017-06-30 14:40:07 +02:00 |
|
|
manuroe
|
2d76b5acbe
|
GA: Disable GA in debug as it pollutes stats and crashes
|
2017-06-30 13:37:36 +02:00 |
|
|
Giom Foret
|
851ed200fa
|
Update Authors
|
2017-06-30 11:55:04 +02:00 |
|
|
giomfo
|
866e24e1e0
|
Merge pull request #1341 from aramsargsyan/read-receipts-details
Read receipts details
|
2017-06-30 10:33:06 +02:00 |
|
|
manuroe
|
a72737f565
|
Merge pull request #1367 from vector-im/riot_1362
Several improvements in bug & crash report
|
2017-06-29 17:46:25 +02:00 |
|
|
manuroe
|
5dc342dd09
|
Crash report: Do not loose what the user typed when debackgrounding the app
|
2017-06-29 17:45:54 +02:00 |
|
 Aram Sargsyan
|
6b885eaa11
|
Brought the key receipt_status_read to app level + some minor changes. Signed-off-by: Aram Sargsyan aram.sargsyan.1997@gmail.com
|
2017-06-29 19:40:07 +04:00 |
|
|
manuroe
|
9e95efcd59
|
Crash report: Do not loose what the user typed when debackgrounding the app
|
2017-06-29 17:33:08 +02:00 |
|
|
manuroe
|
fc3e1b6805
|
Bug report: Remove the old requirement for an existing email account
|
2017-06-29 17:24:54 +02:00 |
|
|
manuroe
|
da4bf111c6
|
Bug report: Fix a crash when rotating + debackgrounding the app (#1362)
|
2017-06-29 17:23:57 +02:00 |
|
|
Aram Sargsyan
|
b182dc1009
|
Decreased the parameter cound for ReadReceiptsViewController opening, now sending the container itself
|
2017-06-29 17:04:34 +04:00 |
|
|
giomfo
|
c6b5edeb04
|
Merge pull request #1366 from vector-im/annoying_new_messages_label
Bug Fix: blank pages with random "unread msgs" bars whilst they load.
|
2017-06-29 14:48:19 +02:00 |
|
|
Aram Sargsyan
|
13e2ce7c01
|
Merge branch 'read-receipts-details' of https://github.com/aramsargsyan/riot-ios into read-receipts-details
|
2017-06-29 15:05:21 +04:00 |
|
|
Aram Sargsyan
|
a0b8c5d80e
|
Handled the creation of the attributed receipt description, added in Vector.strings for translation
|
2017-06-29 15:05:12 +04:00 |
|
|
Giom Foret
|
537704f777
|
Bug Fix: blank pages with random "unread msgs" bars whilst they load.
|
2017-06-29 12:03:39 +02:00 |
|
|
giomfo
|
e3cd1f38a1
|
Merge pull request #1364 from vector-im/riot_1361
Bug Fix - Chat screen: the message overlaps its timestamp
|
2017-06-29 09:32:33 +02:00 |
|
|
Giom Foret
|
a76e4d3ced
|
Bug Fix - Chat screen: several encryption icons are displayed on the same event.
Fix tap handling on encryption icons
(related to #1361)
|
2017-06-28 21:15:09 +02:00 |
|
|
Giom Foret
|
ffc142f64b
|
Bug Fix - Chat screen: the message overlaps its timestamp
(related to #1361)
|
2017-06-28 18:51:05 +02:00 |
|
|
Aram Sargsyan
|
f863a8e81b
|
Merge pull request #1 from giomfo/read-receipts-details-gfo
Read Receipts Details - RoomDataSource
|
2017-06-28 00:25:48 +04:00 |
|
|
Giom Foret
|
1d47cb1f81
|
Read Receipts Details - RoomDataSource: Add RR container in the cell content view
instead of the overlay container to not disturb tag gesture handling.
https://github.com/vector-im/riot-ios/issues/59
|
2017-06-27 11:05:43 +02:00 |
|
|
manuroe
|
0f14ab0d29
|
Merge pull request #1358 from vector-im/riot_1355
Fix: Crash when scrolling in the public rooms from Unified Search
|
2017-06-27 09:28:21 +02:00 |
|
|
Aram Sargsyan
|
177ff95489
|
Review changes
|
2017-06-26 22:22:32 +04:00 |
|
|
Aram Sargsyan
|
6a692c7cee
|
Using Attributed string for read label
|
2017-06-26 20:51:13 +04:00 |
|
|
Aram Sargsyan
|
1f48a6d946
|
Removed the ReceiptsContainerDelegate, used didRecognizeAction: instead
|
2017-06-26 19:33:53 +04:00 |
|