Commit Graph

7052 Commits

Author SHA1 Message Date
SBiOSoftWhare 708f9bb32c Update changes 2019-05-23 16:49:13 +02:00
SBiOSoftWhare de427f3f05 Registration: Fix infinite loop when register with email and validate from mobile. 2019-05-23 16:46:00 +02:00
Weblate 86545c309f Merge branch 'origin/develop' into Weblate. 2019-05-22 21:09:43 +00:00
Weblate 22c0d2a46c Merge branch 'origin/develop' into Weblate. 2019-05-22 21:09:43 +00:00
Weblate 22779535ba Merge branch 'origin/develop' into Weblate. 2019-05-22 21:09:43 +00:00
SBiOSoftWhare f64219bd4e Merge pull request #2465 from vector-im/riot_2447
Reactions Menu: Fix position
2019-05-22 23:09:39 +02:00
David Cordero 21ff398bac Merge branch 'develop' into verification_id_labels_fix 2019-05-22 19:10:35 +02:00
SBiOSoftWhare 816df3c331 Update changes 2019-05-22 18:49:35 +02:00
SBiOSoftWhare 2c5da6c457 Contextual menu: Improve reactions menu position. 2019-05-22 18:48:50 +02:00
SBiOSoftWhare 96a59ec048 MXKRoomBubbleTableViewCell: Add convenient method to calculate a bubble component frame in table view. 2019-05-22 18:46:22 +02:00
Weblate 15e6f6be35 Merge branch 'origin/develop' into Weblate. 2019-05-22 15:41:22 +00:00
Weblate 0ce781ab18 Merge branch 'origin/develop' into Weblate. 2019-05-22 15:41:22 +00:00
Weblate 9c804c41f3 Merge branch 'origin/develop' into Weblate. 2019-05-22 15:41:22 +00:00
SBiOSoftWhare 5c08e17461 Merge pull request #2464 from vector-im/riot_2446
BF: Menu actions: Display message time
2019-05-22 17:41:18 +02:00
Weblate 90ce67cf9a Merge branch 'origin/develop' into Weblate. 2019-05-22 15:31:34 +00:00
Weblate be73ed1e73 Merge branch 'origin/develop' into Weblate. 2019-05-22 15:31:34 +00:00
Weblate 3ba3bf340b Merge branch 'origin/develop' into Weblate. 2019-05-22 15:31:34 +00:00
SBiOSoftWhare 3403b65f32 Merge pull request #2463 from vector-im/riot_2446
Menu actions: Display message time
2019-05-22 17:31:30 +02:00
SBiOSoftWhare 968231b0e5 Update Riot/Categories/MXKRoomBubbleTableViewCell+Riot.m
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2019-05-22 17:28:08 +02:00
SBiOSoftWhare d598b14af6 Update Riot/Modules/Room/CellData/RoomBubbleCellData.h
Co-Authored-By: manuroe <manuroe@users.noreply.github.com>
2019-05-22 17:27:29 +02:00
SBiOSoftWhare bfdbf10623 RoomVC: Display message time when contextual menu is shown. 2019-05-22 16:54:51 +02:00
Weblate f9c61cc2bf Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
Weblate cabdc3291f Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
Weblate 63c9efd211 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
manuroe 4d01c98536 Merge pull request #2425 from vector-im/giomfo/third_party_licenses
Update third-party licences
2019-05-22 16:47:53 +02:00
Weblate 309276f06e Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
Weblate c78d0f2db8 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
Weblate 6584ca9612 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
manuroe 38deead991 Merge pull request #2432 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-05-22 16:46:16 +02:00
Weblate 956df1b4ad Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:45 +00:00
Weblate 6d4e8ede12 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:45 +00:00
Weblate 05d5e3ca47 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:44 +00:00
manuroe 23f3f41e06 Merge pull request #2431 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-05-22 16:45:40 +02:00
Weblate 692099993e Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
Weblate 9ced8b7d0d Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
Weblate 0b603bee96 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
manuroe 5fc73225c0 Merge pull request #2426 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-05-22 16:45:11 +02:00
SBiOSoftWhare 2208cf9dba Update changes 2019-05-22 16:43:28 +02:00
SBiOSoftWhare 4f874e4ad2 EventFormatter: Use a 24 hour date format for time. 2019-05-22 16:39:11 +02:00
SBiOSoftWhare 75b2c7a4be RoomVC: Show contextual menu on single tap. 2019-05-22 16:37:06 +02:00
SBiOSoftWhare bb11485297 Room contextual menu: Dismiss when swipe up or down. 2019-05-22 16:35:46 +02:00
SBiOSoftWhare 2fb2a2ab9c Add convenient method on UITouch to determine if touch is inside a given view. 2019-05-22 16:35:26 +02:00
SBiOSoftWhare c8eaa0d6ca MXRoomBubbleTableViewCell: Display the timestamp of the selected component on the left when there is enough space. 2019-05-22 16:22:26 +02:00
SBiOSoftWhare f2f7716f5c RoomBubbleCellData: Add a property to display the timestamp of the selected component on the left when there is enough space. 2019-05-22 16:17:55 +02:00
manuroe a749211223 Reactions menu: Patch RoomContextualMenuPresenter while we have a retain cycle 2019-05-21 02:12:14 +02:00
manuroe 2ac4d8ac2b version++ 2019-05-21 01:39:36 +02:00
manuroe b141ec930d Merge pull request #2443 from vector-im/aggregations
Aggregations
2019-05-21 01:35:39 +02:00
SBiOSoftWhare 249b01f9bf Merge pull request #2445 from vector-im/riot_2396
Reactions: Display existing reactions below the message
2019-05-21 01:33:38 +02:00
SBiOSoftWhare 85309d866c Theme: Remove non needed reaction colors 2019-05-21 01:09:42 +02:00
SBiOSoftWhare bac5ac3023 BubbleReactionsView: Use a UICollectionViewFlowLayout subclass with left alignement. 2019-05-21 00:43:10 +02:00