Commit Graph

6029 Commits

Author SHA1 Message Date
Weblate 1dec3d3020 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
Weblate a42ba6125e Merge branch 'origin/develop' into Weblate. 2019-05-22 14:47:56 +00:00
manuroe 3f1a4b2a76 Merge pull request #2425 from vector-im/giomfo/third_party_licenses
Update third-party licences
2019-05-22 16:47:53 +02:00
Weblate 5017f2c8b9 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
Weblate d064f24fab Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
Weblate 82df8c2474 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:46:20 +00:00
manuroe 34b48ddc8f Merge pull request #2432 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-05-22 16:46:16 +02:00
Weblate 63864396d7 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:45 +00:00
Weblate bff4c8b851 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:45 +00:00
Weblate c96184cc0f Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:44 +00:00
manuroe 048b8a61bd Merge pull request #2431 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-05-22 16:45:40 +02:00
Weblate 818ceb8977 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
Weblate ce477fed4b Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
Weblate 5744b32d5f Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
manuroe 000da11fe4 Merge pull request #2426 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-05-22 16:45:11 +02:00
SBiOSoftWhare 3da8d42062 Update changes 2019-05-22 16:43:28 +02:00
SBiOSoftWhare ef61ac0702 EventFormatter: Use a 24 hour date format for time. 2019-05-22 16:39:11 +02:00
SBiOSoftWhare ba0e6561de RoomVC: Show contextual menu on single tap. 2019-05-22 16:37:06 +02:00
SBiOSoftWhare d2cd1a4d13 Room contextual menu: Dismiss when swipe up or down. 2019-05-22 16:35:46 +02:00
SBiOSoftWhare b32fda5cb9 Add convenient method on UITouch to determine if touch is inside a given view. 2019-05-22 16:35:26 +02:00
SBiOSoftWhare f76dd3a5bb 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 de2edce40f 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 cf98e512b6 Reactions menu: Patch RoomContextualMenuPresenter while we have a retain cycle 2019-05-21 02:12:14 +02:00
manuroe ffd2e369cd version++ 2019-05-21 01:39:36 +02:00
manuroe f9d9400f52 Merge pull request #2443 from vector-im/aggregations
Aggregations
2019-05-21 01:35:39 +02:00
SBiOSoftWhare 521f2a9404 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 d78a755201 Theme: Remove non needed reaction colors 2019-05-21 01:09:42 +02:00
SBiOSoftWhare fa9fa30920 BubbleReactionsView: Use a UICollectionViewFlowLayout subclass with left alignement. 2019-05-21 00:43:10 +02:00
SBiOSoftWhare b53928a80a Add a UICollectionViewFlowLayout with left alignement pod 2019-05-21 00:42:20 +02:00
SBiOSoftWhare cd13cf9f19 Update changes 2019-05-20 22:11:15 +02:00
SBiOSoftWhare 7e1cd2613c RoomDataSource: Handle reactions display on bubble cell. 2019-05-20 21:59:18 +02:00
SBiOSoftWhare 859dfcaf7a RoomBubbleCellData: Improve reactions view vertical space calculation 2019-05-20 21:57:29 +02:00
SBiOSoftWhare 1aaf9839fb Update pbxproj 2019-05-20 21:54:32 +02:00
SBiOSoftWhare ca0896fb1e Create BubbleReactionsView 2019-05-20 21:54:23 +02:00
SBiOSoftWhare ab35ba7998 Create BubbleReactionsViewModel 2019-05-20 21:52:07 +02:00
SBiOSoftWhare 7f1447e9dc Create BubbleReactionViewCell 2019-05-20 21:51:24 +02:00
SBiOSoftWhare c1cb799582 Create AutosizedCollectionView a convenient UICollectionView that makes dynamic sizing easier when using Auto Layout 2019-05-20 21:49:57 +02:00
SBiOSoftWhare fff83b69d6 Theme: Add reaction button colors and update header background color. 2019-05-20 21:49:27 +02:00
manuroe 08077d2faf Merge pull request #2444 from vector-im/move_reaction_hack_to_sdk
Reactions menu: Do not notify delegate if reaction requires an unreaction
2019-05-20 20:43:32 +02:00
manuroe a4b8192473 Reactions menu: Do not notify delegate if reaction requires an unreaction
Fix Steve's remark
2019-05-20 20:41:05 +02:00
manuroe 7bdab43e16 Reactions menu: Do not notify delegate if reaction requires an unreaction
This avoids to call the delegate twice.
Note: In a short future, we will no more have those 3 state buttons
2019-05-20 19:48:29 +02:00
manuroe 6a27075d2b Reactions: Remove the send reaction hack as it is now done in the SDK 2019-05-20 19:40:52 +02:00
manuroe 3ceec59779 Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
manuroe 042a9ea5fd Merge pull request #2442 from vector-im/labs_reactions
Reactions: Add a labs setting
2019-05-20 17:52:29 +02:00
manuroe 824db1fab3 Reactions: Add a labs setting
#2441
2019-05-20 17:31:25 +02:00
manuroe d55b641cdb Merge pull request #2439 from vector-im/reaction_hack
Hack reaction sending like riot-web and riot-android
2019-05-20 17:03:16 +02:00
manuroe 88d6859bdc Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API
Fix Steve's comment
2019-05-20 17:00:57 +02:00
manuroe 06d18e122b Reactions: Use the hack like on riot-android and riot-web if the server has not yet the aggregations API 2019-05-20 16:04:54 +02:00
manuroe da033f69ab Reactions: Reactions menu: highlight reactiosn only our user made 2019-05-20 15:00:47 +02:00
manuroe 776ac8160e Merge pull request #2433 from vector-im/unreaction
Reactions: Reactions menu: plug unreact
2019-05-20 09:48:07 +02:00