Commit Graph

6206 Commits

Author SHA1 Message Date
Weblate 21d9b5f1d3 Merge branch 'origin/develop' into Weblate. 2019-07-15 08:28:19 +00:00
manuroe 634486be93 Merge pull request #2574 from vector-im/filterCryptoLogs
Tools: Create filterCryptoLogs.sh to filter logs related to e2ee from Riot logs
2019-07-15 10:28:15 +02:00
manuroe 794d387629 Tools: Create filterCryptoLogs.sh to filter logs related to e2ee from Riot logs 2019-07-15 10:11:27 +02:00
Weblate 95bf16c1a2 Merge branch 'origin/develop' into Weblate. 2019-07-12 13:32:22 +00:00
manuroe ac37b36279 Merge pull request #2572 from vector-im/share_extensions_files
Share extension: Enable any file upload (max 5).
2019-07-12 15:32:19 +02:00
Weblate 5929122727 Merge branch 'origin/develop' into Weblate. 2019-07-12 11:18:46 +00:00
manuroe 2983328993 Edits: "(Edited)" -> "(edited)" 2019-07-12 13:18:39 +02:00
manuroe d96d402dee Share extension: Enable any file upload (max 5). 2019-07-12 12:58:56 +02:00
Weblate b927050dfc Merge branch 'origin/develop' into Weblate. 2019-07-12 07:51:30 +00:00
manuroe 87e1e0ee38 Merge pull request #2571 from vector-im/riot_2019
Ability to send files via the iOS11+ file manager
2019-07-12 09:51:26 +02:00
manuroe 3dc6901f1a Update Riot/Modules/Room/DataSources/RoomDataSource.h 2019-07-12 09:51:12 +02:00
SBiOSoftWhare 1102c79b44 Update changes 2019-07-11 19:44:54 +02:00
SBiOSoftWhare cd67ca9424 Update strings 2019-07-11 19:33:01 +02:00
SBiOSoftWhare 8808ade76f Podfile: Use SwiftUTI fork and force Swift version to 5.0. 2019-07-11 19:32:53 +02:00
SBiOSoftWhare 4a4e647360 RoomVC: Handle external file upload. 2019-07-11 19:17:55 +02:00
SBiOSoftWhare 41ddf88fcb MXKRoomDataSource: Handle video thumbnail generation with MXKVideoThumbnailGenerator. 2019-07-11 19:07:45 +02:00
SBiOSoftWhare 843ce9024f RoomInputToolbarView: Add file upload action. 2019-07-11 19:03:32 +02:00
Weblate ab6d5e2c62 Merge branch 'origin/develop' into Weblate. 2019-07-10 13:58:45 +00:00
manuroe cee3ee7782 Merge pull request #2570 from vector-im/riot_2559
Edits history: Display original event
2019-07-10 15:58:41 +02:00
Weblate cf03c0f143 Merge branch 'origin/develop' into Weblate. 2019-07-10 13:58:12 +00:00
manuroe 124e4b0ebb Merge pull request #2569 from vector-im/riot_2486
Room upgrade: Autojoin the upgraded room when the user taps on the tombstone banner
2019-07-10 15:58:08 +02:00
manuroe 9b064d0519 Room upgrade: Autojoin the upgraded room when the user taps on the tombstone banner
#2486
2019-07-10 14:58:47 +02:00
manuroe b683afce03 Edits history: Display original event
#2559
2019-07-10 09:53:29 +02:00
Weblate 2ca1d8a29e Merge branch 'origin/develop' into Weblate. 2019-07-09 12:20:07 +00:00
SBiOSoftWhare de7b708d3b Merge pull request #2567 from vector-im/riot_2553
Reactions: Reinstate the ability to react with non-unicode keys
2019-07-09 14:20:03 +02:00
Weblate 60149b0c07 Merge branch 'origin/develop' into Weblate. 2019-07-09 11:55:05 +00:00
SBiOSoftWhare d8f627ccaf Merge pull request #2568 from vector-im/riot_2558
LABS: Remove reaction settings
2019-07-09 13:55:01 +02:00
SBiOSoftWhare 411f963033 LABS: Remove reaction settings, reactions are enabled by default. 2019-07-09 13:51:14 +02:00
SBiOSoftWhare ce830f5564 Bubble reaction view: Handle emoji label theme color. 2019-07-09 11:23:46 +02:00
SBiOSoftWhare c1d50ddc27 Reactions: Limit Emoji string length in reaction bubble. 2019-07-09 11:02:52 +02:00
Weblate dae0d7f60b Merge branch 'origin/develop' into Weblate. 2019-07-09 08:37:43 +00:00
SBiOSoftWhare bff7c7ab65 Merge pull request #2564 from vector-im/riot_2538
BF: Quick reactions menu hide time and user display name
2019-07-09 10:37:40 +02:00
SBiOSoftWhare 120284e484 RoomVC: Fix reactions menu timestamp and display name overlap (Fix #2538). 2019-07-08 18:43:55 +02:00
SBiOSoftWhare f4c30ed00c MXKRoomBubbleTableViewCell: Add a method to get surrounding bubble component frame. 2019-07-08 18:42:32 +02:00
SBiOSoftWhare 086b6ab2b1 RoomBubbleCellData: Add a method to get first visible component index. 2019-07-08 18:34:08 +02:00
Weblate 494c7fcfbe Merge branch 'origin/develop' into Weblate. 2019-07-08 14:43:40 +00:00
manuroe e4f2e7f40e Merge pull request #2563 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-07-08 16:43:37 +02:00
Weblate 1f64d13d50 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:43:19 +00:00
manuroe 8b2dcf5ba5 Merge pull request #2562 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-07-08 16:43:14 +02:00
Weblate 6699758fb4 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:42:53 +00:00
manuroe 474ef3254d Merge pull request #2561 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-07-08 16:42:50 +02:00
IMIN 103c308fb2 Translated using Weblate (Korean)
Currently translated at 60.7% (17 of 28 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/ko/
2019-07-08 14:40:44 +00:00
IMIN fb3b0e7f58 Translated using Weblate (Korean)
Currently translated at 100.0% (5 of 5 strings)

Translation: Riot iOS/Riot iOS (Dialogs)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/ko/
2019-07-08 14:40:43 +00:00
Weblate 58fb0ba49e Merge branch 'origin/develop' into Weblate. 2019-07-08 14:26:47 +00:00
Weblate d595e43034 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:26:47 +00:00
manuroe 6ea6824350 Merge pull request #2555 from vector-im/riot_2548
BF: Reactions: Unexpected padding after event selection
2019-07-08 16:26:43 +02:00
Weblate ee4abb9b36 Merge branch 'origin/develop' into Weblate. 2019-07-08 12:53:06 +00:00
Weblate b019753f6c Merge branch 'origin/develop' into Weblate. 2019-07-08 12:53:06 +00:00
manuroe 812d7bc026 Merge pull request #2557 from vector-im/riot_2547
Join Room: Support via parameters to better handle federation
2019-07-08 14:53:02 +02:00
manuroe 95d5dd46a8 Room upgrade: Use the server_name parameter when joining the new room
#2550
2019-07-08 11:46:10 +02:00