Commit graph

6191 commits

Author SHA1 Message Date
Weblate
97e2931bb4 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:44 +00:00
manuroe
3d671feb07
Merge pull request #2431 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-05-22 16:45:40 +02:00
Weblate
e3bc624135 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
Weblate
a2ce59961a Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
Weblate
b62f59fff4 Merge branch 'origin/develop' into Weblate. 2019-05-22 14:45:15 +00:00
manuroe
e594155fe5
Merge pull request #2426 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-05-22 16:45:11 +02:00
SBiOSoftWhare
60a9644a7e Update changes 2019-05-22 16:43:28 +02:00
SBiOSoftWhare
f271a08be2 EventFormatter: Use a 24 hour date format for time. 2019-05-22 16:39:11 +02:00
SBiOSoftWhare
6ce4a826be RoomVC: Show contextual menu on single tap. 2019-05-22 16:37:06 +02:00
SBiOSoftWhare
4bde8a435b Room contextual menu: Dismiss when swipe up or down. 2019-05-22 16:35:46 +02:00
SBiOSoftWhare
727f44295b Add convenient method on UITouch to determine if touch is inside a given view. 2019-05-22 16:35:26 +02:00
SBiOSoftWhare
6419fd6ecc 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
b234a09bf1 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
98c95fb849 Reactions menu: Patch RoomContextualMenuPresenter while we have a retain cycle 2019-05-21 02:12:14 +02:00
manuroe
a3239fda92 version++ 2019-05-21 01:39:36 +02:00
manuroe
77c6fd59fd
Merge pull request #2443 from vector-im/aggregations
Aggregations
2019-05-21 01:35:39 +02:00
SBiOSoftWhare
0e03e9a004
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
3117c4322c Theme: Remove non needed reaction colors 2019-05-21 01:09:42 +02:00
SBiOSoftWhare
321811283a BubbleReactionsView: Use a UICollectionViewFlowLayout subclass with left alignement. 2019-05-21 00:43:10 +02:00
SBiOSoftWhare
3a52e17439 Add a UICollectionViewFlowLayout with left alignement pod 2019-05-21 00:42:20 +02:00
SBiOSoftWhare
3704c3325d Update changes 2019-05-20 22:11:15 +02:00
SBiOSoftWhare
d2cfe4891a RoomDataSource: Handle reactions display on bubble cell. 2019-05-20 21:59:18 +02:00
SBiOSoftWhare
75d7b26bfc RoomBubbleCellData: Improve reactions view vertical space calculation 2019-05-20 21:57:29 +02:00
SBiOSoftWhare
6861e80a98 Update pbxproj 2019-05-20 21:54:32 +02:00
SBiOSoftWhare
4ababf957e Create BubbleReactionsView 2019-05-20 21:54:23 +02:00
SBiOSoftWhare
2caf4e326f Create BubbleReactionsViewModel 2019-05-20 21:52:07 +02:00
SBiOSoftWhare
e5d8910a92 Create BubbleReactionViewCell 2019-05-20 21:51:24 +02:00
SBiOSoftWhare
2d118853a7 Create AutosizedCollectionView a convenient UICollectionView that makes dynamic sizing easier when using Auto Layout 2019-05-20 21:49:57 +02:00
SBiOSoftWhare
5b9ffd5b0f Theme: Add reaction button colors and update header background color. 2019-05-20 21:49:27 +02:00
manuroe
2f517a8c15
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
aadac45de6 Reactions menu: Do not notify delegate if reaction requires an unreaction
Fix Steve's remark
2019-05-20 20:41:05 +02:00
manuroe
86808b16e2 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
d72f2eb762 Reactions: Remove the send reaction hack as it is now done in the SDK 2019-05-20 19:40:52 +02:00
manuroe
f105fadc48
Merge branch 'develop' into aggregations 2019-05-20 17:57:50 +02:00
manuroe
24cbac4596
Merge pull request #2442 from vector-im/labs_reactions
Reactions: Add a labs setting
2019-05-20 17:52:29 +02:00
manuroe
6866fe8e2c Reactions: Add a labs setting
#2441
2019-05-20 17:31:25 +02:00
manuroe
d17e5c5e15
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
2b7b2c5a6c 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
4a7677a667 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
0973d3886b Reactions: Reactions menu: highlight reactiosn only our user made 2019-05-20 15:00:47 +02:00
manuroe
d5e3ff07a7
Merge pull request #2433 from vector-im/unreaction
Reactions: Reactions menu: plug unreact
2019-05-20 09:48:07 +02:00
David Cordero
80eacd3b58 Update changelog 2019-05-19 17:23:59 +02:00
David Cordero
8dfa395647 Remove redundant code 2019-05-19 17:19:23 +02:00
David Cordero
10c1624f7e Fix text color for user display name and device id labels in dark theme 2019-05-19 17:14:41 +02:00
David Cordero
0583eb182b Update build instructions to make use of Bundler 2019-05-19 16:41:09 +02:00
Karol Kosek
44a54b5f42 Translated using Weblate (Polish)
Currently translated at 73.3% (453 of 618 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/pl/
2019-05-19 08:15:57 +00:00
manuroe
80d817c98e Reactions: Reactions menu: plug unreact 2019-05-17 17:39:31 +02:00
manuroe
443b886a34
Merge pull request #2430 from vector-im/reactions_in_context_menu
RoomVC: ContextualMenu: Plug reactions menu
2019-05-17 13:33:57 +02:00
manuroe
2c3b0f1b2e
Merge pull request #2429 from vector-im/reactions_placeholder
Reactions: Add placeholder for reactions list under message
2019-05-17 13:08:22 +02:00
manuroe
20946807d5 pbxproj: Fix ReactionsMenu group after automatic merge 2019-05-17 12:21:33 +02:00