Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 15:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
6075 commits 46 branches 261 tags 144 MiB
Commit graph

6075 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
c811a1132b Merge branch 'origin/develop' into Weblate. 2019-06-19 13:31:57 +00:00
manuroe
8010133d6c
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
3f55981cc3
Merge branch 'develop' into matomo-v6 2019-06-19 15:31:43 +02:00
Weblate
dea9c59930 Merge branch 'origin/develop' into Weblate. 2019-06-19 12:29:48 +00:00
SBiOSoftWhare
e53903214f
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
4e6c1c36af RoomDataSource: Fix bubble cell data additional content height update. 2019-06-19 14:22:38 +02:00
Weblate
f743f90973 Merge branch 'origin/develop' into Weblate. 2019-06-19 09:45:48 +00:00
SBiOSoftWhare
014bb35f52
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
2b28f25883 Merge develop into fix_riot_attachmentview_reactions 2019-06-19 11:44:42 +02:00
Weblate
cdc58de84d Merge branch 'origin/develop' into Weblate. 2019-06-19 09:25:05 +00:00
manuroe
e0dc912a0b
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
95b55aca3f 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
f2149b57c3 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
8e50ff08c1 Fix bubble cell height for cells with attachment view and reactions. 2019-06-18 18:36:22 +02:00
SBiOSoftWhare
3295b649c9 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
f33a0e9b7a MXKRoomBubbleTableViewCell: Add convenient method to compute bubble cell height for cell with attachment view. 2019-06-18 18:29:12 +02:00
SBiOSoftWhare
0809c8af55 RoomBubbleCellData: Fix bubble component position when display last message timestamp. 2019-06-18 17:42:00 +02:00
SBiOSoftWhare
c8bbf9fd00 MXKRoomBubbleTableViewCell: Improve timestamp label positioning. 2019-06-18 17:41:09 +02:00
manuroe
872976f798 Read receipts: Manage live update in the kit too 2019-06-18 14:06:23 +02:00
manuroe
ba6d5939a3 Read receipts: They are now counted at the MatrixKit level 2019-06-18 12:28:59 +02:00
SBiOSoftWhare
8aea88139e
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
854dc1633d
Merge pull request #2501 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2019-06-17 10:23:07 +02:00
Weblate
68a9c56725 Merge branch 'origin/develop' into Weblate. 2019-06-17 08:21:53 +00:00
manuroe
4e9ccaa875
Merge pull request #2500 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2019-06-17 10:21:50 +02:00
Weblate
48f7891435 Merge branch 'origin/develop' into Weblate. 2019-06-17 08:21:40 +00:00
manuroe
703afeac20
Merge pull request #2499 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Update from Weblate
 2019-06-17 10:21:37 +02:00
Weblate
fb92e2d7cb Merge branch 'origin/develop' into Weblate. 2019-06-17 08:19:36 +00:00
Weblate
1a20efbafc Merge branch 'origin/develop' into Weblate. 2019-06-17 08:19:36 +00:00
manuroe
14c824e135
Merge pull request #2498 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Update from Weblate
 2019-06-17 10:19:32 +02:00
Weblate
7c2364baed Merge branch 'origin/develop' into Weblate. 2019-06-17 08:18:26 +00:00
Weblate
88499e8210 Merge branch 'origin/develop' into Weblate. 2019-06-17 08:18:26 +00:00
manuroe
def979b104
Merge pull request #2497 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Update from Weblate
 2019-06-17 10:18:22 +02:00
Weblate
f24d777e78 Merge branch 'origin/develop' into Weblate. 2019-06-17 08:17:50 +00:00
Weblate
73f0f6278b Merge branch 'origin/develop' into Weblate. 2019-06-17 08:17:50 +00:00
manuroe
d6e769c01f
Merge pull request #2496 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Update from Weblate
 2019-06-17 10:17:46 +02:00
Weblate
2c96616f57 Merge branch 'origin/develop' into Weblate. 2019-06-14 14:45:31 +00:00
Nathan Follens
c662952b32 Translated using Weblate (Dutch) 
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/nl/
 2019-06-14 14:45:30 +00:00
Slavi Pantaleev
9247becabe Translated using Weblate (Bulgarian) 
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/bg/
 2019-06-14 14:45:30 +00:00
Weblate
b54360c7b9 Merge branch 'origin/develop' into Weblate. 2019-06-14 14:45:29 +00:00
Weblate
ca457b3fde Merge branch 'origin/develop' into Weblate. 2019-06-14 14:45:29 +00:00
Besnik Bleta
a902979376 Translated using Weblate (Albanian) 
Currently translated at 99.3% (706 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
 2019-06-14 14:45:29 +00:00
manuroe
9813661ece
Merge pull request #2494 from vector-im/aggreagation_polishing 
Reaction Menu: UX polish
 2019-06-14 16:45:25 +02:00
manuroe
82f52378dd Menu actions: Display the keyboard once the users tap on reply or edit 
This also fixes the local echo issues we had when this screen stayed displayed
 2019-06-14 16:29:25 +02:00
manuroe
6a3cfc0172 Reactions menu: leave the menu once the user tapped a reaction 2019-06-14 16:15:27 +02:00
Weblate
77e716c41b Merge branch 'origin/develop' into Weblate. 2019-06-13 15:50:36 +00:00
Weblate
1de9c0c59b Merge branch 'origin/develop' into Weblate. 2019-06-13 15:50:36 +00:00
Weblate
de109ae2b9 Merge branch 'origin/develop' into Weblate. 2019-06-13 15:50:36 +00:00
manuroe
5836ebb97e
Merge pull request #2490 from vector-im/reaction_echo 
Local echo for reactions
 2019-06-13 17:50:31 +02:00
Weblate
60a47bc9de Merge branch 'origin/develop' into Weblate. 2019-06-13 15:41:33 +00:00
serjor
df96dfa5ac Translated using Weblate (Spanish) 
Currently translated at 71.3% (507 of 711 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/es/
 2019-06-13 15:41:33 +00:00