Skip to content

Commit

Permalink
Merge pull request #1036 from cryptpad/gh-cryptpad-org
Browse files Browse the repository at this point in the history
Switch from XWiki labs to CryptPad organization
  • Loading branch information
Mathilde committed May 17, 2023
2 parents 3d9a2d6 + fd7219e commit a5d5dba
Show file tree
Hide file tree
Showing 12 changed files with 57 additions and 57 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_resolution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
attributes:
value: |
# Contribution guidelines
Please read the [code of conduct](https://github.com/xwiki-labs/cryptpad/blob/main/CODE_OF_CONDUCT.md) before proceeding.
Please read the [code of conduct](https://github.com/cryptpad/cryptpad/blob/main/CODE_OF_CONDUCT.md) before proceeding.
- type: markdown
id: terms
attributes:
Expand All @@ -16,7 +16,7 @@ body:
- You understand that not following the below instructions will result in immediate closure and/or deletion of your issue.
- You have understood that this bug report is dedicated for bugs, and not for support-related inquiries.
- You have understood that answers are voluntary and community-driven, and not commercial support.
- You have verified that your issue has not been already answered in the past. You've read the [Common issues documentation section](https://docs.cryptpad.org/en/FAQ.html#common-issues) and you also checked [previous issues](https://github.com/xwiki-labs/cryptpad/issues).
- You have verified that your issue has not been already answered in the past. You've read the [Common issues documentation section](https://docs.cryptpad.org/en/FAQ.html#common-issues) and you also checked [previous issues](https://github.com/cryptpad/cryptpad/issues).
- type: textarea
id: description
attributes:
Expand Down
84 changes: 42 additions & 42 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion customize.dist/pages.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ define([
var customURLs = Pages.customURLs = {};
(function () {
var defaultURLs = {
source: 'https://github.com/xwiki-labs/cryptpad',
source: 'https://github.com/cryptpad/cryptpad',
};
var l = Msg._getLanguage();
['imprint', 'privacy', 'terms', 'roadmap', 'source'].forEach(function (k) {
Expand Down
2 changes: 1 addition & 1 deletion customize.dist/pages/contact.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ define([
)
),
h('div',
h('a.card-small', {href : "https://github.com/xwiki-labs/cryptpad/issues/"},
h('a.card-small', {href : "https://github.com/cryptpad/cryptpad/issues/"},
h('div.card-body',
h('p', [
h('img', {
Expand Down
6 changes: 3 additions & 3 deletions docs/ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ So you want to write a realtime collaborative application?

This guide will focus on applications which require **multiple clients** to **collaboratively construct a single authoratative document**.

[XWiki-Labs](https://labs.xwiki.com/) has published an open source suite (called [CryptPad](https://github.com/xwiki-labs/cryptpad)) of collaborative editors which employ end to end encryption.
[XWiki-Labs](https://labs.xwiki.com/) has published an open source suite (called [CryptPad](https://github.com/cryptpad/cryptpad)) of collaborative editors which employ end to end encryption.
This guide will refer to the techniques used in the prototypes developed therein.

Let's start with an overview of the components involved.
Expand Down Expand Up @@ -76,10 +76,10 @@ Chainpad can handle out of order messages, but it performs best when its message
By architecting your system such that all clients send to a server which then relays to other clients, you guarantee that a particular chain of patches is consistent between the participants of your session.

CryptPad is capable of using a variety of data stores.
Which data store your instance employs can be [easily configured](https://github.com/xwiki-labs/cryptpad/blob/master/config.example.js).
Which data store your instance employs can be [easily configured](https://github.com/cryptpad/cryptpad/blob/master/config.example.js).

You simply need to write an adaptor which conforms to a simple API.
The documentation for writing such an adaptor, and the complete list of implemented adaptors, is available [here](https://github.com/xwiki-labs/cryptpad/tree/master/storage).
The documentation for writing such an adaptor, and the complete list of implemented adaptors, is available [here](https://github.com/cryptpad/cryptpad/tree/master/storage).

Whether you decide to use a single server, or distribute messages across a network of entities, the body which stores the **Authoratative Document** will be referred to as the **History Keeper** for the purposes of this guide.

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/quota.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ var Assert = require("assert");
// if so, set Env.updateAvailable to the URL of its release notes
var checkUpdateAvailability = function (Env, json) {
if (!(json && typeof(json.updateAvailable) === 'string' && typeof(json.version) === 'string')) { return; }
// expects {updateAvailable: 'https://github.com/xwiki-labs/cryptpad/releases/4.7.0', version: '4.7.0'}
// expects {updateAvailable: 'https://github.com/cryptpad/cryptpad/releases/4.7.0', version: '4.7.0'}
// the version string is provided explicitly even though it could be parsed from GitHub's URL
// this will allow old instances to understand responses of arbitrary URLs
// as long as we keep using semver for 'version'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "AGPL-3.0+",
"repository": {
"type": "git",
"url": "git+https://github.com/xwiki-labs/cryptpad.git"
"url": "git+https://github.com/cryptpad/cryptpad.git"
},
"funding": {
"type": "opencollective",
Expand Down
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ Configuring CryptPad for production requires a little more work, but the process

## Current version

The most recent version and all past release notes can be found [here](https://github.com/xwiki-labs/cryptpad/releases/).
The most recent version and all past release notes can be found [here](https://github.com/cryptpad/cryptpad/releases/).

## Setup using Docker

See [CryptPad-Docker](https://github.com/xwiki-labs/cryptpad-docker) repository for details on how to get up-and-running with CryptPad in Docker. This repository is maintained by the community and not officially supported.
See [CryptPad-Docker](https://github.com/cryptpad/cryptpad-docker) repository for details on how to get up-and-running with CryptPad in Docker. This repository is maintained by the community and not officially supported.

# Security

Expand Down
2 changes: 1 addition & 1 deletion www/admin/inner.js
Original file line number Diff line number Diff line change
Expand Up @@ -2976,7 +2976,7 @@ define([
if (!APP.instanceStatus.updateAvailable) { return; }
var $div = makeBlock('update-available', true);

var updateURL = 'https://github.com/xwiki-labs/cryptpad/releases/latest';
var updateURL = 'https://github.com/cryptpad/cryptpad/releases/latest';
if (typeof(APP.instanceStatus.updateAvailable) === 'string') {
updateURL = APP.instanceStatus.updateAvailable;
}
Expand Down
2 changes: 1 addition & 1 deletion www/bounce/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ define(['/api/config'], function (ApiConfig) {
// where stricter CSP blocks various attacks. Reject any other usage.
if (ApiConfig.httpSafeOrigin !== window.location.origin) {
window.alert('The bounce application must only be used from the sandbox domain, ' +
'please report this issue on https://github.com/xwiki-labs/cryptpad');
'please report this issue on https://github.com/cryptpad/cryptpad');
return void reject();
}
// Old/bad browsers lack the URL API, making it more difficult to validate and compare URLs.
Expand Down
2 changes: 1 addition & 1 deletion www/common/common-ui-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -1700,7 +1700,7 @@ define([
var origin = priv.origin;

// TODO link to the most recent changelog/release notes
// https://github.com/xwiki-labs/cryptpad/releases/latest/ ?
// https://github.com/cryptpad/cryptpad/releases/latest/ ?

var template = function (line, link) {
if (!line || !link) { return; }
Expand Down
2 changes: 1 addition & 1 deletion www/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define([
trailing slash) and somehow end up trying to load this script. ¯\_(ツ)_/¯
This script helps to avoid reports of confusion due to blank pages
like in some of the comments here: (https://github.com/xwiki-labs/cryptpad/issues/246)
like in some of the comments here: (https://github.com/cryptpad/cryptpad/issues/246)
by using jquery to check if adding a trailing slash would help,
and redirecting automatically if so.
*/
Expand Down

0 comments on commit a5d5dba

Please sign in to comment.