Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
SailReal committed Jun 25, 2024
2 parents fd61c6f + d94b3f4 commit cd8f32b
Show file tree
Hide file tree
Showing 17 changed files with 130 additions and 117 deletions.
129 changes: 65 additions & 64 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,46 +1,48 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
CFPropertyList (3.0.7)
base64
nkf
rexml
addressable (2.8.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
apktools (0.7.4)
apktools (0.7.5)
rubyzip (~> 2.0)
artifactory (3.0.15)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.723.0)
aws-sdk-core (3.170.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-eventstream (1.3.0)
aws-partitions (1.933.0)
aws-sdk-core (3.196.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.63.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (1.82.0)
aws-sdk-core (~> 3, >= 3.193.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.119.1)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-s3 (1.151.0)
aws-sdk-core (~> 3, >= 3.194.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.2)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
bcrypt_pbkdf (1.1.0)
base64 (0.2.0)
bcrypt_pbkdf (1.1.1)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
digest-crc (0.6.4)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
ed25519 (1.3.0)
emoji_regex (3.2.3)
excon (0.99.0)
excon (0.110.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -69,15 +71,15 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.212.1)
fastimage (2.3.1)
fastlane (2.220.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
colored (~> 1.2)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
Expand All @@ -89,67 +91,67 @@ GEM
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, < 2.0.0)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (~> 2.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
optparse (>= 0.1.1, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (>= 1.4.5, < 2.0.0)
terminal-table (~> 3)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-plugin-aws_s3 (2.1.0)
apktools (~> 0.7)
aws-sdk-s3 (~> 1)
mime-types (~> 3.3)
fastlane-plugin-get_version_name (0.2.2)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.35.0)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.0)
google-apis-core (0.11.3)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.19.0)
google-apis-core (>= 0.9.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.7.0)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.1)
google-cloud-storage (1.44.0)
google-cloud-errors (1.4.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.19.0)
google-apis-storage_v1 (~> 0.31.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.3.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
Expand All @@ -158,60 +160,59 @@ GEM
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.0)
memoist (0.16.2)
mime-types (3.4.1)
json (2.7.2)
jwt (2.8.1)
base64
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.0218.1)
mime-types-data (3.2024.0507)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.0.0)
multipart-post (2.4.1)
nanaimo (0.3.0)
naturally (2.2.1)
net-sftp (4.0.0)
net-ssh (>= 5.0.0, < 8.0.0)
net-ssh (7.0.1)
optparse (0.1.1)
net-ssh (7.2.3)
nkf (0.2.0)
optparse (0.5.0)
os (1.1.4)
plist (3.7.0)
public_suffix (5.0.1)
rake (13.0.6)
plist (3.7.1)
public_suffix (5.0.5)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.5)
rexml (3.2.8)
strscan (>= 3.0.9)
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.3)
signet (0.17.0)
security (0.1.5)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
strscan (3.1.0)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.1)
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (1.8.0)
webrick (1.8.1)
unicode-display_width (2.5.0)
word_wrap (1.0.0)
xcodeproj (1.22.0)
xcodeproj (1.24.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
Expand Down
2 changes: 1 addition & 1 deletion fastlane/izzyscript/result_apkstore.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fastlane/izzyscript/result_fdroid.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fastlane/izzyscript/result_lite.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fastlane/izzyscript/result_playstore.json

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions fastlane/release-notes-de.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
- Übersetzungen aktualisiert
- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
- Update auf die neueste Android-Version
- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
9 changes: 5 additions & 4 deletions fastlane/release-notes-en.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Add workaround for editing files in Microsoft Office apps
- Add support for themed Cryptomator icon
- Refresh stale authentication token during auto upload
- Update translations
- Preserve original file modification date during upload (if possible)
- Update to latest Android version
- Fix for uploading files larger than 2GB in WebDAV
- Fix vault unlock on Samsung devices
- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
11 changes: 6 additions & 5 deletions fastlane/release-notes.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<ul>
<li>Add workaround for editing files in Microsoft Office apps</li>
<li>Add support for themed Cryptomator icon</li>
<li>Refresh stale authentication token during auto upload</li>
<li>Update translations</li>
</ul>
<li>Preserve original file modification date during upload (if possible)</li>
<li>Update to latest Android version</li>
<li>Fix for uploading files larger than 2GB in WebDAV</li>
<li>Fix vault unlock on Samsung devices</li>
<li>Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app</li>
</ul>
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
- Übersetzungen aktualisiert
- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
- Update auf die neueste Android-Version
- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Add workaround for editing files in Microsoft Office apps
- Add support for themed Cryptomator icon
- Refresh stale authentication token during auto upload
- Update translations
- Preserve original file modification date during upload (if possible)
- Update to latest Android version
- Fix for uploading files larger than 2GB in WebDAV
- Fix vault unlock on Samsung devices
- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Add workaround for editing files in Microsoft Office apps
- Add support for themed Cryptomator icon
- Refresh stale authentication token during auto upload
- Update translations
- Preserve original file modification date during upload (if possible)
- Update to latest Android version
- Fix for uploading files larger than 2GB in WebDAV
- Fix vault unlock on Samsung devices
- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
- Übersetzungen aktualisiert
- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
- Update auf die neueste Android-Version
- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Add workaround for editing files in Microsoft Office apps
- Add support for themed Cryptomator icon
- Refresh stale authentication token during auto upload
- Update translations
- Preserve original file modification date during upload (if possible)
- Update to latest Android version
- Fix for uploading files larger than 2GB in WebDAV
- Fix vault unlock on Samsung devices
- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Add workaround for editing files in Microsoft Office apps
- Add support for themed Cryptomator icon
- Refresh stale authentication token during auto upload
- Update translations
- Preserve original file modification date during upload (if possible)
- Update to latest Android version
- Fix for uploading files larger than 2GB in WebDAV
- Fix vault unlock on Samsung devices
- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Workaround für die Bearbeitung von Dateien in Microsoft Office-Anwendungen hinzugefügt
- Unterstützung für thematisches Cryptomator-Symbol hinzugefügt
- Aktualisieren eines veralteten Authentifizierungs-Tokens beim automatischen Hochladen
- Übersetzungen aktualisiert
- Originales Änderungsdatum der Datei beim Hochladen beibehalten (wenn möglich)
- Update auf die neueste Android-Version
- Fehlerbehebung beim Hochladen von Dateien größer als 2GB in WebDAV
- Fehlerbehebung beim Entsperren des Tresors auf Samsung-Geräten
- Dateiüberschreibung unter bestimmten Bedingungen verhindern, wenn zwischen Dateien gewechselt wird, die von keiner App geöffnet werden können
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Add workaround for editing files in Microsoft Office apps
- Add support for themed Cryptomator icon
- Refresh stale authentication token during auto upload
- Update translations
- Preserve original file modification date during upload (if possible)
- Update to latest Android version
- Fix for uploading files larger than 2GB in WebDAV
- Fix vault unlock on Samsung devices
- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- Add workaround for editing files in Microsoft Office apps
- Add support for themed Cryptomator icon
- Refresh stale authentication token during auto upload
- Update translations
- Preserve original file modification date during upload (if possible)
- Update to latest Android version
- Fix for uploading files larger than 2GB in WebDAV
- Fix vault unlock on Samsung devices
- Prevent file overwrite under certain conditions when switching between files that cannot be opened by any app

0 comments on commit cd8f32b

Please sign in to comment.