Commit graph

6377 commits

Author SHA1 Message Date
manuroe
f63d2e1398
Merge pull request #2531 from vector-im/riot_2449
Edits: Support edits in e2e rooms
2019-06-26 12:14:25 +02:00
manuroe
3db1cffe28 Edits: Support edits in e2e rooms 2019-06-25 18:32:34 +02:00
Weblate
d66a2cb66d Merge branch 'origin/develop' into Weblate. 2019-06-25 14:29:38 +00:00
SBiOSoftWhare
cc671d200e
Merge pull request #2529 from vector-im/riot_2515
BF: Reactions: Frames bottoms are clipped
2019-06-25 16:29:34 +02:00
SBiOSoftWhare
066927c4d4 Bubble cell reactions: Fix BubbleReactionViewCell clipped at bottom in selected state (Fix #2515). 2019-06-25 16:21:48 +02:00
Weblate
270122425d Merge branch 'origin/develop' into Weblate. 2019-06-25 14:09:02 +00:00
Szimszon
af2a6a9f87 Translated using Weblate (Hungarian)
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/hu/
2019-06-25 14:09:02 +00:00
Kévin C
3bd8e13a63 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-06-25 14:09:01 +00:00
Nathan Follens
fcb26d65f5 Translated using Weblate (Dutch)
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/nl/
2019-06-25 14:09:01 +00:00
Osoitz
46626a62fc Translated using Weblate (Basque)
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/eu/
2019-06-25 14:09:00 +00:00
Besnik Bleta
ab02eeec87 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-06-25 14:09:00 +00:00
SBiOSoftWhare
9c830d04c6
Merge pull request #2528 from vector-im/riot_2459
Reactions: Update quick reactions
2019-06-25 16:08:55 +02:00
SBiOSoftWhare
bdae76225c Update changes 2019-06-25 14:04:54 +02:00
SBiOSoftWhare
8c304d521e Update pbxproj 2019-06-25 14:00:20 +02:00
SBiOSoftWhare
cd57ed1f9b RoomViewController: Handle updated RoomContextualMenuViewController. 2019-06-25 14:00:12 +02:00
SBiOSoftWhare
dab7d224eb RoomContextualMenuPresenter: Handle new reactions menu animations, reduce context menu show/hide animation duration. 2019-06-25 13:56:44 +02:00
SBiOSoftWhare
77d27d5fce RoomContextualMenuViewController: Handle updated ReactionsMenuView and new animations instructions. 2019-06-25 13:48:16 +02:00
SBiOSoftWhare
96c771bbfe Update ReactionsMenuView layout. 2019-06-25 13:40:59 +02:00
SBiOSoftWhare
833ba360ee Update ReactionsMenuViewModel to handle a list of reactions. 2019-06-25 13:23:07 +02:00
SBiOSoftWhare
af92b98065 Update ReactionsMenuButton UI 2019-06-25 12:06:54 +02:00
Weblate
81a04aa29d Merge branch 'origin/develop' into Weblate. 2019-06-24 14:16:37 +00:00
Kévin C
4c5af7ea10 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-06-24 14:16:37 +00:00
manuroe
8cddf89abd
Merge pull request #2527 from vector-im/riot_2526
Device Verification: Name for 🔒 is "Lock"
2019-06-24 16:16:33 +02:00
manuroe
6ff7530d8a Device Verification: Name for 🔒 is "Lock"
#2526
2019-06-24 15:46:16 +02:00
Weblate
712a176acb Merge branch 'origin/develop' into Weblate. 2019-06-24 13:01:05 +00:00
Osoitz
330f7a03bd Translated using Weblate (Basque)
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/eu/
2019-06-24 13:01:05 +00:00
manuroe
f7554aaa88
Merge pull request #2524 from vector-im/riot_2518
Make sure there are no ugly edge cases running Riot without an integrations manager
2019-06-24 15:01:00 +02:00
manuroe
918adc5b7a Integrations: Manage the error of provided integrations server not responding 2019-06-21 15:06:41 +02:00
manuroe
948105b03d Integrations: Manage the error of no configured integrations server 2019-06-21 12:12:32 +02:00
manuroe
afd37fa9fb Integrations: Make code support use of an integration manager other than modular/scalar.
The default value is still modular/scalar.
2019-06-21 11:26:34 +02:00
Weblate
b23af5c994 Merge branch 'origin/develop' into Weblate. 2019-06-21 08:02:38 +00:00
SBiOSoftWhare
1c10049f99
Merge pull request #2519 from vector-im/fix_e2e_padlock
e2e room message: Fix padlock position on last message with sender name
2019-06-21 10:02:35 +02:00
SBiOSoftWhare
98361afa6f e2e room message: Fix padlock position on last message with sender name. 2019-06-20 12:07:04 +02:00
Weblate
31bd8a94f3 Merge branch 'origin/develop' into Weblate. 2019-06-20 08:05:34 +00:00
SBiOSoftWhare
2eee21a200
Merge pull request #2517 from vector-im/cocoapods_1.7.2
Use CocoaPods 1.7.2
2019-06-20 10:05:30 +02:00
SBiOSoftWhare
9b1d2bc77e Use CocoaPods 1.7.2 2019-06-19 16:48:16 +02:00
Weblate
c16757f4a6 Merge branch 'origin/develop' into Weblate. 2019-06-19 14:47:29 +00:00
manuroe
37f967472b
Merge pull request #2437 from dcordero/Bundler
Update build instructions to make use of Bundler
2019-06-19 16:47:24 +02:00
Weblate
0293897d03 Merge branch 'origin/develop' into Weblate. 2019-06-19 14:28:29 +00:00
SBiOSoftWhare
76a880c60c
Merge pull request #2514 from vector-im/swift_5
Migrate to Swift 5.0
2019-06-19 16:28:25 +02:00
SBiOSoftWhare
a27cae781c Update SwiftLint pod. 2019-06-19 16:16:30 +02:00
SBiOSoftWhare
74758f671a Use CocoaPods 1.7.1 and update Podfile.lock 2019-06-19 16:03:40 +02:00
SBiOSoftWhare
affaa9dfbd Update changes 2019-06-19 15:48:40 +02:00
SBiOSoftWhare
fd8aff46e8 Update Reusable pod 2019-06-19 15:46:58 +02:00
SBiOSoftWhare
892314498d Migrate project to Swift 5 2019-06-19 15:46:58 +02:00
Weblate
1d7e84a97a Merge branch 'origin/develop' into Weblate. 2019-06-19 13:44:05 +00:00
manuroe
8f5bf902b0
Merge pull request #2473 from dcordero/create_button_size
Adjust size of the insert button in the People tab
2019-06-19 15:44:00 +02:00
manuroe
c71abd5edc
Update CHANGES.rst 2019-06-19 15:43:42 +02:00
manuroe
f155f99374
Merge branch 'develop' into create_button_size 2019-06-19 15:42:40 +02:00
Weblate
c811a1132b Merge branch 'origin/develop' into Weblate. 2019-06-19 13:31:57 +00:00