Commit Graph

6189 Commits

Author SHA1 Message Date
Weblate cf9b317efd Merge branch 'origin/develop' into Weblate. 2019-07-10 13:58:45 +00:00
manuroe dc44e021dd Merge pull request #2570 from vector-im/riot_2559
Edits history: Display original event
2019-07-10 15:58:41 +02:00
Weblate e8222e4e61 Merge branch 'origin/develop' into Weblate. 2019-07-10 13:58:12 +00:00
manuroe 3f1eff494e 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 7027996020 Room upgrade: Autojoin the upgraded room when the user taps on the tombstone banner
#2486
2019-07-10 14:58:47 +02:00
manuroe bd2d065d39 Edits history: Display original event
#2559
2019-07-10 09:53:29 +02:00
Weblate 6075d461b1 Merge branch 'origin/develop' into Weblate. 2019-07-09 12:20:07 +00:00
SBiOSoftWhare 64ce333bcd 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 9c3fef3602 Merge branch 'origin/develop' into Weblate. 2019-07-09 11:55:05 +00:00
SBiOSoftWhare 79e9989074 Merge pull request #2568 from vector-im/riot_2558
LABS: Remove reaction settings
2019-07-09 13:55:01 +02:00
SBiOSoftWhare 8adc6a3fce LABS: Remove reaction settings, reactions are enabled by default. 2019-07-09 13:51:14 +02:00
SBiOSoftWhare cdf6a5330f Bubble reaction view: Handle emoji label theme color. 2019-07-09 11:23:46 +02:00
SBiOSoftWhare 8c1df25bf2 Reactions: Limit Emoji string length in reaction bubble. 2019-07-09 11:02:52 +02:00
Weblate fcb45647ba Merge branch 'origin/develop' into Weblate. 2019-07-09 08:37:44 +00:00
SBiOSoftWhare dbf1c80f4b 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 da5172ddfc RoomVC: Fix reactions menu timestamp and display name overlap (Fix #2538). 2019-07-08 18:43:55 +02:00
SBiOSoftWhare 6d1a0cdb84 MXKRoomBubbleTableViewCell: Add a method to get surrounding bubble component frame. 2019-07-08 18:42:32 +02:00
SBiOSoftWhare 06c95d7408 RoomBubbleCellData: Add a method to get first visible component index. 2019-07-08 18:34:08 +02:00
Weblate 343aef1122 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:43:40 +00:00
manuroe a8f6467dce Merge pull request #2563 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-07-08 16:43:37 +02:00
Weblate f77fbf8b3a Merge branch 'origin/develop' into Weblate. 2019-07-08 14:43:19 +00:00
manuroe 45a662e780 Merge pull request #2562 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-07-08 16:43:14 +02:00
Weblate 246ddb3b07 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:42:53 +00:00
manuroe b0f611abb1 Merge pull request #2561 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-07-08 16:42:50 +02:00
IMIN 653e3a3766 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 bde5836645 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 47c146560f Merge branch 'origin/develop' into Weblate. 2019-07-08 14:26:47 +00:00
Weblate 9f4148f120 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:26:47 +00:00
manuroe 6012f3a136 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 e3c79f4926 Merge branch 'origin/develop' into Weblate. 2019-07-08 12:53:06 +00:00
Weblate 70b0a716a7 Merge branch 'origin/develop' into Weblate. 2019-07-08 12:53:06 +00:00
manuroe 74e860edf5 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 454082e3c6 Room upgrade: Use the server_name parameter when joining the new room
#2550
2019-07-08 11:46:10 +02:00
manuroe 6a1dccf988 Join Room: Support via parameters to better handle federation
#2547
2019-07-08 11:15:44 +02:00
SBiOSoftWhare 8d60f54bec Reactions: Fix unexpected padding after event selection (Fix #2548). 2019-07-05 20:56:37 +02:00
Weblate c3ed59fb3c Merge branch 'origin/develop' into Weblate. 2019-07-05 12:32:15 +00:00
Kévin C 3ac189c85e Translated using Weblate (French)
Currently translated at 100.0% (713 of 713 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2019-07-05 12:32:15 +00:00
Besnik Bleta efa8833fcb Translated using Weblate (Albanian)
Currently translated at 99.2% (707 of 713 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/
2019-07-05 12:32:14 +00:00
Weblate 200f502074 Merge branch 'origin/develop' into Weblate. 2019-07-05 12:32:13 +00:00
SBiOSoftWhare 53a01dd66a Merge pull request #2554 from vector-im/riot_2401_encrypted_message
Message editing: Handle encrypted message edits history
2019-07-05 14:32:09 +02:00
SBiOSoftWhare 0615e5f954 Message editing: Handle encrypted message edits history. 2019-07-05 14:14:46 +02:00
Weblate 92d4921e53 Merge branch 'origin/develop' into Weblate. 2019-07-05 08:27:45 +00:00
Kévin C a8fd5ad296 Translated using Weblate (French)
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/fr/
2019-07-05 08:27:45 +00:00
Weblate 4d6585f7b5 Merge branch 'origin/develop' into Weblate. 2019-07-05 08:27:44 +00:00
SBiOSoftWhare fbb6858331 Merge pull request #2551 from vector-im/riot_2401_UI
Message Editing: View edit history (UI)
2019-07-05 10:27:40 +02:00
SBiOSoftWhare 8371d8932f Message edits history: Handle message edits history display from RoomViewController. 2019-07-04 19:24:15 +02:00
SBiOSoftWhare 985a9d998b Message edits history: Update EditHistoryViewController to use UITableView to display messages and dates. 2019-07-04 19:22:29 +02:00
SBiOSoftWhare aea200baee Message edits history: Update view model to handle message history grouping by day. 2019-07-04 19:18:13 +02:00
SBiOSoftWhare 59c8ac8f82 Message edits history: Create edit history section struct. 2019-07-04 19:04:53 +02:00
SBiOSoftWhare daaf0e31d4 Message edits history: Create header view. 2019-07-04 19:03:39 +02:00