Commit graph

6928 commits

Author SHA1 Message Date
SBiOSoftWhare
beb831eec1
Merge pull request #2807 from vector-im/riot_2687
BF: Timestamps are sometimes hidden by the overlay
2019-10-29 16:23:54 +01:00
SBiOSoftWhare
b50f8979f0 RoomVC: Prevent tableView scroll when displaying contextual menu. 2019-10-29 09:19:37 +01:00
SBiOSoftWhare
ea031cd033 RoomVC: Prevent tableView scroll when displaying contextual menu (Fix #2687). 2019-10-28 18:55:55 +01:00
Weblate
03abbbc1d0 Merge branch 'origin/develop' into Weblate. 2019-10-25 16:24:17 +00:00
dccs
f84eac3d36 Translated using Weblate (German)
Currently translated at 99.6% (824 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/de/
2019-10-25 16:24:17 +00:00
Weblate
bf1c62f52c Merge branch 'origin/develop' into Weblate. 2019-10-25 16:24:16 +00:00
Weblate
cdbb19e92d Merge branch 'origin/develop' into Weblate. 2019-10-25 16:24:16 +00:00
SBiOSoftWhare
3ae7287a9b version++ 2019-10-25 18:24:04 +02:00
Weblate
047ea89571 Merge branch 'origin/develop' into Weblate. 2019-10-25 12:23:20 +00:00
송태섭
26d8d272b2 Translated using Weblate (Korean)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/ko/
2019-10-25 12:23:20 +00:00
Szimszon
0a46a7593f Translated using Weblate (Hungarian)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
2019-10-25 12:23:19 +00:00
Kévin C
d8edd84519 Translated using Weblate (French)
Currently translated at 100.0% (827 of 827 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2019-10-25 12:23:18 +00:00
Weblate
b385117c45 Merge branch 'origin/develop' into Weblate. 2019-10-25 12:23:17 +00:00
Weblate
980d9e8da6 Merge branch 'origin/develop' into Weblate. 2019-10-25 12:23:17 +00:00
manuroe
09b2bc62ee Add Tools/Logs/filterStartupLogs.sh 2019-10-25 14:23:08 +02:00
Weblate
ddfde5094c Merge branch 'origin/develop' into Weblate. 2019-10-24 15:24:20 +00:00
Weblate
f1d34e641b Merge branch 'origin/develop' into Weblate. 2019-10-24 15:24:20 +00:00
Weblate
bf4b917692 Merge branch 'origin/develop' into Weblate. 2019-10-24 15:24:20 +00:00
manuroe
b76f18b16a
Merge pull request #2801 from vector-im/riot_2744
Settings: Add User-Interactive Auth for adding email and msidsn to user's account
2019-10-24 17:24:15 +02:00
manuroe
aac9ac03d7 Settings: Use a generic wording when authentication flow is not supported 2019-10-24 15:40:07 +02:00
manuroe
26cc34a62e Settings: Add User-Interactive Auth for adding email and msidsn to user's account
vector-im/riot-ios#2744
2019-10-24 11:17:59 +02:00
Weblate
cf39983709 Merge branch 'origin/develop' into Weblate. 2019-10-24 08:55:17 +00:00
Weblate
a9739738eb Merge branch 'origin/develop' into Weblate. 2019-10-24 08:55:17 +00:00
Weblate
d1c65ccbda Merge branch 'origin/develop' into Weblate. 2019-10-24 08:55:17 +00:00
SBiOSoftWhare
c656a56eba
Merge pull request #2799 from vector-im/riot_2504
BF: selecting 'start verification' from a keyshare request wedges you in an entirely blank verification screen
2019-10-24 10:55:12 +02:00
SBiOSoftWhare
378bdcd327 Update changes 2019-10-23 17:36:31 +02:00
SBiOSoftWhare
413b9563c0 Device verification: Improve navigation flow and view states handling. 2019-10-23 17:27:43 +02:00
SBiOSoftWhare
0a21d7a2af Update setRootModule method signature in NavigationRouterType protocol. 2019-10-23 17:27:43 +02:00
Weblate
8f8d471a03 Merge branch 'origin/develop' into Weblate. 2019-10-23 15:25:45 +00:00
Weblate
0ccfece83d Merge branch 'origin/develop' into Weblate. 2019-10-23 15:25:45 +00:00
Weblate
8be1eaaf47 Merge branch 'origin/develop' into Weblate. 2019-10-23 15:25:45 +00:00
SBiOSoftWhare
5179622c7e
Merge pull request #2797 from vector-im/riot_2630
BF: Emoji Picker: Background color is not white
2019-10-23 17:25:40 +02:00
SBiOSoftWhare
d981d7b6ed Update changes 2019-10-22 18:56:39 +02:00
SBiOSoftWhare
82527c2a3f Emoji picker: Fix reverse header and background colors (Fix #2630). 2019-10-22 18:54:59 +02:00
Weblate
db2ec8dd3c Merge branch 'origin/develop' into Weblate. 2019-10-22 10:18:28 +00:00
Weblate
419f838ff7 Merge branch 'origin/develop' into Weblate. 2019-10-22 10:18:28 +00:00
Weblate
10a81f524b Merge branch 'origin/develop' into Weblate. 2019-10-22 10:18:28 +00:00
SBiOSoftWhare
7a82c137ed
Merge pull request #2795 from vector-im/fix_DTCoreText_pod
CocoaPods: Fix DTCoreText app extension issue
2019-10-22 12:18:24 +02:00
Weblate
dad9f1c285 Merge branch 'origin/develop' into Weblate. 2019-10-22 10:18:06 +00:00
Weblate
ed633247f2 Merge branch 'origin/develop' into Weblate. 2019-10-22 10:18:06 +00:00
Weblate
0d987e1576 Merge branch 'origin/develop' into Weblate. 2019-10-22 10:18:05 +00:00
SBiOSoftWhare
b4890085bb
Merge pull request #2794 from vector-im/fix_tap_attachment_sent_failed_crash
RoomVC: Fix crash occurring when tap on an unsent media with retrieved event equal to nil
2019-10-22 12:18:02 +02:00
Weblate
d80f4c2a31 Merge branch 'origin/develop' into Weblate. 2019-10-22 10:13:08 +00:00
Weblate
bbca0e4111 Merge branch 'origin/develop' into Weblate. 2019-10-22 10:13:08 +00:00
Weblate
9ac62a40eb Merge branch 'origin/develop' into Weblate. 2019-10-22 10:13:08 +00:00
SBiOSoftWhare
75226a3cd5 Gemfile: Update CocoaPods version to 1.8.x and perform a bundle update. 2019-10-22 12:12:57 +02:00
SBiOSoftWhare
7fb865ba00 CocoaPods: Fix DTCoreText app extension issue. 2019-10-22 12:04:41 +02:00
SBiOSoftWhare
876840f5ae Update changes 2019-10-22 11:51:07 +02:00
SBiOSoftWhare
57f2278d45 RoomViewController: Fix crash occurring when tap on an unsent media with retrieved event equal to nil. 2019-10-22 11:50:25 +02:00
Weblate
2d6293c9f0 Merge branch 'origin/develop' into Weblate. 2019-10-22 09:22:50 +00:00