Commit graph

6191 commits

Author SHA1 Message Date
Weblate
0c729991b8 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:43:40 +00:00
manuroe
b3634534a3
Merge pull request #2563 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-07-08 16:43:37 +02:00
Weblate
694357dbd5 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:43:19 +00:00
manuroe
95ba6f915d
Merge pull request #2562 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2019-07-08 16:43:14 +02:00
Weblate
a51d5b4f2e Merge branch 'origin/develop' into Weblate. 2019-07-08 14:42:53 +00:00
manuroe
cdffc9bb1b
Merge pull request #2561 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-07-08 16:42:50 +02:00
IMIN
aa0818afe7 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
bb6ddd3fb2 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
39695000d7 Merge branch 'origin/develop' into Weblate. 2019-07-08 14:26:47 +00:00
Weblate
b152d6662e Merge branch 'origin/develop' into Weblate. 2019-07-08 14:26:47 +00:00
manuroe
3a80274bc4
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
d8687367fa Merge branch 'origin/develop' into Weblate. 2019-07-08 12:53:06 +00:00
Weblate
7373fd8234 Merge branch 'origin/develop' into Weblate. 2019-07-08 12:53:06 +00:00
manuroe
138d03d5b2
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
0d5eac4cf6 Room upgrade: Use the server_name parameter when joining the new room
#2550
2019-07-08 11:46:10 +02:00
manuroe
87b1e15f36 Join Room: Support via parameters to better handle federation
#2547
2019-07-08 11:15:44 +02:00
SBiOSoftWhare
4f6f5a771f Reactions: Fix unexpected padding after event selection (Fix #2548). 2019-07-05 20:56:37 +02:00
Weblate
b7a4b61158 Merge branch 'origin/develop' into Weblate. 2019-07-05 12:32:15 +00:00
Kévin C
201a87ff11 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
13d8d66024 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
0ddc0286fa Merge branch 'origin/develop' into Weblate. 2019-07-05 12:32:13 +00:00
SBiOSoftWhare
11d2546ba0
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
12896ffc36 Message editing: Handle encrypted message edits history. 2019-07-05 14:14:46 +02:00
Weblate
e384ae1b8e Merge branch 'origin/develop' into Weblate. 2019-07-05 08:27:45 +00:00
Kévin C
e5558c980c 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
1464a70fb7 Merge branch 'origin/develop' into Weblate. 2019-07-05 08:27:44 +00:00
SBiOSoftWhare
c896d5b919
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
3a8122bdb1 Message edits history: Handle message edits history display from RoomViewController. 2019-07-04 19:24:15 +02:00
SBiOSoftWhare
11012933ae Message edits history: Update EditHistoryViewController to use UITableView to display messages and dates. 2019-07-04 19:22:29 +02:00
SBiOSoftWhare
8ae74d507d Message edits history: Update view model to handle message history grouping by day. 2019-07-04 19:18:13 +02:00
SBiOSoftWhare
8fe0213c44 Message edits history: Create edit history section struct. 2019-07-04 19:04:53 +02:00
SBiOSoftWhare
884f47b33e Message edits history: Create header view. 2019-07-04 19:03:39 +02:00
SBiOSoftWhare
a943361051 Message edits history: Create edit message cell. 2019-07-04 19:02:54 +02:00
SBiOSoftWhare
393340a787 Message edits history: Add strings. 2019-07-04 19:02:17 +02:00
Weblate
3f369999d6 Merge branch 'origin/develop' into Weblate. 2019-07-04 12:09:27 +00:00
manuroe
ab8dceff15
Merge pull request #2549 from vector-im/riot_2510
Reactions: Show at most 8 reactions
2019-07-04 14:09:24 +02:00
manuroe
2a22e4c0a9 Reactions: Show at most 8 reactions
#2510
2019-07-04 11:38:48 +02:00
Weblate
b06a8f8db8 Merge branch 'origin/develop' into Weblate. 2019-07-03 10:18:21 +00:00
SBiOSoftWhare
d62985e921
Merge pull request #2544 from vector-im/riot_2492
Message Editing: Handle reply edition
2019-07-03 12:18:17 +02:00
SBiOSoftWhare
7396980e33 Update changes 2019-07-03 11:20:43 +02:00
SBiOSoftWhare
78351941e4 Message editing: Handle reply edition. 2019-07-03 11:13:53 +02:00
Weblate
cf6e0bca7c Merge branch 'origin/develop' into Weblate. 2019-07-03 08:53:10 +00:00
manuroe
4b63269ce3
Merge pull request #2543 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2019-07-03 10:53:07 +02:00
Weblate
a4235e2a00 Merge branch 'origin/develop' into Weblate. 2019-07-03 08:52:44 +00:00
manuroe
309d985256
Merge pull request #2542 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2019-07-03 10:52:40 +02:00
KenjiKenjiIcantLetYouGo
6bdcd823c7 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot iOS/Riot iOS (Push)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-push/pt_BR/
2019-07-02 14:50:09 +00:00
Weblate
2eebc76d28 Merge branch 'origin/develop' into Weblate. 2019-07-02 12:40:15 +00:00
manuroe
bf7278ec4f
Merge pull request #2537 from vector-im/riot_2401
Edits history: view model
2019-07-02 14:40:11 +02:00
manuroe
63aca2b130 Edits history: Manage date 2019-07-01 14:39:39 +02:00
manuroe
4c7a652fd9 EventFormatter: add showEditionMention setting 2019-07-01 12:42:42 +02:00