Commit Graph

2353 Commits

Author SHA1 Message Date
manuroe 4f7aad7038 Merge branch 'develop' into create_button_size 2019-06-19 15:42:40 +02:00
manuroe 46450be56f Merge branch 'develop' into matomo-v6 2019-06-19 15:31:43 +02:00
SBiOSoftWhare 8aef3c5160 RoomDataSource: Fix bubble cell data additional content height update. 2019-06-19 14:22:38 +02:00
SBiOSoftWhare 894ba3c71c Merge develop into fix_riot_attachmentview_reactions 2019-06-19 11:44:42 +02:00
SBiOSoftWhare 3042231d37 Fix bubble cell height for cells with attachment view and reactions. 2019-06-18 18:36:22 +02:00
SBiOSoftWhare 0080863a0b RoomBubbleCellData: Add additionalContentHeight property to cache additional views height like reactions view and read receipts container. 2019-06-18 18:30:39 +02:00
SBiOSoftWhare ae96687628 MXKRoomBubbleTableViewCell: Add convenient method to compute bubble cell height for cell with attachment view. 2019-06-18 18:29:12 +02:00
SBiOSoftWhare 7dac2f75a6 RoomBubbleCellData: Fix bubble component position when display last message timestamp. 2019-06-18 17:42:00 +02:00
SBiOSoftWhare 30d5d156e6 MXKRoomBubbleTableViewCell: Improve timestamp label positioning. 2019-06-18 17:41:09 +02:00
manuroe 717c887de7 Read receipts: Manage live update in the kit too 2019-06-18 14:06:23 +02:00
manuroe ed84d3b028 Read receipts: They are now counted at the MatrixKit level 2019-06-18 12:28:59 +02:00
SBiOSoftWhare 9ff92bce71 Merge pull request #2471 from vector-im/fix_show_context_menu_interaction_when_animate
RoomVC: Prevent user interaction in timeline while presenting context menu
2019-06-18 11:49:44 +02:00
manuroe eacf9c330b Merge pull request #2498 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-06-17 10:19:32 +02:00
manuroe c4b81a8ce2 Merge pull request #2497 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-06-17 10:18:22 +02:00
Weblate ae3e98a7ca Merge branch 'origin/develop' into Weblate. 2019-06-14 14:45:31 +00:00
Nathan Follens 4ef51b2974 Translated using Weblate (Dutch)
Currently translated at 100.0% (711 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/nl/
2019-06-14 14:45:30 +00:00
Slavi Pantaleev ca439a8482 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (711 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/bg/
2019-06-14 14:45:30 +00:00
Weblate 56e2b1fb7e Merge branch 'origin/develop' into Weblate. 2019-06-14 14:45:29 +00:00
Weblate 54dd7d0323 Merge branch 'origin/develop' into Weblate. 2019-06-14 14:45:29 +00:00
Besnik Bleta 7d47cad94f Translated using Weblate (Albanian)
Currently translated at 99.3% (706 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2019-06-14 14:45:29 +00:00
manuroe 0a8c46120b Menu actions: Display the keyboard once the users tap on reply or edit
This also fixes the local echo issues we had when this screen stayed displayed
2019-06-14 16:29:25 +02:00
manuroe 7a38bf5674 Reactions menu: leave the menu once the user tapped a reaction 2019-06-14 16:15:27 +02:00
Weblate d48d8afe0d Merge branch 'origin/develop' into Weblate. 2019-06-13 15:50:36 +00:00
Weblate d1c5f9148a Merge branch 'origin/develop' into Weblate. 2019-06-13 15:50:36 +00:00
Weblate 98990dccac Merge branch 'origin/develop' into Weblate. 2019-06-13 15:50:36 +00:00
manuroe e8f1c5956e Merge pull request #2490 from vector-im/reaction_echo
Local echo for reactions
2019-06-13 17:50:31 +02:00
Weblate b03e620a13 Merge branch 'origin/develop' into Weblate. 2019-06-13 15:41:33 +00:00
serjor 20c04223d4 Translated using Weblate (Spanish)
Currently translated at 71.3% (507 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/es/
2019-06-13 15:41:33 +00:00
Walter 13906955e8 Translated using Weblate (Russian)
Currently translated at 84.7% (602 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ru/
2019-06-13 15:41:33 +00:00
Kévin C b1bb1507a6 Translated using Weblate (French)
Currently translated at 100.0% (711 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2019-06-13 15:41:32 +00:00
Osoitz 582f628bbc Translated using Weblate (Basque)
Currently translated at 100.0% (711 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/eu/
2019-06-13 15:41:32 +00:00
Weblate a2564c63a2 Merge branch 'origin/develop' into Weblate. 2019-06-13 15:41:30 +00:00
Weblate f907acdf39 Merge branch 'origin/develop' into Weblate. 2019-06-13 15:41:30 +00:00
serjor 32c44ff093 Translated using Weblate (Spanish)
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/es/
2019-06-13 15:41:30 +00:00
SBiOSoftWhare 68dc4ca757 RoomViewController: Add message editing support. 2019-06-13 16:38:20 +02:00
SBiOSoftWhare 6a8dc8782f RoomInputToolbarView: Add editing mode. 2019-06-13 16:37:28 +02:00
manuroe adb8f10d8e Reactions: Change reaction and unreaction methods signatures 2019-06-12 18:25:47 +02:00
manuroe 07a5f57eea Reactions local echoes: Do not show reactions with 0 count (case of reaction being removed) 2019-06-12 18:03:21 +02:00
Weblate 1c5d8e32e6 Merge branch 'origin/develop' into Weblate. 2019-06-12 14:23:16 +00:00
Weblate 4ee0e39637 Merge branch 'origin/develop' into Weblate. 2019-06-12 14:23:16 +00:00
Weblate 39417a5b4b Merge branch 'origin/develop' into Weblate. 2019-06-12 14:23:16 +00:00
SBiOSoftWhare 03b7570fc1 RoomViewController: Prepare message edited mention tap. 2019-06-12 16:06:27 +02:00
SBiOSoftWhare 1bfe006d76 EventFormatter: Add edit mention suffix for edited messages. 2019-06-12 16:05:34 +02:00
SBiOSoftWhare 525ce978d8 Add message edited mention string. 2019-06-12 15:35:30 +02:00
Weblate 3cb0aacf70 Merge branch 'origin/develop' into Weblate. 2019-06-11 15:51:31 +00:00
Weblate f1e9c3c885 Merge branch 'origin/develop' into Weblate. 2019-06-11 15:51:31 +00:00
Weblate b66667438f Merge branch 'origin/develop' into Weblate. 2019-06-11 15:51:31 +00:00
SBiOSoftWhare 65e290b947 Merge pull request #2482 from vector-im/ReactionsMenuViewModel_update
ReactionsMenuViewModel: Do not perform directly reaction requests
2019-06-11 17:51:28 +02:00
SBiOSoftWhare cd5190bf81 RoomViewController: Display an error when react or unreact on event fails. 2019-06-11 17:43:32 +02:00
Weblate 607d2516b5 Merge branch 'origin/develop' into Weblate. 2019-06-11 14:57:26 +00:00