Skip to content

Commit

Permalink
Merge pull request #2 from element-hq/bma/ci
Browse files Browse the repository at this point in the history
matrix-org -> element-hq
  • Loading branch information
bmarty authored Sep 26, 2024
2 parents b9fe58b + 79b9c70 commit 62dd9b3
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/triage-labelled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
# Skip in forks
if: >
github.repository == 'matrix-org/matrix-rich-text-editor'
github.repository == 'element-hq/matrix-rich-text-editor'
steps:
- uses: actions/github-script@v7
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@
# Swift release
WysiwygComposerFFI.xcframework.zip
matrix-rich-text-editor-swift

# tmp folder
/tmp
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Matrix Rich Text Editor
[![codecov](https://codecov.io/gh/matrix-org/matrix-rich-text-editor/branch/main/graph/badge.svg?token=UFBR3KtPdg)](https://codecov.io/gh/matrix-org/matrix-rich-text-editor)
![GitHub](https://img.shields.io/github/license/matrix-org/matrix-rich-text-editor)
[![codecov](https://codecov.io/gh/element-hq/matrix-rich-text-editor/branch/main/graph/badge.svg?token=UFBR3KtPdg)](https://codecov.io/gh/matrix-org/matrix-rich-text-editor)
![GitHub](https://img.shields.io/github/license/element-hq/matrix-rich-text-editor)

A cross-platform rich text editor intended for use in Matrix clients including
the Element clients.
Expand All @@ -10,12 +10,12 @@ and platform-specific wrappers.

__Important note:__ This project is still in an early stage. Minor versions could bring
breaking API changes, see [CHANGELOG.md](CHANGELOG.md) for details.
Bugs and crashes may occur, please report them [here](https://github.com/matrix-org/matrix-rich-text-editor/issues/new).
Bugs and crashes may occur, please report them [here](https://github.com/element-hq/matrix-rich-text-editor/issues/new).

## Live demo

Try it out at
[matrix-org.github.io/matrix-rich-text-editor](https://matrix-org.github.io/matrix-rich-text-editor/).
[element-hq.github.io/matrix-rich-text-editor](https://element-hq.github.io/matrix-rich-text-editor/).

## Building the code

Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ A workflow will automatically add the tag on main with the version provided in t
### Web

This should be done automatically when a tag is uploaded, but you can also manually launch the
[github action](https://github.com/matrix-org/matrix-wysiwyg/actions/workflows/publish.yml)
[github action](https://github.com/element-hq/matrix-rich-text-editor/actions/workflows/publish.yml)
which will package the code and upload it to NPM. It uses the version number
it finds in package.json, which you updated above.

Expand Down
4 changes: 2 additions & 2 deletions crates/matrix_mentions/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
authors = ["Jonny Andrew <[email protected]>"]
homepage = "https://github.com/matrix-org/matrix-rich-text-editor"
repository = "https://github.com/matrix-org/matrix-rich-text-editor"
homepage = "https://github.com/element-hq/matrix-rich-text-editor"
repository = "https://github.com/element-hq/matrix-rich-text-editor"
description = "Utilities for Matrix mentions"
keywords = ["matrix", "chat", "messaging"]
license = "AGPL-3.0"
Expand Down
12 changes: 6 additions & 6 deletions platforms/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,20 @@ GROUP=io.element.android
# POM_ARTIFACT_ID is configured in each module's gradle.properties
VERSION_NAME=2.37.9

POM_NAME=Matrix WYSIWYG
POM_NAME=Matrix Rich Text Editor
POM_DESCRIPTION=Cross-platform rich text editor that generates HTML output.
POM_INCEPTION_YEAR=2022
POM_URL=https://github.com/matrix-org/matrix-wysiwyg
POM_URL=https://github.com/element-hq/matrix-rich-text-editor

POM_LICENSE_NAME=GNU AFFERO GENERAL PUBLIC LICENSE
POM_LICENSE_URL=https://www.gnu.org/licenses/agpl-3.0.txt
POM_LICENSE_DIST=repo

POM_SCM_URL=https://github.com/matrix-org/matrix-wysiwyg
POM_SCM_CONNECTION=scm:git:git://github.com/matrix-org/matrix-wysiwyg.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://github.com/matrix-org/matrix-wysiwyg.git
POM_SCM_URL=https://github.com/element-hq/matrix-rich-text-editor
POM_SCM_CONNECTION=scm:git:git://github.com/element-hq/matrix-rich-text-editor.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://github.com/element-hq/matrix-rich-text-editor.git

POM_DEVELOPER_ID=matrixdev
POM_DEVELOPER_NAME=matrixdev
POM_DEVELOPER_URL=https://github.com/vector-im/
POM_DEVELOPER_URL=https://github.com/element-hq/
POM_DEVELOPER_EMAIL=[email protected]
2 changes: 1 addition & 1 deletion platforms/android/library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ android {
jacocoVersion = "0.8.8"
}

ndkVersion = "25.2.9519653"
ndkVersion = "27.1.12297006"

packagingOptions {
resources.excludes += 'META-INF/LICENSE.md'
Expand Down
2 changes: 1 addition & 1 deletion platforms/ios/tools/release/Sources/Release.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ struct Release: AsyncParsableCommand {

var apiToken = ProcessInfo.processInfo.environment["SWIFT_RELEASE_TOKEN"]!

var sourceRepo = Repository(owner: "matrix-org", name: "matrix-rich-text-editor")
var sourceRepo = Repository(owner: "element-hq", name: "matrix-rich-text-editor")
var packageRepo = Repository(owner: "matrix-org", name: "matrix-rich-text-editor-swift")

var buildDirectory = URL(filePath: #file)
Expand Down
2 changes: 1 addition & 1 deletion platforms/web/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# React Matrix Rich Text Editor

[![react-build](https://github.com/matrix-org/matrix-wysiwyg/actions/workflows/react-build.yml/badge.svg?branch=main)](https://github.com/matrix-org/matrix-wysiwyg/actions/workflows/react-build.yml)
[![react-build](https://github.com/element-hq/matrix-rich-text-editor/actions/workflows/react-build.yml/badge.svg?branch=main)](https://github.com/element-hq/matrix-rich-text-editor/actions/workflows/react-build.yml)

The Matrix Rich Text Editor is a React library.

Expand Down
2 changes: 1 addition & 1 deletion platforms/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"author": "matrix.org",
"repository": {
"type": "git",
"url": "https://github.com/matrix-org/matrix-wysiwyg"
"url": "https://github.com/element-hq/matrix-rich-text-editor"
},
"license": "AGPL-3.0",
"main": "./dist/matrix-wysiwyg.umd.cjs",
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sonar.projectKey=matrix-rich-text-editor
sonar.organization=matrix-org
sonar.organization=element-hq

# set the source code to be everything in /web/src/ and /web/lib/ folders
sonar.sources=platforms/web/src,platforms/web/lib
Expand Down

0 comments on commit 62dd9b3

Please sign in to comment.