From 9bd03be7c972b6f530be33eefc4a541ea866b123 Mon Sep 17 00:00:00 2001 From: Doug Date: Tue, 28 Nov 2023 11:48:06 +0000 Subject: [PATCH 01/19] Prepare for new sprint --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 2d558a1be..3954513c8 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.5 -CURRENT_PROJECT_VERSION = 1.11.5 +MARKETING_VERSION = 1.11.6 +CURRENT_PROJECT_VERSION = 1.11.6 From 902aa7b29d2ed978f30776f2bceddf87dacab779 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Tue, 28 Nov 2023 13:04:46 +0000 Subject: [PATCH 02/19] Update CocoaPods and other gems. (#7720) --- Gemfile | 2 +- Gemfile.lock | 83 +++++++++++++++++++++------------------ changelog.d/pr-7720.build | 1 + 3 files changed, 47 insertions(+), 39 deletions(-) create mode 100644 changelog.d/pr-7720.build diff --git a/Gemfile b/Gemfile index a34178384..b70f43aed 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "xcode-install" gem "fastlane" -gem "cocoapods", '~>1.13.0' +gem "cocoapods", '~>1.14.3' gem "slather" plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') diff --git a/Gemfile.lock b/Gemfile.lock index 851230fb3..02bb36363 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,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) @@ -21,31 +26,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) @@ -58,7 +65,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) @@ -69,7 +76,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) @@ -82,17 +89,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) @@ -122,7 +131,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) @@ -163,18 +172,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) @@ -187,19 +196,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) @@ -220,24 +229,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) @@ -257,11 +267,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) @@ -271,15 +281,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) @@ -301,7 +308,7 @@ PLATFORMS ruby DEPENDENCIES - cocoapods (~> 1.13.0) + cocoapods (~> 1.14.3) fastlane fastlane-plugin-diawi! fastlane-plugin-sentry diff --git a/changelog.d/pr-7720.build b/changelog.d/pr-7720.build new file mode 100644 index 000000000..bbde692d8 --- /dev/null +++ b/changelog.d/pr-7720.build @@ -0,0 +1 @@ +Update CocoaPods and other gems. \ No newline at end of file From 69de10cde145dae96d426b380f243c67a572a3be Mon Sep 17 00:00:00 2001 From: Nicolas Mauri Date: Thu, 30 Nov 2023 10:10:54 +0100 Subject: [PATCH 03/19] Update RTE to 2.19.0 --- Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- project.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved index 28fdda2b1..f406af44f 100644 --- a/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/matrix-org/matrix-wysiwyg-composer-swift", "state" : { - "revision" : "dfb74c89bf54b41ea000d564d6435ac6444ba6b4", - "version" : "2.18.0" + "revision" : "0aa1308c43451fd077e332f72d6a32135f258834", + "version" : "2.19.0" } }, { diff --git a/project.yml b/project.yml index a2f34eaa1..ede1f081d 100644 --- a/project.yml +++ b/project.yml @@ -59,7 +59,7 @@ packages: branch: 0.0.1 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 From 358a6e9f7045b6cb88d18de02efedafbbf926ace Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Wed, 13 Dec 2023 11:46:27 +0000 Subject: [PATCH 04/19] Update most references of vector-im to element-hq (#7725) Ignoring code comments as the codebase is old and redirects exist. Might be some Sonarcloud updates to follow. --- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/triage-incoming.yml | 2 +- .github/workflows/triage-move-labelled.yml | 16 ++++++++-------- .github/workflows/triage-review-requests.yml | 4 ++-- CONTRIBUTING.md | 4 ++-- Podfile | 2 +- README.md | 8 ++++---- Riot/Assets/third_party_licenses.html | 2 +- Riot/target.yml | 2 +- changelog.d/_template.md.jinja | 2 +- docs/Customisation.md | 2 +- project.yml | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 8cbef5ecc..d781e5b54 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -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 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index d9c3901ec..5f0301a80 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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 diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml index ec714e255..11f3280cc 100644 --- a/.github/workflows/triage-incoming.yml +++ b/.github/workflows/triage-incoming.yml @@ -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: diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml index 130326b3d..428257142 100644 --- a/.github/workflows/triage-move-labelled.yml +++ b/.github/workflows/triage-move-labelled.yml @@ -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 }} diff --git a/.github/workflows/triage-review-requests.yml b/.github/workflows/triage-review-requests.yml index 0b13eb873..d5396d48e 100644 --- a/.github/workflows/triage-review-requests.yml +++ b/.github/workflows/triage-review-requests.yml @@ -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 { diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 17281c521..cedae9e45 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/Podfile b/Podfile index 1fc0d1783..b93183667 100644 --- a/Podfile +++ b/Podfile @@ -122,7 +122,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 diff --git a/README.md b/README.md index aaa6fb5d9..8ebf0f2c6 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # Element iOS -![GitHub release (latest by date)](https://img.shields.io/github/v/release/vector-im/element-ios) +![GitHub release (latest by date)](https://img.shields.io/github/v/release/element-hq/element-ios) ![badge-languages](https://img.shields.io/badge/languages-Swift%20%7C%20ObjC-orange.svg) [![Swift 5.x](https://img.shields.io/badge/Swift-5.x-orange)](https://developer.apple.com/swift) [![Build status](https://badge.buildkite.com/cc8f93e32da93fa7c1172398bd8af66254490567c7195a5f3f.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-ios/builds?branch=develop) [![Weblate](https://translate.riot.im/widgets/riot-ios/-/svg-badge.svg)](https://translate.riot.im/engage/riot-ios/?utm_source=widget) -[![codecov](https://codecov.io/gh/vector-im/element-ios/branch/develop/graph/badge.svg?token=INNm5o6XWg)](https://codecov.io/gh/vector-im/element-ios) +[![codecov](https://codecov.io/gh/element-hq/element-ios/branch/develop/graph/badge.svg?token=INNm5o6XWg)](https://codecov.io/gh/element-hq/element-ios) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=bugs)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) [![Element iOS Matrix room #element-ios:matrix.org](https://img.shields.io/matrix/element-ios:matrix.org.svg?label=%23element-ios:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-ios:matrix.org) -![GitHub](https://img.shields.io/github/license/vector-im/element-ios) +![GitHub](https://img.shields.io/github/license/element-hq/element-ios) [![Twitter URL](https://img.shields.io/twitter/url?label=Element&url=https%3A%2F%2Ftwitter.com%2Felement_hq)](https://twitter.com/element_hq) Element iOS is an iOS [Matrix](https://matrix.org/) client provided by [Element](https://element.io/). It is based on [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk). @@ -43,7 +43,7 @@ If you want to contribute to Element iOS code or translations, go to the [contri ## Support -When you are experiencing an issue on Element iOS, please first search in [GitHub issues](https://github.com/vector-im/element-ios/issues) +When you are experiencing an issue on Element iOS, please first search in [GitHub issues](https://github.com/element-hq/element-ios/issues) and then in [#element-ios:matrix.org](https://matrix.to/#/#element-ios:matrix.org). If after your research you still have a question, ask at [#element-ios:matrix.org](https://matrix.to/#/#element-ios:matrix.org). Otherwise feel free to create a GitHub issue if you encounter a bug or a crash, by explaining clearly in detail what happened. You can also perform bug reporting (Rageshake) from the Element application by shaking your phone or going to the application settings. This is especially recommended when you encounter a crash. diff --git a/Riot/Assets/third_party_licenses.html b/Riot/Assets/third_party_licenses.html index ebd5e6b11..edaf6ab3c 100644 --- a/Riot/Assets/third_party_licenses.html +++ b/Riot/Assets/third_party_licenses.html @@ -1703,7 +1703,7 @@
  • swift-ogg (https://github.com/vector-im/swift-ogg) + href="https://github.com/element-hq/swift-ogg">https://github.com/element-hq/swift-ogg)

    Makes use of code from 5 frameworks:

    • diff --git a/Riot/target.yml b/Riot/target.yml index 929af6e3a..352988bf3 100644 --- a/Riot/target.yml +++ b/Riot/target.yml @@ -35,7 +35,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 - target: RiotNSE diff --git a/changelog.d/_template.md.jinja b/changelog.d/_template.md.jinja index a0b2dd9ee..28b6579a6 100644 --- a/changelog.d/_template.md.jinja +++ b/changelog.d/_template.md.jinja @@ -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() %} diff --git a/docs/Customisation.md b/docs/Customisation.md index b3de09469..abca2970d 100644 --- a/docs/Customisation.md +++ b/docs/Customisation.md @@ -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). diff --git a/project.yml b/project.yml index ede1f081d..55f31044e 100644 --- a/project.yml +++ b/project.yml @@ -38,7 +38,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 @@ -55,7 +55,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 WysiwygComposer: url: https://github.com/matrix-org/matrix-wysiwyg-composer-swift From 90e252bbbe0e7894a35ab26921fc6ab6bc4d66f5 Mon Sep 17 00:00:00 2001 From: Maksim Kliazovich Date: Fri, 1 Dec 2023 01:58:03 +0000 Subject: [PATCH 05/19] Added translation using Weblate (Belarusian) --- Riot/Assets/be.lproj/Vector.strings | 1 + 1 file changed, 1 insertion(+) create mode 100644 Riot/Assets/be.lproj/Vector.strings diff --git a/Riot/Assets/be.lproj/Vector.strings b/Riot/Assets/be.lproj/Vector.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Riot/Assets/be.lproj/Vector.strings @@ -0,0 +1 @@ + From e1bfbc959ad01b7d4f2099758a0c60c0f38b1ec2 Mon Sep 17 00:00:00 2001 From: Bubanio85 Date: Wed, 13 Dec 2023 12:38:59 +0000 Subject: [PATCH 06/19] Translated using Weblate (German) Currently translated at 99.9% (2415 of 2416 strings) Translation: Element iOS/Element iOS Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios/de/ --- Riot/Assets/de.lproj/Vector.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings index 80eb95172..f9e3aad1c 100644 --- a/Riot/Assets/de.lproj/Vector.strings +++ b/Riot/Assets/de.lproj/Vector.strings @@ -1254,7 +1254,7 @@ "bug_report_background_mode" = "Im Hintergrund fortfahren"; "social_login_button_title_sign_up" = "Registrieren mit %@"; "social_login_button_title_sign_in" = "Anmelden mit %@"; -"social_login_button_title_continue" = "Weiter mit %@"; +"social_login_button_title_continue" = "Weiter mit der Anmeldung"; "social_login_list_title_sign_up" = "Oder"; "social_login_list_title_sign_in" = "Oder"; From 002a7d4da877e091f9ae4fb0f4b885983769a02d Mon Sep 17 00:00:00 2001 From: Mary Ghelaghutashvili Date: Thu, 4 Jan 2024 15:11:36 +0000 Subject: [PATCH 07/19] Added translation using Weblate (Georgian) --- Riot/Assets/ka.lproj/Vector.strings | 1 + 1 file changed, 1 insertion(+) create mode 100644 Riot/Assets/ka.lproj/Vector.strings diff --git a/Riot/Assets/ka.lproj/Vector.strings b/Riot/Assets/ka.lproj/Vector.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Riot/Assets/ka.lproj/Vector.strings @@ -0,0 +1 @@ + From 60142dc7117073d805b07357c8e32fa70ecf0691 Mon Sep 17 00:00:00 2001 From: Maksim Kliazovich Date: Fri, 1 Dec 2023 02:06:24 +0000 Subject: [PATCH 08/19] Added translation using Weblate (Belarusian) --- Riot/Assets/be.lproj/Localizable.strings | 1 + 1 file changed, 1 insertion(+) create mode 100644 Riot/Assets/be.lproj/Localizable.strings diff --git a/Riot/Assets/be.lproj/Localizable.strings b/Riot/Assets/be.lproj/Localizable.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Riot/Assets/be.lproj/Localizable.strings @@ -0,0 +1 @@ + From cc2d34d8e822029f98d5f9c7fbee27530f00afc0 Mon Sep 17 00:00:00 2001 From: Maksim Kliazovich Date: Fri, 1 Dec 2023 02:13:51 +0000 Subject: [PATCH 09/19] Translated using Weblate (Belarusian) Currently translated at 4.0% (2 of 50 strings) Translation: Element iOS/Element iOS (Push) Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/be/ --- Riot/Assets/be.lproj/Localizable.strings | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Riot/Assets/be.lproj/Localizable.strings b/Riot/Assets/be.lproj/Localizable.strings index 8b1378917..557dbee9b 100644 --- a/Riot/Assets/be.lproj/Localizable.strings +++ b/Riot/Assets/be.lproj/Localizable.strings @@ -1 +1,10 @@ + +/** General **/ + +"Notification" = "Апавяшчэнне"; + +/** Titles **/ + +/* Message title for a specific person in a named room */ +"MSG_FROM_USER_IN_ROOM_TITLE" = "%@ у %@"; From 0d3acffaebcc48543172130c09fcfd06d1ef862d Mon Sep 17 00:00:00 2001 From: Maksim Kliazovich Date: Fri, 1 Dec 2023 02:06:36 +0000 Subject: [PATCH 10/19] Added translation using Weblate (Belarusian) --- Riot/Assets/be.lproj/InfoPlist.strings | 1 + 1 file changed, 1 insertion(+) create mode 100644 Riot/Assets/be.lproj/InfoPlist.strings diff --git a/Riot/Assets/be.lproj/InfoPlist.strings b/Riot/Assets/be.lproj/InfoPlist.strings new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Riot/Assets/be.lproj/InfoPlist.strings @@ -0,0 +1 @@ + From ea3fd476fb4bac85d30047085f2dc71250547896 Mon Sep 17 00:00:00 2001 From: Maksim Kliazovich Date: Fri, 1 Dec 2023 02:08:29 +0000 Subject: [PATCH 11/19] Translated using Weblate (Belarusian) Currently translated at 100.0% (8 of 8 strings) Translation: Element iOS/Element iOS (Dialogs) Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/be/ --- Riot/Assets/be.lproj/InfoPlist.strings | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Riot/Assets/be.lproj/InfoPlist.strings b/Riot/Assets/be.lproj/InfoPlist.strings index 8b1378917..3dd0059c8 100644 --- a/Riot/Assets/be.lproj/InfoPlist.strings +++ b/Riot/Assets/be.lproj/InfoPlist.strings @@ -1 +1,11 @@ + +// Permissions usage explanations +"NSCameraUsageDescription" = "Камера выкарыстоўваецца для відэазванкоў, запісу або загрузкі фота і відэа."; +"NSPhotoLibraryUsageDescription" = "Дайце доступ да фатаграфій, каб выгружаць здымкі і відэа са сваёй бібліятэкі."; +"NSMicrophoneUsageDescription" = "Element патрабуе доступ да вашага мікрафона, каб здзяйсняць і прымаць выклікі, здымаць відэа і запісваць галасавыя паведамленні."; +"NSContactsUsageDescription" = "Яны будуць перададзеныя вашаму серверу ідэнтыфікацыі, каб дапамагчы знайсці вашыя кантакты на Matrix."; +"NSCalendarsUsageDescription" = "Праглядайце свае запланаваныя сустрэчы ў праграме."; +"NSFaceIDUsageDescription" = "Face ID выкарыстоўваецца для доступу да праграмы."; +"NSLocationWhenInUseUsageDescription" = "Калі вы паведамляеце людзям сваё месцазнаходжанне, Element патрэбен доступ, каб паказаць ім карту."; +"NSLocationAlwaysAndWhenInUseUsageDescription" = "Калі вы паведамляеце людзям сваё месцазнаходжанне, Element патрэбен доступ, каб паказаць ім карту."; From da44ecae3fab36f3f194931b3459cfca4050f8d3 Mon Sep 17 00:00:00 2001 From: Mauro <34335419+Velin92@users.noreply.github.com> Date: Tue, 9 Jan 2024 11:53:24 +0100 Subject: [PATCH 12/19] Discard changes to Riot/Assets/de.lproj/Vector.strings --- Riot/Assets/de.lproj/Vector.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Riot/Assets/de.lproj/Vector.strings b/Riot/Assets/de.lproj/Vector.strings index f9e3aad1c..80eb95172 100644 --- a/Riot/Assets/de.lproj/Vector.strings +++ b/Riot/Assets/de.lproj/Vector.strings @@ -1254,7 +1254,7 @@ "bug_report_background_mode" = "Im Hintergrund fortfahren"; "social_login_button_title_sign_up" = "Registrieren mit %@"; "social_login_button_title_sign_in" = "Anmelden mit %@"; -"social_login_button_title_continue" = "Weiter mit der Anmeldung"; +"social_login_button_title_continue" = "Weiter mit %@"; "social_login_list_title_sign_up" = "Oder"; "social_login_list_title_sign_in" = "Oder"; From e2b72f7f0b1ac72357dedbcfe242973c7fff5a0a Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 9 Jan 2024 13:09:44 +0100 Subject: [PATCH 13/19] changelog.d: Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)). --- Podfile | 2 +- changelog.d/x-nolink-0.change | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/x-nolink-0.change diff --git a/Podfile b/Podfile index b93183667..4905b302d 100644 --- a/Podfile +++ b/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' } } diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change new file mode 100644 index 000000000..7c01e4f7c --- /dev/null +++ b/changelog.d/x-nolink-0.change @@ -0,0 +1 @@ +Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)). \ No newline at end of file From 6104193326ea7171d328ebf4cfcc061ea3a58a3d Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 9 Jan 2024 13:09:44 +0100 Subject: [PATCH 14/19] version++ --- CHANGES.md | 11 +++++++++++ changelog.d/pr-7720.build | 1 - changelog.d/x-nolink-0.change | 1 - 3 files changed, 11 insertions(+), 2 deletions(-) delete mode 100644 changelog.d/pr-7720.build delete mode 100644 changelog.d/x-nolink-0.change diff --git a/CHANGES.md b/CHANGES.md index 135aeacc0..b2a673e09 100644 --- a/CHANGES.md +++ b/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 diff --git a/changelog.d/pr-7720.build b/changelog.d/pr-7720.build deleted file mode 100644 index bbde692d8..000000000 --- a/changelog.d/pr-7720.build +++ /dev/null @@ -1 +0,0 @@ -Update CocoaPods and other gems. \ No newline at end of file diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change deleted file mode 100644 index 7c01e4f7c..000000000 --- a/changelog.d/x-nolink-0.change +++ /dev/null @@ -1 +0,0 @@ -Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5)). \ No newline at end of file From 065b6a5fd2a7d22325794f7ede6fe4657b480f79 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 9 Jan 2024 14:41:11 +0100 Subject: [PATCH 15/19] finish version++ --- Podfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 2ecd7f65e..68fc740a5 100644 --- a/Podfile.lock +++ b/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 From 8e1c4aa1dcc4ab25bbc916debaea592f8e71bf63 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Mon, 29 Jan 2024 12:06:51 +0100 Subject: [PATCH 16/19] Resolve conflicts on Rebase/Element-v1.11.6 into Tchap --- .github/PULL_REQUEST_TEMPLATE.md | 4 ---- Config/AppVersion.xcconfig | 5 ----- Podfile.lock | 6 +----- README.md | 21 --------------------- changelog.d/_template.md.jinja | 4 ---- 5 files changed, 1 insertion(+), 39 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index ed94a2b01..67175fb4d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,10 +1,6 @@ ### Pull Request Checklist -<<<<<<< HEAD - [ ] I read the [contributing guide](https://github.com/tchapgouv/tchap-ios/blob/develop/CONTRIBUTING.md) -======= -- [ ] I read the [contributing guide](https://github.com/element-hq/element-ios/blob/develop/CONTRIBUTING.md) ->>>>>>> v1.11.6 - [ ] 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 diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 2ffb936a8..458311831 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,10 +15,5 @@ // // Version -<<<<<<< HEAD MARKETING_VERSION = 2.6.2 CURRENT_PROJECT_VERSION = 1 -======= -MARKETING_VERSION = 1.11.6 -CURRENT_PROJECT_VERSION = 1.11.6 ->>>>>>> v1.11.6 diff --git a/Podfile.lock b/Podfile.lock index 9240ad700..9944489d3 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -208,10 +208,6 @@ SPEC CHECKSUMS: zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb -<<<<<<< HEAD -PODFILE CHECKSUM: 0560928a7fc299ce39d2e89597ba3e6cc2056bea -======= -PODFILE CHECKSUM: dd877be9e7d8dbc03dfcb3372d76e2eb0bdfbc34 ->>>>>>> v1.11.6 +PODFILE CHECKSUM: a6293c739492b4ee2d4697abbb601e7c92729aea COCOAPODS: 1.14.3 diff --git a/README.md b/README.md index 05c4cf701..9dfedfb17 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,9 @@ # Tchap iOS -<<<<<<< HEAD ![GitHub release (latest by date)](https://img.shields.io/github/v/release/dinsic-pim/tchap-ios) ![badge-languages](https://img.shields.io/badge/languages-Swift%20%7C%20ObjC-orange.svg) [![Swift 5.x](https://img.shields.io/badge/Swift-5.x-orange)](https://developer.apple.com/swift) ![GitHub](https://img.shields.io/github/license/dinsic-pim/tchap-ios) -======= -![GitHub release (latest by date)](https://img.shields.io/github/v/release/element-hq/element-ios) -![badge-languages](https://img.shields.io/badge/languages-Swift%20%7C%20ObjC-orange.svg) -[![Swift 5.x](https://img.shields.io/badge/Swift-5.x-orange)](https://developer.apple.com/swift) -[![Build status](https://badge.buildkite.com/cc8f93e32da93fa7c1172398bd8af66254490567c7195a5f3f.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-ios/builds?branch=develop) -[![Weblate](https://translate.riot.im/widgets/riot-ios/-/svg-badge.svg)](https://translate.riot.im/engage/riot-ios/?utm_source=widget) -[![codecov](https://codecov.io/gh/element-hq/element-ios/branch/develop/graph/badge.svg?token=INNm5o6XWg)](https://codecov.io/gh/element-hq/element-ios) -[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) -[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=bugs)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) -[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-ios&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=vector-im_element-ios) -[![Element iOS Matrix room #element-ios:matrix.org](https://img.shields.io/matrix/element-ios:matrix.org.svg?label=%23element-ios:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-ios:matrix.org) -![GitHub](https://img.shields.io/github/license/element-hq/element-ios) -[![Twitter URL](https://img.shields.io/twitter/url?label=Element&url=https%3A%2F%2Ftwitter.com%2Felement_hq)](https://twitter.com/element_hq) ->>>>>>> v1.11.6 Tchap iOS is an iOS [Matrix](https://matrix.org/) client. It is based on [MatrixSDK](https://github.com/matrix-org/matrix-ios-sdk). @@ -50,13 +35,7 @@ If you want to contribute to Tchap iOS code please refer to the [contribution gu ## Support -<<<<<<< HEAD When you are experiencing an issue on Tchap iOS, please first search in [GitHub issues](https://github.com/dinsic-pim/tchap-ios/issues). Otherwise feel free to create a GitHub issue if you encounter a bug or a crash, by explaining clearly in detail what happened. You can also perform bug reporting (Rageshake) from the Tchap application by shaking your phone or going to the application settings. This is especially recommended when you encounter a crash. -======= -When you are experiencing an issue on Element iOS, please first search in [GitHub issues](https://github.com/element-hq/element-ios/issues) -and then in [#element-ios:matrix.org](https://matrix.to/#/#element-ios:matrix.org). -If after your research you still have a question, ask at [#element-ios:matrix.org](https://matrix.to/#/#element-ios:matrix.org). Otherwise feel free to create a GitHub issue if you encounter a bug or a crash, by explaining clearly in detail what happened. You can also perform bug reporting (Rageshake) from the Element application by shaking your phone or going to the application settings. This is especially recommended when you encounter a crash. ->>>>>>> v1.11.6 ## Copyright & License diff --git a/changelog.d/_template.md.jinja b/changelog.d/_template.md.jinja index d2e25a1ef..31121bda2 100644 --- a/changelog.d/_template.md.jinja +++ b/changelog.d/_template.md.jinja @@ -1,11 +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" -%} -<<<<<<< HEAD {%- set gh_element = "https://github.com/tchapgouv/tchap-ios" -%} -======= -{%- set gh_element = "https://github.com/element-hq/element-ios" -%} ->>>>>>> v1.11.6 ## {{ versiondata.name }} {{ versiondata.version }} ({{ versiondata.date }}) {% for section, _ in sections.items() %} From decfab2a48a445f71113746a9c6c8c99b0fbd7d2 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Mon, 29 Jan 2024 14:58:29 +0100 Subject: [PATCH 17/19] Add changelog --- changelog.d/959.change | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/959.change diff --git a/changelog.d/959.change b/changelog.d/959.change new file mode 100644 index 000000000..05979bbd2 --- /dev/null +++ b/changelog.d/959.change @@ -0,0 +1 @@ +Rebase sur Element 1.11.6 \ No newline at end of file From c6f85b8af355ead9b35d709ad5c70cb9b7c8bfdd Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Mon, 29 Jan 2024 15:02:33 +0100 Subject: [PATCH 18/19] Fix changelog --- changelog.d/959.change | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.d/959.change b/changelog.d/959.change index 05979bbd2..c3dfa07f4 100644 --- a/changelog.d/959.change +++ b/changelog.d/959.change @@ -1 +1,2 @@ -Rebase sur Element 1.11.6 \ No newline at end of file +Rebase sur Element 1.11.6 +Possibilité d'utiliser des apostrophes dans les emails de login \ No newline at end of file From 42b9f1fb3680e25313415eacc77bbf8312484088 Mon Sep 17 00:00:00 2001 From: Nicolas Buquet Date: Mon, 29 Jan 2024 16:52:08 +0100 Subject: [PATCH 19/19] Push BuildSettings to targets RiotNSE and RiotShareExtension --- RiotNSE/BuildSettings.swift | 9 ++++++++- RiotShareExtension/BuildSettings.swift | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/RiotNSE/BuildSettings.swift b/RiotNSE/BuildSettings.swift index e5e60bd55..15bd01100 100644 --- a/RiotNSE/BuildSettings.swift +++ b/RiotNSE/BuildSettings.swift @@ -267,10 +267,17 @@ final class BuildSettings: NSObject { static let tchapFeatureNotificationByEmail = "tchapFeatureNotificationByEmail" static let tchapFeatureVoiceOverIP = "tchapFeatureVoiceOverIP" static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP" - static var tchapFeatureByHomeServer: [String: [String]] = [ + static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [ tchapFeatureNotificationByEmail: [ "agent.dinum.tchap.gouv.fr" + ], + tchapFeatureVoiceOverIP: [ + "agent.dinum.tchap.gouv.fr" ] + // No activation of video calls actually in Tchap Production. +// tchapFeatureVideoOverIP: [ +// "agent.dinum.tchap.gouv.fr" +// ], ] // MARK: - Side Menu diff --git a/RiotShareExtension/BuildSettings.swift b/RiotShareExtension/BuildSettings.swift index e5e60bd55..15bd01100 100644 --- a/RiotShareExtension/BuildSettings.swift +++ b/RiotShareExtension/BuildSettings.swift @@ -267,10 +267,17 @@ final class BuildSettings: NSObject { static let tchapFeatureNotificationByEmail = "tchapFeatureNotificationByEmail" static let tchapFeatureVoiceOverIP = "tchapFeatureVoiceOverIP" static let tchapFeatureVideoOverIP = "tchapFeatureVideoOverIP" - static var tchapFeatureByHomeServer: [String: [String]] = [ + static var tchapFeaturesAllowedHomeServersForFeature: [String: [String]] = [ tchapFeatureNotificationByEmail: [ "agent.dinum.tchap.gouv.fr" + ], + tchapFeatureVoiceOverIP: [ + "agent.dinum.tchap.gouv.fr" ] + // No activation of video calls actually in Tchap Production. +// tchapFeatureVideoOverIP: [ +// "agent.dinum.tchap.gouv.fr" +// ], ] // MARK: - Side Menu