Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 16:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity
5871 commits 46 branches 261 tags 144 MiB
Commit graph

5871 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
e3bc624135 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
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
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
manuroe
b1ebf79e50 RoomVC: ContextualMenu: Plug reactions menu 2019-05-17 12:17:59 +02:00
manuroe
00bebecc29 Reactions: Add placeholder for reactions list under message 2019-05-17 01:28:45 +02:00
manuroe
3249751dc2 RoomBubbleCellData: Do readReceiptVerticalWhitespace thing in one place 2019-05-16 18:27:48 +02:00
manuroe
0ed0d8cef5 Reactions: Follow small SDK change 2019-05-16 17:44:07 +02:00
manuroe
5abd0a4d8c
Merge pull request #2423 from vector-im/riot_2393 
Reactions: Add primary reactions as message actions
 2019-05-16 16:08:18 +02:00
manuroe
0bc5c28390 Reactions: Fix Steve's comments 2019-05-16 16:07:07 +02:00
David Baker
81a274be30 Translated using Weblate (Romanian) 
Currently translated at 1.5% (9 of 618 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ro/
 2019-05-16 13:48:08 +00:00
David Baker
37518e7529 Translated using Weblate (Romanian) 
Currently translated at 1.5% (9 of 618 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ro/
 2019-05-16 13:46:12 +00:00
David Baker
e728719b1f Translated using Weblate (Romanian) 
Currently translated at 1.9% (12 of 618 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ro/
 2019-05-16 13:38:51 +00:00
Maros Dumitru
dd59187d4e Translated using Weblate (Romanian) 
Currently translated at 1.9% (12 of 618 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ro/
 2019-05-16 13:38:51 +00:00
manuroe
8d7f535581
Merge branch 'aggregations' into riot_2393 2019-05-16 14:51:14 +02:00
manuroe
ec758a84b7 Reactions: we cannot like & dislike at the same time 2019-05-16 14:45:42 +02:00
SBiOSoftWhare
5c12f86fa8
Merge pull request #2424 from vector-im/riot_2394 
New message actions
 2019-05-16 14:08:18 +02:00
manuroe
13beb50abb Reactions: notify coordinator for every reaction request steps 
so that it can leave the view when it wants
 2019-05-16 08:07:52 +02:00
manuroe
65ec1e9988 Reactions: Plug button actions 2019-05-16 07:47:23 +02:00
manuroe
7cd5e79bc6 Reactions: Customise primary reactions buttons 2019-05-15 23:35:09 +02:00