Commit Graph

3313 Commits

Author SHA1 Message Date
manuroe
8a6724907b Merge branch 'master' into patch-1 2017-07-05 15:21:44 +02:00
Giom Foret
9c2271feaa version++ 2017-07-05 12:05:33 +02:00
Giom Foret
c4ecad6e2c Update the bundle display name with "Riot.im"
Update Riot logo in Authentication screen
2017-07-05 11:58:18 +02:00
Nathan van Beelen
2951a71fae Remove duplicates 2017-07-01 22:03:16 +02:00
Giom Foret
485ff69cc2 version++ 2017-06-30 17:42:53 +02:00
giomfo
3df17de227 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
d44d5cfeb9 Home: display the room name on 2 lines 2017-06-30 17:37:43 +02:00
Giom Foret
8e4bfeef5e Home: display the room name on 2 lines 2017-06-30 17:06:23 +02:00
giomfo
68e7cc5d3d 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
64c9af8078 Read Receipts Details - Add close button 2017-06-30 14:57:11 +02:00
manuroe
6986fa823d 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
474fd7cf6d GA: Disable GA in debug as it pollutes stats and crashes 2017-06-30 13:37:36 +02:00
Giom Foret
204717bfe5 Update Authors 2017-06-30 11:55:04 +02:00
giomfo
513b2c948c Merge pull request #1341 from aramsargsyan/read-receipts-details
Read receipts details
2017-06-30 10:33:06 +02:00
manuroe
9120d587b8 Merge pull request #1367 from vector-im/riot_1362
Several improvements in bug & crash report
2017-06-29 17:46:25 +02:00
manuroe
ff6f4268a3 Crash report: Do not loose what the user typed when debackgrounding the app 2017-06-29 17:45:54 +02:00
Aram Sargsyan
1070fe1c7a 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
04c17f7d60 Crash report: Do not loose what the user typed when debackgrounding the app 2017-06-29 17:33:08 +02:00
manuroe
d885c3f0bd Bug report: Remove the old requirement for an existing email account 2017-06-29 17:24:54 +02:00
manuroe
52fc3bbb14 Bug report: Fix a crash when rotating + debackgrounding the app (#1362) 2017-06-29 17:23:57 +02:00
Aram Sargsyan
b19fa5c656 Decreased the parameter cound for ReadReceiptsViewController opening, now sending the container itself 2017-06-29 17:04:34 +04:00
giomfo
fb8202bd40 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
2a0c5b2f6d 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
e6f3d074e5 Handled the creation of the attributed receipt description, added in Vector.strings for translation 2017-06-29 15:05:12 +04:00
Giom Foret
9e033f1c3f Bug Fix: blank pages with random "unread msgs" bars whilst they load. 2017-06-29 12:03:39 +02:00
giomfo
86f8fe02e3 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
b08dea5838 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
fa283f0952 Bug Fix - Chat screen: the message overlaps its timestamp
(related to #1361)
2017-06-28 18:51:05 +02:00
Aram Sargsyan
aeb354855c Merge pull request #1 from giomfo/read-receipts-details-gfo
Read Receipts Details - RoomDataSource
2017-06-28 00:25:48 +04:00
Giom Foret
6c023228a1 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
e1b3e9bd5c 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
8a6917543b Review changes 2017-06-26 22:22:32 +04:00
Aram Sargsyan
68b583cc53 Using Attributed string for read label 2017-06-26 20:51:13 +04:00
Aram Sargsyan
ae1ae4d141 Removed the ReceiptsContainerDelegate, used didRecognizeAction: instead 2017-06-26 19:33:53 +04:00
manuroe
d91c305d1d 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
a4ed741c37 version ++ 2017-06-23 16:23:28 +02:00
giomfo
7d4c8c721a 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
Giom Foret
25a06ab8a7 Bug Fix - Read marker: when being kicked, the "Jump to first unread message" shouldn't be displayed
#1338

+ Remove the link to the room settings in the title view after leaving the room
2017-06-23 15:09:43 +02:00
Aram Sargsyan
6def971978 Review changes 2017-06-23 16:40:09 +04:00
manuroe
24d774630c Merge pull request #1351 from vector-im/riot_1329_2
Fix: Room directory: stuck after the 20 first items
2017-06-23 14:17:38 +02:00
manuroe
9f956c7f06 Fix: Room directory: stuck after the 20 first items
https://github.com/vector-im/riot-ios/issues/1329#issuecomment-310361132
2017-06-23 11:44:13 +02:00
giomfo
0595fbe4d5 Merge pull request #1348 from vector-im/riot_1304_bis
Bug Fix - Home: tapping on an unread room on home page takes you to the wrong room
2017-06-22 15:23:01 +02:00
manuroe
f979a2afbc Merge pull request #1347 from vector-im/riot_1342
Fix: Crash when hitting room from unified search/browse directory
2017-06-22 15:22:14 +02:00
Giom Foret
eb7c699e4a Bug Fix - Home: tapping on an unread room on home page takes you to the wrong room
#1304
2017-06-22 15:17:24 +02:00
Giom Foret
401797b559 Merge branch 'riot_1304' into riot_1304_bis 2017-06-22 15:09:38 +02:00
Giom Foret
230d15889a Bug Fix - Home: tapping on an unread room on home page takes you to the wrong room
#1304
2017-06-22 15:03:30 +02:00
giomfo
31ac9d980b Merge pull request #1346 from vector-im/riot_1344
Bug Fix - Chat screen: the search icon is missing after switching in …
2017-06-22 14:55:49 +02:00
Giom Foret
cfae3b5f71 Revert "Bug Fix - Home: tapping on an unread room on home page takes you to the wrong room"
This reverts commit 06a7712d46f348cdd287d73eda40632fc5419531.
2017-06-22 14:43:21 +02:00
Giom Foret
f4471cd7b4 Bug Fix - Home: tapping on an unread room on home page takes you to the wrong room
#1304
2017-06-22 14:40:11 +02:00
manuroe
74e71fc400 Fix: Crash when hitting room from unified search/browse directory
#1342
2017-06-22 11:09:17 +02:00