Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-10-01 16:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
10596 commits 46 branches 261 tags 144 MiB
Commit graph

10596 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
40fe3cd871 Merge branch 'master' into develop 2021-04-19 18:01:02 +02:00
manuroe
7697516863 Merge branch 'release/1.3.4/master' 2021-04-19 18:00:54 +02:00
manuroe
8c2a270e36 finish version++ 2021-04-19 18:00:54 +02:00
manuroe
4397945470
Merge pull request #4232 from vector-im/release/1.3.4/release 
Release 1.3.4
 2021-04-19 18:00:11 +02:00
manuroe
3eecc0e15c version++ 2021-04-19 15:07:56 +02:00
Gil Eluard
30cb7038d4
Merge pull request #4231 from vector-im/element_4230 
RoomVC: Crash in refreshTypingNotification
 2021-04-19 14:18:13 +02:00
Gil Eluard
25981d805a RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
manuroe
0341c47dd2 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe
c1af4941cd Merge branch 'master' into develop 2021-04-16 17:35:26 +02:00
manuroe
9360488822 Merge branch 'release/1.3.3/master' 2021-04-16 17:35:19 +02:00
manuroe
39af431884 finish version++ 2021-04-16 17:35:19 +02:00
manuroe
562a43c27e
Merge pull request #4227 from vector-im/release/1.3.3/release 
Release 1.3.3
 2021-04-16 17:34:38 +02:00
manuroe
a6ded4ded1 version++ 2021-04-16 17:13:16 +02:00
manuroe
74f7f08f99 Prepare for new sprint 2021-04-16 17:03:06 +02:00
manuroe
663a5cbf55 Merge branch 'master' into develop 2021-04-16 17:03:02 +02:00
manuroe
13f1268b4d Merge branch 'release/1.3.2/master' 2021-04-16 17:02:55 +02:00
manuroe
a9420a8a9f finish version++ 2021-04-16 17:02:55 +02:00
manuroe
20def42dc8
Merge pull request #4226 from vector-im/release/1.3.2/release 
Release 1.3.2
 2021-04-16 16:25:20 +02:00
manuroe
887b5156b1 version++ 2021-04-16 15:54:12 +02:00
manuroe
075f3567d5
Merge pull request #4223 from vector-im/manu/4222_missing_sender_name 
Notifications: Fix sender display name that can miss
 2021-04-16 15:50:56 +02:00
manuroe
45f20cf3c4
Merge pull request #4225 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Translations update from Weblate
 2021-04-16 15:39:47 +02:00
manuroe
f9bb47716a
Merge pull request #4224 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-04-16 15:39:12 +02:00
Weblate
dcf29093fb Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:56 +00:00
Weblate
c495477ffb Merge branch 'origin/develop' into Weblate. 2021-04-16 13:37:42 +00:00
manuroe
bab4c2a746 Notifications: Fix sender display name that can miss 
Fix #4222
 2021-04-16 15:02:02 +02:00
Sven Grewe
d1180ff880 Translated using Weblate (German) 
Currently translated at 99.6% (1188 of 1192 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/
 2021-04-15 20:34:46 +00:00
oksya8and8
f1693ff26f Translated using Weblate (Japanese) 
Currently translated at 73.1% (872 of 1192 strings)

Translation: Element iOS/Element iOS
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/ja/
 2021-04-15 20:34:45 +00:00
Sven Grewe
9f3b59a675 Translated using Weblate (German) 
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/de/
 2021-04-15 20:34:21 +00:00
manuroe
f0ba3e91a3
Merge pull request #4220 from vector-im/manu/4217_verification_as_per_web 
Self-verification: Fix compatibility with Element-Web
 2021-04-15 15:57:39 +02:00
manuroe
d621bf6151
Update Riot/Modules/Application/LegacyAppDelegate.m 2021-04-15 15:44:31 +02:00
manuroe
c4ec5a1a82
Update Riot/Modules/Application/LegacyAppDelegate.m 2021-04-15 15:44:23 +02:00
Gil Eluard
2cc525a083 Make joining public rooms configurable 
- Reset RiotSettings
 2021-04-15 11:15:48 +02:00
manuroe
5e1e226d51 Self-verification: Double check cross-signing state before displaying popups 2021-04-15 09:50:56 +02:00
manuroe
c28a991984 Self-verification: Fix compatibility with Element-Web when logging in on web 
#4217

If web triggers a verification request (because the users clicked on "Use another login"), remove the newSignIn alert dialog before display the incoming verification request.
 2021-04-14 18:50:37 +02:00
Gil Eluard
03f91bcb33 Make room settings screen configurable dynamically 
- reset RiotSettings
 2021-04-14 18:23:17 +02:00
Gil Eluard
658d2fad4c Make joining public rooms configurable 
- Reset RiotSettings
 2021-04-14 18:17:01 +02:00
manuroe
2200b2b36a Self-verification: Fix compatibility with Element-Web when logging in on iOS 
#4217

Just after login, send request instead of waiting for an incoming one as per recent EW changes
 2021-04-14 17:21:35 +02:00
Gil Eluard
609e621639 Updated CHANGES.rst 2021-04-14 15:55:26 +02:00
Gil Eluard
c57a55f1e7 Make room settings screen configurable dynamically 2021-04-14 15:52:25 +02:00
manuroe
50046e4487 Prepare for new sprint 2021-04-14 12:36:50 +02:00
manuroe
e4b2a8225c Merge branch 'master' into develop 2021-04-14 12:36:47 +02:00
manuroe
1578ef5969 Merge branch 'release/1.3.1/master' 2021-04-14 12:36:41 +02:00
manuroe
ea18685e28 finish version++ 2021-04-14 12:36:41 +02:00
manuroe
e2e19d81fb
Merge pull request #4216 from vector-im/release/1.3.1/release 
Release 1.3.1
 2021-04-14 12:35:55 +02:00
manuroe
1b82372f12 version++ 2021-04-14 12:22:34 +02:00
manuroe
9ebba5fa7b
Merge pull request #4215 from RiotTranslateBot/weblate-riot-ios-riot-ios-push 
Translations update from Weblate
 2021-04-14 11:36:24 +02:00
manuroe
8877f4c743
Merge pull request #4214 from RiotTranslateBot/weblate-riot-ios-riot-ios 
Translations update from Weblate
 2021-04-14 11:36:05 +02:00
manuroe
8a21de0d5c
Merge pull request #4198 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs 
Translations update from Weblate
 2021-04-14 11:35:35 +02:00
Weblate
773605b732 Merge branch 'origin/develop' into Weblate. 2021-04-14 09:21:22 +00:00
Weblate
7f4d6d85a0 Merge branch 'origin/develop' into Weblate. 2021-04-14 09:21:11 +00:00