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

8248 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ismail Gulek
edced05aa1 Revert non-English strings for store descriptions 2020-07-03 17:28:42 +03:00
Ismail Gulek
35aba15053 Revert undecided urls 2020-07-03 17:10:08 +03:00
Ismail Gulek
b6d7d681ff Merge branch 'rebranding' into 8-update-strings-localizations 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
 2020-07-03 17:08:21 +03:00
Ismail Gulek
9c824c07fc Merge branch '14-update-legal-pages-urls-copyright-tac-t-c' into 'rebranding' 
Resolve "Update legal pages URLs (copyright, TAC, T&C)"

See merge request new-vector/element/element-ios!9
 2020-07-03 14:05:06 +00:00
Ismail Gulek
c1d88113bc Remove urls only from English 2020-07-03 17:00:50 +03:00
Ismail Gulek
0b566b725c Revert "Remove url strings" 
This reverts commit e475db360a.
 2020-07-03 16:59:26 +03:00
Ismail Gulek
8b74434806 Update app version to 1.0.0 2020-07-03 16:44:50 +03:00
Ismail Gulek
603c259db5 Merge branch 'rebranding' into 14-update-legal-pages-urls-copyright-tac-t-c 2020-07-03 16:41:23 +03:00
Ismail Gulek
34cc43edbb Read urls from defaults 2020-07-03 16:38:14 +03:00
Ismail Gulek
e475db360a Remove url strings 2020-07-03 16:38:01 +03:00
Ismail Gulek
74b8740189 Include copyright, privacy, termsConditions urls to plist 2020-07-03 16:36:12 +03:00
Ismail Gulek
caae830fec Merge branch 'rebranding' into 8-update-strings-localizations 2020-07-03 15:16:01 +03:00
Steve Barré
b30b0ec7b3 Merge branch 'images_update' into 'rebranding' 
Rebranding: Update tab bar and nav bar icons.

See merge request new-vector/element/element-ios!7
 2020-07-02 13:39:48 +00:00
SBiOSoftWhare
5170286b54 Rebranding: Update tab bar and nav bar icons. 2020-07-02 15:08:16 +02:00
Ismail Gulek
5f62fca3e0 Merge branch '6-update-app-version-to-1-0-0' into 'rebranding' 
Update app version to 1.0.0

See merge request new-vector/element/element-ios!6
 2020-07-02 11:07:10 +00:00
Ismail Gulek
75566cc87b Merge branch 'revert-395040f4' into 'develop' 
Revert "Merge branch '6-update-app-version-to-1-0-0' into 'develop'"

See merge request new-vector/element/element-ios!5
 2020-07-01 14:01:54 +00:00
Ismail Gulek
1155414778 Revert "Merge branch '6-update-app-version-to-1-0-0' into 'develop'" 
This reverts merge request !4
 2020-07-01 14:00:57 +00:00
Ismail Gulek
395040f4fb Merge branch '6-update-app-version-to-1-0-0' into 'develop' 
Update app version to 1.0.0

Closes #6

See merge request new-vector/element/element-ios!4
 2020-07-01 13:57:29 +00:00
Ismail Gulek
314a683e2a Update app version to 1.0.0 2020-07-01 16:26:34 +03:00
Ismail Gulek
91735e31f4 Update urls in Vector.strings 2020-07-01 15:49:58 +03:00
Ismail Gulek
d6ba32c83e Update InfoPlist.strings 2020-07-01 15:45:09 +03:00
ismailgulek
71ec71b5f8
Remove xcode11 from Podfile 2020-07-01 10:02:59 +03:00
ismailgulek
387cfb7787
Merge branch 'develop' into xcode11 
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
 2020-07-01 09:59:29 +03:00
SBiOSoftWhare
6cc9d9fd92 Merge tag 'v0.11.6' into develop 
no message
 2020-07-01 00:47:02 +02:00
SBiOSoftWhare
fe1eb3a936 Merge branch 'release/v0.11.6' 2020-07-01 00:47:02 +02:00
SBiOSoftWhare
f833fcfded
Merge pull request #3379 from vector-im/fastfile_update 
Fastfile: Enforce provisioning files selection when downloading them from portal
 2020-07-01 00:45:23 +02:00
SBiOSoftWhare
bba6f9d634 Fastfile: Enforce provisioning files selection when downloading them. 2020-07-01 00:09:10 +02:00
SBiOSoftWhare
31babd9aa4 Gemfile: Update dependencies. 2020-06-30 22:56:07 +02:00
SBiOSoftWhare
adc73c87cd Merge branch 'release/v0.11.6' 2020-06-30 22:37:52 +02:00
SBiOSoftWhare
3267e7c106 Merge tag 'v0.11.6' into develop 
no message
 2020-06-30 22:37:52 +02:00
SBiOSoftWhare
e9fe3f1261 version++ 2020-06-30 22:37:13 +02:00
SBiOSoftWhare
b32eb962aa version++ 2020-06-30 22:25:39 +02:00
SBiOSoftWhare
9692354fdb
Merge pull request #3375 from vector-im/copy_update 
SecurityVC: Update MY SESSIONS copy
 2020-06-30 21:50:52 +02:00
SBiOSoftWhare
e5a36a76a3
Merge pull request #3377 from vector-im/riot_3299 
Setup cross-signing for existing users
 2020-06-30 21:47:36 +02:00
SBiOSoftWhare
4bac9f1e9c Refactor cross signing banner. 2020-06-30 21:46:10 +02:00
SBiOSoftWhare
90e78e262b KeyVerificationService: Fix canSetupKeyVerification. 2020-06-30 19:37:13 +02:00
SBiOSoftWhare
d27f4a6df5 AuthenticatedSessionViewControllerFactory: Add a discardableResult on viewController(forPath method. 2020-06-30 18:44:55 +02:00
SBiOSoftWhare
7f5a229b9d HomeVC: Handle key verification setup banner. 2020-06-30 18:44:14 +02:00
Riot Translate Bot
1df96cbd88
Update from Weblate (#3376) 
* Translated using Weblate (Albanian)

Currently translated at 99.2% (1020 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/sq/

* Translated using Weblate (French)

Currently translated at 100.0% (1028 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/

* Translated using Weblate (Italian)

Currently translated at 100.0% (1028 of 1028 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/

Co-authored-by: Besnik Bleta <besnik@programeshqip.org>
Co-authored-by: Kévin C <zecakeh@pm.me>
Co-authored-by: kernitus <zirconic@protonmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
 2020-06-30 18:25:16 +02:00
manuroe
a9e677e538 SecurityVC: Update MY SESSIONS copy 2020-06-30 18:12:50 +02:00
manuroe
19db088bc2 Sign out: Make sure there is a secure backup 2020-06-30 18:00:56 +02:00
SBiOSoftWhare
85fbeffb1f KeyVerificationService: Add canSetupKeyVerification method. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare
8d5e809633 RecentsDataSource: Handle key verification setup banner. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare
9f925ca5c9 AppDelegate: Handle KeyVerificationBannerPreferences. 2020-06-30 17:33:42 +02:00
SBiOSoftWhare
0f04837ce4 Cross-signing: Create key verification setup banner. 2020-06-30 17:33:42 +02:00
manuroe
04a53e521d
Merge pull request #3374 from vector-im/riot_3296_2 
Settings: Secure backup
 2020-06-30 17:24:06 +02:00
manuroe
16a292fd6e SecurityVC: Setup cross-signing on secure backup setup 2020-06-30 17:03:33 +02:00
manuroe
ec82325360 SecurityVC: 3 actions for secure backup: setup, synchronise, delete 2020-06-30 16:23:29 +02:00
manuroe
8f60ddc952 SecurityVC: Hide the cross-signing section 2020-06-30 15:56:05 +02:00
manuroe
72d3d944e5 SecurityVC: Secure backup replaces messages backup 2020-06-30 15:54:58 +02:00