mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-17 15:09:31 +02:00
Merge commit 'd4a88c36aeca8f101223282b1641bbbe4cf61cfa' into feature/5226_us12_federation_in_timline_header
* commit 'd4a88c36aeca8f101223282b1641bbbe4cf61cfa': MESSENGER-5431 temporary remoce ort stage MESSENGER-5431 temporary remoce ort stage MESSENGER-5431 use tagged sdk Updated sdk version in podfile MESSENGER-5431 changelog and app version finish version++ version++ changelog.d: Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)). Discard changes to Riot/Assets/de.lproj/Vector.strings Translated using Weblate (Belarusian) Added translation using Weblate (Belarusian) Translated using Weblate (Belarusian) Added translation using Weblate (Belarusian) Added translation using Weblate (Georgian) Translated using Weblate (German) Added translation using Weblate (Belarusian) Update most references of vector-im to element-hq (#7725) Update RTE to 2.19.0 Update CocoaPods and other gems. (#7720) Prepare for new sprint # Conflicts: # .gitlab-ci-bum.yml
This commit is contained in:
JanNiklas Grabowski
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -1,7 +1,7 @@
|
||||
blank_issues_enabled: true
|
||||
contact_links:
|
||||
- name: Enhancement or feature request
|
||||
url: https://github.com/vector-im/element-meta/discussions/categories/ideas
|
||||
url: https://github.com/element-hq/element-meta/discussions/categories/ideas
|
||||
about: Do you have a suggestion or feature request?
|
||||
- name: Element iOS Community Support
|
||||
url: https://matrix.to/#/#element-ios:matrix.org
|
||||
|
||||
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@@ -1,6 +1,6 @@
|
||||
### Pull Request Checklist
|
||||
|
||||
- [ ] I read the [contributing guide](https://github.com/vector-im/element-ios/blob/develop/CONTRIBUTING.md)
|
||||
- [ ] I read the [contributing guide](https://github.com/element-hq/element-ios/blob/develop/CONTRIBUTING.md)
|
||||
- [ ] UI change has been tested on both light and dark themes, in portrait and landscape orientations and on iPhone and iPad simulators
|
||||
- [ ] Accessibility has been taken into account.
|
||||
* [ ] Pull request is based on the develop branch
|
||||
|
||||
2
.github/workflows/triage-incoming.yml
vendored
2
.github/workflows/triage-incoming.yml
vendored
@@ -17,7 +17,7 @@ jobs:
|
||||
add_to_triage:
|
||||
runs-on: ubuntu-latest
|
||||
if: >
|
||||
github.repository == 'vector-im/element-ios'
|
||||
github.repository == 'element-hq/element-ios'
|
||||
steps:
|
||||
- uses: octokit/graphql-action@v2.x
|
||||
with:
|
||||
|
||||
16
.github/workflows/triage-move-labelled.yml
vendored
16
.github/workflows/triage-move-labelled.yml
vendored
@@ -37,7 +37,7 @@ jobs:
|
||||
- uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
|
||||
with:
|
||||
action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
|
||||
project-url: "https://github.com/vector-im/element-ios/projects/12"
|
||||
project-url: "https://github.com/element-hq/element-ios/projects/12"
|
||||
column-name: "Need info"
|
||||
label-name: "X-Needs-Info"
|
||||
|
||||
@@ -55,7 +55,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/add-to-project@main
|
||||
with:
|
||||
project-url: https://github.com/orgs/vector-im/projects/18
|
||||
project-url: https://github.com/orgs/element-hq/projects/18
|
||||
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
||||
|
||||
add_product_issues_to_project:
|
||||
@@ -66,7 +66,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/add-to-project@main
|
||||
with:
|
||||
project-url: https://github.com/orgs/vector-im/projects/28
|
||||
project-url: https://github.com/orgs/element-hq/projects/28
|
||||
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
||||
|
||||
ex_plorers:
|
||||
@@ -77,7 +77,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/add-to-project@main
|
||||
with:
|
||||
project-url: https://github.com/orgs/vector-im/projects/73
|
||||
project-url: https://github.com/orgs/element-hq/projects/73
|
||||
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
||||
|
||||
ps_features1:
|
||||
@@ -93,7 +93,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/add-to-project@main
|
||||
with:
|
||||
project-url: https://github.com/orgs/vector-im/projects/56
|
||||
project-url: https://github.com/orgs/element-hq/projects/56
|
||||
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
||||
|
||||
ps_features2:
|
||||
@@ -105,7 +105,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/add-to-project@main
|
||||
with:
|
||||
project-url: https://github.com/orgs/vector-im/projects/58
|
||||
project-url: https://github.com/orgs/element-hq/projects/58
|
||||
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
||||
|
||||
ps_features3:
|
||||
@@ -116,7 +116,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/add-to-project@main
|
||||
with:
|
||||
project-url: https://github.com/orgs/vector-im/projects/57
|
||||
project-url: https://github.com/orgs/element-hq/projects/57
|
||||
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
||||
|
||||
voip:
|
||||
@@ -127,5 +127,5 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/add-to-project@main
|
||||
with:
|
||||
project-url: https://github.com/orgs/vector-im/projects/41
|
||||
project-url: https://github.com/orgs/element-hq/projects/41
|
||||
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
|
||||
|
||||
4
.github/workflows/triage-review-requests.yml
vendored
4
.github/workflows/triage-review-requests.yml
vendored
@@ -14,7 +14,7 @@ jobs:
|
||||
headers: '{"GraphQL-Features": "projects_next_graphql"}'
|
||||
query: |
|
||||
query find_team_members($team: String!) {
|
||||
organization(login: "vector-im") {
|
||||
organization(login: "element-hq") {
|
||||
team(slug: $team) {
|
||||
members {
|
||||
nodes {
|
||||
@@ -81,7 +81,7 @@ jobs:
|
||||
headers: '{"GraphQL-Features": "projects_next_graphql"}'
|
||||
query: |
|
||||
query find_team_members($team: String!) {
|
||||
organization(login: "vector-im") {
|
||||
organization(login: "element-hq") {
|
||||
team(slug: $team) {
|
||||
members {
|
||||
nodes {
|
||||
|
||||
11
CHANGES.md
11
CHANGES.md
@@ -1,3 +1,14 @@
|
||||
## Changes in 1.11.6 (2024-01-09)
|
||||
|
||||
🙌 Improvements
|
||||
|
||||
- Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)).
|
||||
|
||||
🧱 Build
|
||||
|
||||
- Update CocoaPods and other gems. ([#7720](https://github.com/element-hq/element-ios/pull/7720))
|
||||
|
||||
|
||||
## Changes in 1.11.5 (2023-11-28)
|
||||
|
||||
🙌 Improvements
|
||||
|
||||
@@ -1,3 +1,29 @@
|
||||
Changes in BWI project 2.14.0 (2024-01-16)
|
||||
===================================================
|
||||
|
||||
Upstream merge ✨:
|
||||
|
||||
Features ✨:
|
||||
- Change federation setting in room settings (disabled) (#5410)
|
||||
- Change fedration setting on room creation (disabled) (#4846)
|
||||
|
||||
Improvements 🙌:
|
||||
- Federation info about users in member details (disabled) (#5204)
|
||||
|
||||
Bugfix 🐛:
|
||||
- Better handling of permalink prefix on testservers (#5158)
|
||||
- Outdated app versions shown as pop up (#5276)
|
||||
- Copyright claims for location sharing set correctly from style.json (#5279)
|
||||
- Corrected appstore link for app version popup (#5276)
|
||||
|
||||
Translations 🗣 :
|
||||
|
||||
SDK API changes ⚠️:
|
||||
|
||||
Build 🧱:
|
||||
- Enable Renovate
|
||||
- Fix Sonarcube warnings
|
||||
|
||||
Changes in BWI project 2.12.1 (2023-12-11)
|
||||
===================================================
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ Please read the matrix-ios-sdk [contributing guide](https://github.com/matrix-or
|
||||
## I want to help translating
|
||||
|
||||
If you want to fix an issue for an English string, please submit a pull request to the Element iOS GitHub repository.
|
||||
If you want to fix an issue for another language, add a missing translation, or add a new language, please read [Element Web translating guide](https://github.com/vector-im/element-web/blob/develop/docs/translating.md) first and then use the Element iOS [Weblate](https://translate.riot.im/projects/riot-ios/).
|
||||
If you want to fix an issue for another language, add a missing translation, or add a new language, please read [Element Web translating guide](https://github.com/element-hq/element-web/blob/develop/docs/translating.md) first and then use the Element iOS [Weblate](https://translate.riot.im/projects/riot-ios/).
|
||||
|
||||
If you have any question regarding translations please ask in [Element Translation room](https://matrix.to/#/#element-translations:matrix.org).
|
||||
|
||||
@@ -26,7 +26,7 @@ Otherwise please have a look to [Apple Swift conventions](https://swift.org/docu
|
||||
|
||||
## Pull request
|
||||
|
||||
When you are making a pull request please read carefully the [Pull Request Checklist](https://github.com/vector-im/element-ios/blob/develop/.github/PULL_REQUEST_TEMPLATE.md).
|
||||
When you are making a pull request please read carefully the [Pull Request Checklist](https://github.com/element-hq/element-ios/blob/develop/.github/PULL_REQUEST_TEMPLATE.md).
|
||||
|
||||
## Thanks
|
||||
|
||||
|
||||
@@ -207,7 +207,8 @@ class BWIBuildSettings: NSObject {
|
||||
"cca10f6b4b583da69bbd3815ee0fccd193cf0cfd046aee1aeffaa7b5245e8f83",
|
||||
"36a9ec7368bddedd9deb1e2d1c627bd7304865135c9be30b1979659e3ac9ad07",
|
||||
"dbaf8618e8a2f8d681591dfbcc73243c921c10dec69a2e5ee50bc91ca7dedcda",
|
||||
"ed1af0fd873ec749f17c3b61ce4e481ab1644c132003f97a9c4e36516325788a"
|
||||
"ed1af0fd873ec749f17c3b61ce4e481ab1644c132003f97a9c4e36516325788a",
|
||||
"081e6ef90ba86102d678756fd13b07ca744340ad4d58a340e1956dca992f18e3"
|
||||
]
|
||||
|
||||
// use a different badge color if the user was mentioned in a room
|
||||
|
||||
3
Gemfile
3
Gemfile
@@ -2,8 +2,7 @@ source "https://rubygems.org"
|
||||
|
||||
gem "xcode-install"
|
||||
gem "fastlane"
|
||||
gem "cocoapods", '~>1.13.0'
|
||||
gem 'activesupport', '~> 7.0.8'
|
||||
gem "cocoapods", '~>1.14.3'
|
||||
gem "slather"
|
||||
|
||||
plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
|
||||
|
||||
83
Gemfile.lock
83
Gemfile.lock
@@ -3,10 +3,15 @@ GEM
|
||||
specs:
|
||||
CFPropertyList (3.0.6)
|
||||
rexml
|
||||
activesupport (7.0.8)
|
||||
activesupport (7.1.2)
|
||||
base64
|
||||
bigdecimal
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
connection_pool (>= 2.2.5)
|
||||
drb
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
mutex_m
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.5)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
@@ -15,31 +20,33 @@ GEM
|
||||
json (>= 1.5.1)
|
||||
artifactory (3.0.15)
|
||||
atomos (0.1.3)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.828.0)
|
||||
aws-sdk-core (3.183.1)
|
||||
aws-eventstream (1.3.0)
|
||||
aws-partitions (1.859.0)
|
||||
aws-sdk-core (3.188.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-kms (1.71.0)
|
||||
aws-sdk-core (~> 3, >= 3.177.0)
|
||||
aws-sdk-kms (1.73.0)
|
||||
aws-sdk-core (~> 3, >= 3.188.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.136.0)
|
||||
aws-sdk-core (~> 3, >= 3.181.0)
|
||||
aws-sdk-s3 (1.140.0)
|
||||
aws-sdk-core (~> 3, >= 3.188.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.6)
|
||||
aws-sigv4 (1.6.0)
|
||||
aws-sigv4 (1.7.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
babosa (1.0.4)
|
||||
base64 (0.2.0)
|
||||
bigdecimal (3.1.4)
|
||||
claide (1.1.0)
|
||||
clamp (1.3.2)
|
||||
cocoapods (1.13.0)
|
||||
cocoapods (1.14.3)
|
||||
addressable (~> 2.8)
|
||||
claide (>= 1.0.2, < 2.0)
|
||||
cocoapods-core (= 1.13.0)
|
||||
cocoapods-core (= 1.14.3)
|
||||
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
||||
cocoapods-downloader (>= 1.6.0, < 2.0)
|
||||
cocoapods-downloader (>= 2.1, < 3.0)
|
||||
cocoapods-plugins (>= 1.0.0, < 2.0)
|
||||
cocoapods-search (>= 1.0.0, < 2.0)
|
||||
cocoapods-trunk (>= 1.6.0, < 2.0)
|
||||
@@ -52,7 +59,7 @@ GEM
|
||||
nap (~> 1.0)
|
||||
ruby-macho (>= 2.3.0, < 3.0)
|
||||
xcodeproj (>= 1.23.0, < 2.0)
|
||||
cocoapods-core (1.13.0)
|
||||
cocoapods-core (1.14.3)
|
||||
activesupport (>= 5.0, < 8)
|
||||
addressable (~> 2.8)
|
||||
algoliasearch (~> 1.0)
|
||||
@@ -63,7 +70,7 @@ GEM
|
||||
public_suffix (~> 4.0)
|
||||
typhoeus (~> 1.0)
|
||||
cocoapods-deintegrate (1.0.5)
|
||||
cocoapods-downloader (1.6.3)
|
||||
cocoapods-downloader (2.1)
|
||||
cocoapods-plugins (1.0.0)
|
||||
nap
|
||||
cocoapods-search (1.0.1)
|
||||
@@ -76,17 +83,19 @@ GEM
|
||||
commander (4.6.0)
|
||||
highline (~> 2.0.0)
|
||||
concurrent-ruby (1.2.2)
|
||||
connection_pool (2.4.1)
|
||||
declarative (0.0.20)
|
||||
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.20231109)
|
||||
dotenv (2.8.1)
|
||||
drb (2.2.0)
|
||||
ruby2_keywords
|
||||
emoji_regex (3.2.3)
|
||||
escape (0.0.4)
|
||||
ethon (0.16.0)
|
||||
ffi (>= 1.15.0)
|
||||
excon (0.103.0)
|
||||
excon (0.104.0)
|
||||
faraday (1.10.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
@@ -116,7 +125,7 @@ GEM
|
||||
faraday_middleware (1.2.0)
|
||||
faraday (~> 1.0)
|
||||
fastimage (2.2.7)
|
||||
fastlane (2.216.0)
|
||||
fastlane (2.217.0)
|
||||
CFPropertyList (>= 2.3, < 4.0.0)
|
||||
addressable (>= 2.8, < 3.0.0)
|
||||
artifactory (~> 3.0)
|
||||
@@ -157,18 +166,18 @@ GEM
|
||||
xcpretty (~> 0.3.0)
|
||||
xcpretty-travis-formatter (>= 0.0.3)
|
||||
fastlane-plugin-brew (0.1.1)
|
||||
fastlane-plugin-sentry (1.15.0)
|
||||
fastlane-plugin-sentry (1.16.0)
|
||||
os (~> 1.1, >= 1.1.4)
|
||||
fastlane-plugin-versioning (0.5.2)
|
||||
fastlane-plugin-xcodegen (1.1.0)
|
||||
fastlane-plugin-brew (~> 0.1.1)
|
||||
ffi (1.16.2)
|
||||
ffi (1.16.3)
|
||||
fourflusher (2.3.1)
|
||||
fuzzy_match (2.0.4)
|
||||
gh_inspector (1.1.3)
|
||||
google-apis-androidpublisher_v3 (0.50.0)
|
||||
google-apis-androidpublisher_v3 (0.53.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-apis-core (0.11.1)
|
||||
google-apis-core (0.11.2)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
httpclient (>= 2.8.1, < 3.a)
|
||||
@@ -181,19 +190,19 @@ GEM
|
||||
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-apis-storage_v1 (0.29.0)
|
||||
google-apis-core (>= 0.11.0, < 2.a)
|
||||
google-cloud-core (1.6.0)
|
||||
google-cloud-env (~> 1.0)
|
||||
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-storage (1.45.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.29.0)
|
||||
google-cloud-core (~> 1.6)
|
||||
googleauth (>= 0.16.2, < 2.a)
|
||||
mini_mime (~> 1.0)
|
||||
@@ -214,24 +223,25 @@ GEM
|
||||
jwt (2.7.1)
|
||||
mini_magick (4.12.0)
|
||||
mini_mime (1.1.5)
|
||||
mini_portile2 (2.8.4)
|
||||
mini_portile2 (2.8.5)
|
||||
minitest (5.20.0)
|
||||
molinillo (0.8.0)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.3.0)
|
||||
mutex_m (0.2.0)
|
||||
nanaimo (0.3.0)
|
||||
nap (1.1.0)
|
||||
naturally (2.2.1)
|
||||
netrc (0.11.0)
|
||||
nokogiri (1.15.4)
|
||||
nokogiri (1.15.5)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
optparse (0.1.1)
|
||||
os (1.1.4)
|
||||
plist (3.7.0)
|
||||
public_suffix (4.0.7)
|
||||
racc (1.7.1)
|
||||
rake (13.0.6)
|
||||
racc (1.7.3)
|
||||
rake (13.1.0)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
@@ -251,11 +261,11 @@ GEM
|
||||
simctl (1.6.10)
|
||||
CFPropertyList
|
||||
naturally
|
||||
slather (2.7.4)
|
||||
slather (2.8.0)
|
||||
CFPropertyList (>= 2.2, < 4)
|
||||
activesupport
|
||||
clamp (~> 1.3)
|
||||
nokogiri (>= 1.13.9)
|
||||
nokogiri (>= 1.14.3)
|
||||
xcodeproj (~> 1.21)
|
||||
terminal-notifier (2.0.0)
|
||||
terminal-table (3.0.2)
|
||||
@@ -265,15 +275,12 @@ GEM
|
||||
tty-screen (0.8.1)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
typhoeus (1.4.0)
|
||||
typhoeus (1.4.1)
|
||||
ethon (>= 0.9.0)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
uber (0.1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8.2)
|
||||
unicode-display_width (2.4.2)
|
||||
unicode-display_width (2.5.0)
|
||||
webrick (1.8.1)
|
||||
word_wrap (1.0.0)
|
||||
xcode-install (2.8.1)
|
||||
@@ -295,7 +302,7 @@ PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
cocoapods (~> 1.13.0)
|
||||
cocoapods (~> 1.14.3)
|
||||
fastlane
|
||||
fastlane-plugin-sentry
|
||||
fastlane-plugin-versioning
|
||||
|
||||
6
Podfile
6
Podfile
@@ -16,7 +16,7 @@ use_frameworks!
|
||||
# - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI
|
||||
#
|
||||
# Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
|
||||
$matrixSDKVersion = '= 0.27.4'
|
||||
$matrixSDKVersion = '= 0.27.5'
|
||||
# $matrixSDKVersion = :local
|
||||
# $matrixSDKVersion = { :branch => 'develop'}
|
||||
# $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } }
|
||||
@@ -43,7 +43,7 @@ when String # specific MatrixSDK released version
|
||||
$matrixSDKVersionSpec = $matrixSDKVersion
|
||||
end
|
||||
|
||||
$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.13.0_RC02' }
|
||||
$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.15.0_BWI01' }
|
||||
|
||||
# Method to import the MatrixSDK
|
||||
def import_MatrixSDK
|
||||
@@ -214,7 +214,7 @@ abstract_target 'RiotPods' do
|
||||
end
|
||||
|
||||
# Disabled due to crypto corruption issues.
|
||||
# https://github.com/vector-im/element-ios/issues/7618
|
||||
# https://github.com/element-hq/element-ios/issues/7618
|
||||
# target "RiotShareExtension" do
|
||||
# import_MatrixSDK
|
||||
# import_MatrixKit_pods
|
||||
|
||||
18
Podfile.lock
18
Podfile.lock
@@ -39,9 +39,9 @@ PODS:
|
||||
- LoggerAPI (1.9.200):
|
||||
- Logging (~> 1.1)
|
||||
- Logging (1.4.0)
|
||||
- MatrixSDK (0.27.4):
|
||||
- MatrixSDK/Core (= 0.27.4)
|
||||
- MatrixSDK/Core (0.27.4):
|
||||
- MatrixSDK (0.27.5):
|
||||
- MatrixSDK/Core (= 0.27.5)
|
||||
- MatrixSDK/Core (0.27.5):
|
||||
- AFNetworking (~> 4.0.0)
|
||||
- GZIP (~> 1.3.0)
|
||||
- libbase58 (~> 0.1.4)
|
||||
@@ -49,7 +49,7 @@ PODS:
|
||||
- OLMKit (~> 3.2.5)
|
||||
- Realm (= 10.27.0)
|
||||
- SwiftyBeaver (= 1.9.5)
|
||||
- MatrixSDK/JingleCallStack (0.27.4):
|
||||
- MatrixSDK/JingleCallStack (0.27.5):
|
||||
- JitsiMeetSDKLite (= 8.1.2-lite)
|
||||
- MatrixSDK/Core
|
||||
- MatrixSDKCrypto (0.3.13)
|
||||
@@ -102,8 +102,8 @@ DEPENDENCIES:
|
||||
- KeychainAccess (~> 4.2.2)
|
||||
- KTCenterFlowLayout (~> 1.3.1)
|
||||
- libPhoneNumber-iOS (~> 0.9.13)
|
||||
- MatrixSDK (= 0.27.4)
|
||||
- MatrixSDK/JingleCallStack (= 0.27.4)
|
||||
- MatrixSDK (= 0.27.5)
|
||||
- MatrixSDK/JingleCallStack (= 0.27.5)
|
||||
- OLMKit
|
||||
- PostHog (~> 2.0.0)
|
||||
- ReadMoreTextView (~> 3.0.1)
|
||||
@@ -187,7 +187,7 @@ SPEC CHECKSUMS:
|
||||
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
|
||||
LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
|
||||
Logging: beeb016c9c80cf77042d62e83495816847ef108b
|
||||
MatrixSDK: da1df31afa59611ec7251ec419a2ceca6d41c7c4
|
||||
MatrixSDK: f92ffead50eda83c99786afefed9be739987f338
|
||||
MatrixSDKCrypto: bf08b72f2cd015d8749420a2b8b92fc0536bedf4
|
||||
OLMKit: da115f16582e47626616874e20f7bb92222c7a51
|
||||
PostHog: 660ec6c9d80cec17b685e148f17f6785a88b597d
|
||||
@@ -208,6 +208,6 @@ SPEC CHECKSUMS:
|
||||
zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
|
||||
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
|
||||
|
||||
PODFILE CHECKSUM: 3b328f8bb8500a6dd81136ab8a065e7434959805
|
||||
PODFILE CHECKSUM: dd877be9e7d8dbc03dfcb3372d76e2eb0bdfbc34
|
||||
|
||||
COCOAPODS: 1.13.0
|
||||
COCOAPODS: 1.14.3
|
||||
|
||||
11
Riot/Assets/be.lproj/InfoPlist.strings
Normal file
11
Riot/Assets/be.lproj/InfoPlist.strings
Normal file
@@ -0,0 +1,11 @@
|
||||
|
||||
|
||||
// Permissions usage explanations
|
||||
"NSCameraUsageDescription" = "Камера выкарыстоўваецца для відэазванкоў, запісу або загрузкі фота і відэа.";
|
||||
"NSPhotoLibraryUsageDescription" = "Дайце доступ да фатаграфій, каб выгружаць здымкі і відэа са сваёй бібліятэкі.";
|
||||
"NSMicrophoneUsageDescription" = "Element патрабуе доступ да вашага мікрафона, каб здзяйсняць і прымаць выклікі, здымаць відэа і запісваць галасавыя паведамленні.";
|
||||
"NSContactsUsageDescription" = "Яны будуць перададзеныя вашаму серверу ідэнтыфікацыі, каб дапамагчы знайсці вашыя кантакты на Matrix.";
|
||||
"NSCalendarsUsageDescription" = "Праглядайце свае запланаваныя сустрэчы ў праграме.";
|
||||
"NSFaceIDUsageDescription" = "Face ID выкарыстоўваецца для доступу да праграмы.";
|
||||
"NSLocationWhenInUseUsageDescription" = "Калі вы паведамляеце людзям сваё месцазнаходжанне, Element патрэбен доступ, каб паказаць ім карту.";
|
||||
"NSLocationAlwaysAndWhenInUseUsageDescription" = "Калі вы паведамляеце людзям сваё месцазнаходжанне, Element патрэбен доступ, каб паказаць ім карту.";
|
||||
10
Riot/Assets/be.lproj/Localizable.strings
Normal file
10
Riot/Assets/be.lproj/Localizable.strings
Normal file
@@ -0,0 +1,10 @@
|
||||
|
||||
|
||||
/** General **/
|
||||
|
||||
"Notification" = "Апавяшчэнне";
|
||||
|
||||
/** Titles **/
|
||||
|
||||
/* Message title for a specific person in a named room */
|
||||
"MSG_FROM_USER_IN_ROOM_TITLE" = "%@ у %@";
|
||||
1
Riot/Assets/be.lproj/Vector.strings
Normal file
1
Riot/Assets/be.lproj/Vector.strings
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
1
Riot/Assets/ka.lproj/Vector.strings
Normal file
1
Riot/Assets/ka.lproj/Vector.strings
Normal file
@@ -0,0 +1 @@
|
||||
|
||||
@@ -26,6 +26,27 @@
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div>
|
||||
<p>
|
||||
<b>Version 2.14.0</b>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<b>Verbesserungen</b>
|
||||
<ul>
|
||||
<li/>Du kannst jetzt den neuen WYSIWYG Editor in den Einstellungen ein- und ausschalten
|
||||
<li/>In den Nutzerdetails wird die ID des Nutzers angezeigt.
|
||||
</ul>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<b>Behobene Bugs</b>
|
||||
<ul>
|
||||
<li/>Die Copyrighthinweise in den Landkarten werden korrekt angezeigt.
|
||||
<li/>
|
||||
</ul>
|
||||
</p>
|
||||
</div>
|
||||
<div>
|
||||
<p>
|
||||
<b>Version 2.12.1</b>
|
||||
|
||||
@@ -1703,7 +1703,7 @@
|
||||
|
||||
<li>
|
||||
<b>swift-ogg</b> (<a
|
||||
href="https://github.com/vector-im/swift-ogg">https://github.com/vector-im/swift-ogg</a>)
|
||||
href="https://github.com/element-hq/swift-ogg">https://github.com/element-hq/swift-ogg</a>)
|
||||
<p>Makes use of code from 5 frameworks:<br/></p>
|
||||
<ul>
|
||||
<li>
|
||||
|
||||
@@ -26,7 +26,7 @@ targets:
|
||||
|
||||
dependencies:
|
||||
# Disabled due to crypto corruption issues.
|
||||
# https://github.com/vector-im/element-ios/issues/7618
|
||||
# https://github.com/element-hq/element-ios/issues/7618
|
||||
# - target: RiotShareExtension
|
||||
# - target: SiriIntents // BWI: disabled
|
||||
- target: RiotNSE
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{# iOS Repositories #}
|
||||
{%- set gh_sdk = "https://github.com/matrix-org/matrix-ios-sdk" -%}
|
||||
{%- set gh_kit = "https://github.com/matrix-org/matrix-ios-kit" -%}
|
||||
{%- set gh_element = "https://github.com/vector-im/element-ios" -%}
|
||||
{%- set gh_element = "https://github.com/element-hq/element-ios" -%}
|
||||
|
||||
## {{ versiondata.name }} {{ versiondata.version }} ({{ versiondata.date }})
|
||||
{% for section, _ in sections.items() %}
|
||||
|
||||
@@ -14,4 +14,4 @@ Various features of Element iOS can be enabled/disabled/configured via flags in
|
||||
|
||||
The themes used in Element iOS can be found in `Riot/Managers/Theme/Themes`. A newer theming system is available as nested `colors` and `fonts` properties on these themes and can be found in `DesignKit/Variants/Colors` and `DesignKit/Variants/Fonts` respectively. The newer system is used for screens built in UIKit with Swift and all of the SwiftUI screens.
|
||||
|
||||
For logos, they're currently regular assets that can be found either in [Images.xcassets](https://github.com/vector-im/element-ios/tree/develop/Riot/Assets/Images.xcassets) or [SharedImages.xcassets](https://github.com/vector-im/element-ios/tree/develop/Riot/Assets/SharedImages.xcassets).
|
||||
For logos, they're currently regular assets that can be found either in [Images.xcassets](https://github.com/element-hq/element-ios/tree/develop/Riot/Assets/Images.xcassets) or [SharedImages.xcassets](https://github.com/element-hq/element-ios/tree/develop/Riot/Assets/SharedImages.xcassets).
|
||||
|
||||
@@ -42,7 +42,7 @@ include:
|
||||
- path: CommonKit/target.yml
|
||||
- path: CommonKit/targetUnitTests.yml
|
||||
# Disabled due to crypto corruption issues.
|
||||
# https://github.com/vector-im/element-ios/issues/7618
|
||||
# https://github.com/element-hq/element-ios/issues/7618
|
||||
# - path: RiotShareExtension/target.yml
|
||||
# - path: SiriIntents/target.yml
|
||||
|
||||
@@ -59,7 +59,7 @@ packages:
|
||||
minVersion: 1.0.2
|
||||
maxVersion: 2.0.0
|
||||
SwiftOGG:
|
||||
url: https://github.com/vector-im/swift-ogg
|
||||
url: https://github.com/element-hq/swift-ogg
|
||||
branch: 0.0.1
|
||||
Lottie:
|
||||
url: https://github.com/airbnb/lottie-ios.git
|
||||
@@ -67,7 +67,7 @@ packages:
|
||||
maxVersion: 3.5.0
|
||||
WysiwygComposer:
|
||||
url: https://github.com/matrix-org/matrix-wysiwyg-composer-swift
|
||||
version: 2.18.0
|
||||
version: 2.19.0
|
||||
DeviceKit:
|
||||
url: https://github.com/devicekit/DeviceKit
|
||||
majorVersion: 4.7.0
|
||||
|
||||
Reference in New Issue
Block a user