Commit Graph

6077 Commits

Author SHA1 Message Date
Weblate d3958a0105 Merge branch 'origin/develop' into Weblate. 2019-06-21 08:02:38 +00:00
SBiOSoftWhare 2b7a5b0160 Merge pull request #2519 from vector-im/fix_e2e_padlock
e2e room message: Fix padlock position on last message with sender name
2019-06-21 10:02:35 +02:00
SBiOSoftWhare 2475a2cd84 e2e room message: Fix padlock position on last message with sender name. 2019-06-20 12:07:04 +02:00
Weblate e72c8ef3fd Merge branch 'origin/develop' into Weblate. 2019-06-20 08:05:34 +00:00
SBiOSoftWhare 6cb3a0d4a5 Merge pull request #2517 from vector-im/cocoapods_1.7.2
Use CocoaPods 1.7.2
2019-06-20 10:05:30 +02:00
SBiOSoftWhare f94f07a82e Use CocoaPods 1.7.2 2019-06-19 16:48:16 +02:00
Weblate efe4036b6d Merge branch 'origin/develop' into Weblate. 2019-06-19 14:47:29 +00:00
manuroe a4e3c0a246 Merge pull request #2437 from dcordero/Bundler
Update build instructions to make use of Bundler
2019-06-19 16:47:24 +02:00
Weblate 08343d0934 Merge branch 'origin/develop' into Weblate. 2019-06-19 14:28:29 +00:00
SBiOSoftWhare 046d4ab247 Merge pull request #2514 from vector-im/swift_5
Migrate to Swift 5.0
2019-06-19 16:28:25 +02:00
SBiOSoftWhare dbbe470744 Update SwiftLint pod. 2019-06-19 16:16:30 +02:00
SBiOSoftWhare 9d7c334440 Use CocoaPods 1.7.1 and update Podfile.lock 2019-06-19 16:03:40 +02:00
SBiOSoftWhare a3f613ba31 Update changes 2019-06-19 15:48:40 +02:00
SBiOSoftWhare 36be87b55f Update Reusable pod 2019-06-19 15:46:58 +02:00
SBiOSoftWhare dc92130be8 Migrate project to Swift 5 2019-06-19 15:46:58 +02:00
Weblate 899907daf3 Merge branch 'origin/develop' into Weblate. 2019-06-19 13:44:05 +00:00
manuroe 73edf5d8d5 Merge pull request #2473 from dcordero/create_button_size
Adjust size of the insert button in the People tab
2019-06-19 15:44:00 +02:00
manuroe e66591d071 Update CHANGES.rst 2019-06-19 15:43:42 +02:00
manuroe 4f7aad7038 Merge branch 'develop' into create_button_size 2019-06-19 15:42:40 +02:00
Weblate b392835b26 Merge branch 'origin/develop' into Weblate. 2019-06-19 13:31:57 +00:00
manuroe 0f120ce43d Merge pull request #2159 from fridtjof/matomo-v6
Rename PiwikTracker to MatomoTracker and update to version 6.0.1
2019-06-19 15:31:53 +02:00
manuroe 46450be56f Merge branch 'develop' into matomo-v6 2019-06-19 15:31:43 +02:00
Weblate 0413b903be Merge branch 'origin/develop' into Weblate. 2019-06-19 12:29:48 +00:00
SBiOSoftWhare d18af9362b Merge pull request #2513 from vector-im/fix_RoomDataSource_additional_content_height
RoomDataSource: Fix bubble cell data additional content height update
2019-06-19 14:29:44 +02:00
SBiOSoftWhare 8aef3c5160 RoomDataSource: Fix bubble cell data additional content height update. 2019-06-19 14:22:38 +02:00
Weblate 72d5c77d6b Merge branch 'origin/develop' into Weblate. 2019-06-19 09:45:48 +00:00
SBiOSoftWhare 469e0e8d83 Merge pull request #2505 from vector-im/fix_riot_attachmentview_reactions
Fix reactions positioning for cells with attachment
2019-06-19 11:45:44 +02:00
SBiOSoftWhare 894ba3c71c Merge develop into fix_riot_attachmentview_reactions 2019-06-19 11:44:42 +02:00
Weblate 882973acb1 Merge branch 'origin/develop' into Weblate. 2019-06-19 09:25:05 +00:00
manuroe 37b270b627 Merge pull request #2506 from vector-im/aggregation_and_readreceipts
Read receipts: They are now counted at the MatrixKit level.
2019-06-19 11:25:00 +02:00
Szimszon 057b649978 Translated using Weblate (Hungarian)
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/hu/
2019-06-18 18:29:07 +00:00
Michael Albert 7f0303b0f3 Translated using Weblate (German)
Currently translated at 96.2% (684 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
2019-06-18 18:29:06 +00: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 d847fa6ac6 Merge pull request #2501 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-06-17 10:23:07 +02:00
Weblate 431cc92eab Merge branch 'origin/develop' into Weblate. 2019-06-17 08:21:53 +00:00
manuroe e621624f0d Merge pull request #2500 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-06-17 10:21:50 +02:00
Weblate 9664c1707b Merge branch 'origin/develop' into Weblate. 2019-06-17 08:21:40 +00:00
manuroe 02ccb849fe Merge pull request #2499 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-06-17 10:21:37 +02:00
Weblate a87d6a3ced Merge branch 'origin/develop' into Weblate. 2019-06-17 08:19:36 +00:00
Weblate 2bb2980a57 Merge branch 'origin/develop' into Weblate. 2019-06-17 08:19:36 +00: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
Weblate 5acf23cf07 Merge branch 'origin/develop' into Weblate. 2019-06-17 08:18:26 +00:00
Weblate 9ef2a94644 Merge branch 'origin/develop' into Weblate. 2019-06-17 08:18:26 +00:00