Commit graph

3326 commits

Author SHA1 Message Date
manuroe
2793b8b5a7 Merge pull request #1373 from vector-im/smaller_membership
Smaller memberships
2017-07-06 13:46:51 +02:00
manuroe
e2951447b7 Merge remote-tracking branch 'origin/develop' into smaller_membership
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2017-07-06 13:46:20 +02:00
manuroe
c887dc704c Fix Dutch Vector.strings and add nl.proj to pbxproj 2017-07-05 15:51:07 +02:00
manuroe
c544b1e29e Merge remote-tracking branch 'origin/pr/1317' into develop 2017-07-05 15:29:08 +02:00
manuroe
9478752030 Merge branch 'master' into patch-1 2017-07-05 15:21:44 +02:00
manuroe
42979e7972 Merge remote-tracking branch 'origin/master' into smaller_membership 2017-07-05 14:57:31 +02:00
manuroe
75f759db01 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
5cf28c57a0 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
f87a807d67 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
bc08148183 RoomVC: Make membership events use less screen
Add RoomMembershipBubbleCellWithPaginationTitleBubbleCell
2017-07-05 12:29:54 +02:00
Giom Foret
506df4cc40 version++ 2017-07-05 12:05:33 +02:00
Giom Foret
2f183ce73b Update the bundle display name with "Riot.im"
Update Riot logo in Authentication screen
2017-07-05 11:58:18 +02:00
manuroe
b6913bcb55 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
8e0bc6ef68 RoomVC: Make membership events use less screen
Use MXKRoomBubbleCellDataStoring.tag to identify membership cells
2017-07-05 09:05:23 +02:00
manuroe
221924d0bc RoomVC: Make membership events use less screen
Reduce height of RoomMembershipBubbleCell from 44 to 34
2017-07-05 07:50:42 +02:00
manuroe
c496901eb2 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
16c750a26c Remove duplicates 2017-07-01 22:03:16 +02:00
Giom Foret
c08b28d356 version++ 2017-06-30 17:42:53 +02:00
giomfo
e1c98ae657 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
b038cbc681 Home: display the room name on 2 lines 2017-06-30 17:37:43 +02:00
Giom Foret
7983138b90 Home: display the room name on 2 lines 2017-06-30 17:06:23 +02:00
giomfo
f4d485b14e 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
0a8f837617 Read Receipts Details - Add close button 2017-06-30 14:57:11 +02:00
manuroe
bda3aa1035 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
7b6eeed764 GA: Disable GA in debug as it pollutes stats and crashes 2017-06-30 13:37:36 +02:00
Giom Foret
960eee2e3b Update Authors 2017-06-30 11:55:04 +02:00
giomfo
3fac2a0b63 Merge pull request #1341 from aramsargsyan/read-receipts-details
Read receipts details
2017-06-30 10:33:06 +02:00
manuroe
38409180fe Merge pull request #1367 from vector-im/riot_1362
Several improvements in bug & crash report
2017-06-29 17:46:25 +02:00
manuroe
725cf68107 Crash report: Do not loose what the user typed when debackgrounding the app 2017-06-29 17:45:54 +02:00
Aram Sargsyan
f287dc453e 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
3026c3df60 Crash report: Do not loose what the user typed when debackgrounding the app 2017-06-29 17:33:08 +02:00
manuroe
d03097ee82 Bug report: Remove the old requirement for an existing email account 2017-06-29 17:24:54 +02:00
manuroe
1bf88ca95e Bug report: Fix a crash when rotating + debackgrounding the app (#1362) 2017-06-29 17:23:57 +02:00
Aram Sargsyan
e17622bd71 Decreased the parameter cound for ReadReceiptsViewController opening, now sending the container itself 2017-06-29 17:04:34 +04:00
giomfo
e939c92c35 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
ea3ae98952 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
9bb18971f1 Handled the creation of the attributed receipt description, added in Vector.strings for translation 2017-06-29 15:05:12 +04:00
Giom Foret
b706db6187 Bug Fix: blank pages with random "unread msgs" bars whilst they load. 2017-06-29 12:03:39 +02:00
giomfo
de11e8f9fa 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
5ccb26b15a 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
6747ec692e Bug Fix - Chat screen: the message overlaps its timestamp
(related to #1361)
2017-06-28 18:51:05 +02:00
Aram Sargsyan
6b25f8f3bf Merge pull request #1 from giomfo/read-receipts-details-gfo
Read Receipts Details - RoomDataSource
2017-06-28 00:25:48 +04:00
Giom Foret
d7360068fb 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
9629f3019a 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
74455c0dc7 Review changes 2017-06-26 22:22:32 +04:00
Aram Sargsyan
6f08b148b1 Using Attributed string for read label 2017-06-26 20:51:13 +04:00
Aram Sargsyan
e688c61715 Removed the ReceiptsContainerDelegate, used didRecognizeAction: instead 2017-06-26 19:33:53 +04:00
manuroe
f06b9e3381 Fix: Crash when scrolling in the public rooms from Unified Search (#1355)
Make pagination UI update of DirectoryViewController simpler.

The issue is that the same PublicRoomsDirectoryDataSource instance is shared between DirectoryViewController and RoomsViewController. We can have parallel paginations which makes hard to count the exact number of added cells.
2017-06-26 15:33:45 +02:00
Giom Foret
3c743483e6 version ++ 2017-06-23 16:23:28 +02:00
giomfo
cf01921b24 Merge pull request #1356 from vector-im/riot_1338
Bug Fix - Read marker: when being kicked, the "Jump to first unread m…
2017-06-23 15:16:08 +02:00