Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
m-mohamedin committed Apr 11, 2023
2 parents 21ae580 + 2e5d929 commit 4c84db2
Show file tree
Hide file tree
Showing 45 changed files with 762 additions and 83 deletions.
51 changes: 51 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Contributor Covenant Code of Conduct:

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment, including focusing on individual developers when a topic should be broadly addressed.
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
* Not respecting other people's time, this is an open source project
* Being impatient or rude
* Pressing developers for priority fixes or ETAs
* Guilting the developers into focusing on your issue(s)
* Repeatedly showing an inappropriate level of entitlement

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [[email protected]](mailto:[email protected]). All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor-Covenant][homepage], version 1.4, available at [https://contributor-covenant.org/version/1/4][version]

[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/1/4/
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Once installed, you will see an option to create a Draw.io diagram/whiteboard fr

## Changelog ##

[Changelog](https://github.com/jgraph/drawio-nextcloud/blob/release/drawio/CHANGELOG.md)
[Changelog](https://github.com/jgraph/drawio-nextcloud/blob/release/CHANGELOG.md)

## Installation ##
1. Copy Nextcloud draw.io integration app ("drawio" directory) to your Nextcloud server into the /apps/ directory
Expand All @@ -41,7 +41,7 @@ Realtime collaboration is only possible with **Autosave enabled** and using the
## Known Issues ##
- If you're experiencing problems while updating your Nextcloud intance, try to disable/delete Draw.io integration app (/apps/drawio/) and then install/copy it again after the NC update is completed.
- Clear PHP cache after updating the app if you have undefined method/classes errors.
- Integrity check of Nextcloud core fails as we add our new MIME types and icons. This is expected and safe to ignore (issue #26)[https://github.com/jgraph/drawio-nextcloud/issues/26].
- Integrity check of Nextcloud core fails as we add our new MIME types and icons. This is expected and safe to ignore ([issue #26](https://github.com/jgraph/drawio-nextcloud/issues/26)).

## Configuration ##
Go to Admin page and change the settings you want:
Expand All @@ -53,8 +53,12 @@ Click "Save" when you're done.
If you would like to self-host Draw.io, you might want to consider https://github.com/jgraph/docker-drawio (requires version 20.8.6+).


## License ##
- Released under the Affero General Public License version 3 or later.
## Licensing and Costs ##
- How do I license the draw.io integration for NextCloud?
The draw.io for NextCloud app is free and licensed under the AGPL 3.0 license, which means it is free to use and distribute. There is no need to purchase a license or pay any fees to use the app.

- What is the cost of the draw.io integration for NextCloud?
The draw.io for NextCloud app is free (libre et gratuit) and there are no costs associated with its use. It is licensed under the AGPL 3.0 license, which allows anyone to use and distribute the app without paying any fees.

## Contributors ##

Expand Down
9 changes: 2 additions & 7 deletions css/editor.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@

#app > iframe
{
vertical-align: top;
}

#iframeEditor.error
#app-content.error
{
color: red;
padding: 20px;
}
2 changes: 1 addition & 1 deletion js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/settings.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions l10n/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ OC.L10N.register(
"An internal server error occurred." : "حدث خطأ داخلي في الخادم.",
"This file is too big to be opened. Please download the file instead." : "هذا الملف كبير جدًا بحيث لا يمكن فتحه. يرجى تنزيل الملف بدلاً من ذلك.",
"Cannot read the file." : "لا يمكن قراءة الملف.",
"File not found." : "الملف غير موجود",
"The file is locked." : "الملف مقفل.",
"Could not write to file." : "لا يمكن الكتابة إلى الملف.",
"Saving..." : "جاري الحفظ...",
Expand Down
1 change: 1 addition & 0 deletions l10n/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"An internal server error occurred." : "حدث خطأ داخلي في الخادم.",
"This file is too big to be opened. Please download the file instead." : "هذا الملف كبير جدًا بحيث لا يمكن فتحه. يرجى تنزيل الملف بدلاً من ذلك.",
"Cannot read the file." : "لا يمكن قراءة الملف.",
"File not found." : "الملف غير موجود",
"The file is locked." : "الملف مقفل.",
"Could not write to file." : "لا يمكن الكتابة إلى الملف.",
"Saving..." : "جاري الحفظ...",
Expand Down
6 changes: 6 additions & 0 deletions l10n/bg.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ OC.L10N.register(
{
"Versions plugin is not enabled" : "Добавката за версиите не е активирана",
"You can not open a folder" : "Не можете да отворите папка",
"Invalid fileId/revId supplied." : "Предоставено е невалидно поле/revId.",
"An internal server error occurred." : "Възникна вътрешно сървърна грешка.",
"Invalid fileId supplied." : "Предоставено е невалидно поле.",
"This file is too big to be opened. Please download the file instead." : "Този файл е твърде голям, за да се отвори. Моля, изтеглете файла.",
"Cannot read the file." : "файлът неможе да бъде прочетен.",
"Invalid fileId/shareToken supplied." : "Предоставен е невалиден файл/Токен за споделяне.",
"File not found." : "Файлът не е намерен",
"The file is locked." : "Файлът е заключен.",
"You can not write to a folder" : "Не можете да записвате в папката",
Expand All @@ -26,8 +29,11 @@ OC.L10N.register(
"FileId is empty" : "Файлът е празен / Полето е празно/",
"Loading, please wait." : "Зареждане, моля изчакайте.",
"Error loading the file" : "Грешка при зареждането на файла",
"New draw.io Diagram" : "Нова draw.io Диаграма",
"New draw.io Whiteboard" : "Нова бяла дъска /табло/draw.io",
"Open in Draw.io" : "Отваряне в Draw.io",
"Error: Creating a new file failed." : "Грешка: Създаването на нов файл е неуспешно.",
"Edit in Draw.io" : "Редактиране в Draw.io",
"Saving..." : "Записване...",
"Settings have been successfully saved" : "Настройките са записани успешно",
"Error when trying to connect" : "Грешка при опит за свързване",
Expand Down
6 changes: 6 additions & 0 deletions l10n/bg.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{ "translations": {
"Versions plugin is not enabled" : "Добавката за версиите не е активирана",
"You can not open a folder" : "Не можете да отворите папка",
"Invalid fileId/revId supplied." : "Предоставено е невалидно поле/revId.",
"An internal server error occurred." : "Възникна вътрешно сървърна грешка.",
"Invalid fileId supplied." : "Предоставено е невалидно поле.",
"This file is too big to be opened. Please download the file instead." : "Този файл е твърде голям, за да се отвори. Моля, изтеглете файла.",
"Cannot read the file." : "файлът неможе да бъде прочетен.",
"Invalid fileId/shareToken supplied." : "Предоставен е невалиден файл/Токен за споделяне.",
"File not found." : "Файлът не е намерен",
"The file is locked." : "Файлът е заключен.",
"You can not write to a folder" : "Не можете да записвате в папката",
Expand All @@ -24,8 +27,11 @@
"FileId is empty" : "Файлът е празен / Полето е празно/",
"Loading, please wait." : "Зареждане, моля изчакайте.",
"Error loading the file" : "Грешка при зареждането на файла",
"New draw.io Diagram" : "Нова draw.io Диаграма",
"New draw.io Whiteboard" : "Нова бяла дъска /табло/draw.io",
"Open in Draw.io" : "Отваряне в Draw.io",
"Error: Creating a new file failed." : "Грешка: Създаването на нов файл е неуспешно.",
"Edit in Draw.io" : "Редактиране в Draw.io",
"Saving..." : "Записване...",
"Settings have been successfully saved" : "Настройките са записани успешно",
"Error when trying to connect" : "Грешка при опит за свързване",
Expand Down
22 changes: 11 additions & 11 deletions l10n/de_DE.js
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
OC.L10N.register(
"drawio",
{
"Versions plugin is not enabled" : "Version-Plugin ist deaktiviert",
"Versions plugin is not enabled" : "Versions-Plugin ist deaktiviert",
"You can not open a folder" : "Sie können keinen Ordner öffnen",
"Invalid fileId/revId supplied." : "Ungültige Datei-ID/revID angegeben.",
"An internal server error occurred." : "Es ist ein interner Fehler aufgetreten.",
"Invalid fileId supplied." : "Ungültiges Feld angegeben.",
"This file is too big to be opened. Please download the file instead." : "Die Datei ist zu groß zum Öffnen. Bitte laden Sie stattdessen die Datei herunter.",
"Invalid fileId supplied." : "Ungültige Datei-ID angegeben.",
"This file is too big to be opened. Please download the file instead." : "Die Datei ist zu groß zum Öffnen. Bitte laden Sie sie stattdessen herunter.",
"Cannot read the file." : "Datei kann nicht gelesen werden.",
"Invalid fileId/shareToken supplied." : "Ungültige Datei-ID/ShareToken angegeben.",
"File not found." : "Datei nicht gefunden.",
"The file is locked." : "Die Datei ist gesperrt.",
"You can not write to a folder" : "Sie können nicht in einen Ordner schreiben",
"The file you are working on was updated in the meantime." : "Die Datei die Sie bearbeiten wurde zwischenzeitig aktualisiert.",
"Could not write to file." : "Konnte Datei nicht schreiben.",
"Insufficient permissions" : "Nicht ausreichende Berechtigungen",
"The file you are working on was updated in the meantime." : "Die Datei, die Sie bearbeiten, wurde zwischenzeitig aktualisiert.",
"Could not write to file." : "In die Datei konnte nicht geschrieben werden.",
"Insufficient permissions" : "Unzureichende Berechtigungen",
"File content not supplied" : "Dateiinhalt nicht angegeben",
"File etag not supplied" : "Datei-Etage nicht angegeben",
"File etag not supplied" : "Datei-Etag nicht angegeben",
"You can not write to this path" : "Sie können in diesen Pfad nicht schreiben",
"Incorrect parameters" : "Falsche Parameter",
"The required folder was not found" : "Der erforderliche Ordner wurde nicht gefunden",
"You don't have enough permission to create file" : "Sie haben nicht genug Berechtigungen um die Datei zu erstellen",
"You don't have enough permission to create file" : "Sie haben nicht genug Berechtigungen, um die Datei zu erstellen",
"Can't create file" : "Datei kann nicht erstellt werden",
"Draw.io app not configured! Please contact admin." : "Draw.io-App nicht eingerichtet. Bitte kontaktieren Sie Ihre Administration",
"Draw.io" : "Draw.io",
"Draw.io integration app" : "Draw.io Integrations-App",
"Integrates draw.io diagrams editor with Nextcloud" : "Bindet den draw.io Diagramm-Editor in Nextcloud ein",
"FileId is empty" : "Datei-Id ist leer",
"FileId is empty" : "Datei-ID ist leer",
"Loading, please wait." : "Lade, bitte warten.",
"Error loading the file" : "Fehler beim Laden der Datei",
"New draw.io Diagram" : "Neues draw.io Diagramm",
Expand All @@ -35,7 +35,7 @@ OC.L10N.register(
"Error: Creating a new file failed." : "Fehler: Erstellen einer neuen Datei fehlgeschlagen.",
"Edit in Draw.io" : "In Draw.io bearbeiten",
"Saving..." : "Speichere…",
"Settings have been successfully saved" : "Einstellungen wurde gespeichert",
"Settings have been successfully saved" : "Einstellungen wurden gespeichert",
"Error when trying to connect" : "Fehler beim Verbindungsversuch",
"Auto" : "Automatisch",
"Draw.io URL" : "Draw.io URL",
Expand All @@ -50,7 +50,7 @@ OC.L10N.register(
"No" : "Nein",
"Language" : "Sprache",
"Activate offline mode in Draw.io?" : "Offline-Modus in Draw.io aktivieren?",
"When the \"offline mode\" is active, this disables all remote operations and features to protect the users privacy. Draw.io will then also only be in English, even if you set a different language manually." : "Wenn der \"Offline-Modus\" aktiv ist, werden alle Remote-Operationen und -Funktionen deaktiviert, um die Privatsphäre der Benutzer zu schützen. Draw.io ist dann auch nur auf Englisch, auch wenn Sie manuell eine andere Sprache einstellen.",
"When the \"offline mode\" is active, this disables all remote operations and features to protect the users privacy. Draw.io will then also only be in English, even if you set a different language manually." : "Wenn der \"Offline-Modus\" aktiv ist, werden alle Remote-Operationen und -Funktionen deaktiviert, um die Privatsphäre der Benutzer zu schützen. Draw.io ist dann auch nur auf Englisch verfügbar, auch wenn Sie manuell eine andere Sprache einstellen.",
"Activate autosave?" : "Automatisches Speichern aktivieren?",
"Note: To enable realtime collaboration, autosave must be active." : "Hinweis: Um die Zusammenarbeit in Echtzeit zu ermöglichen, muss die automatische Speicherung aktiviert sein.",
"Enable libraries?" : "Bibliotheken aktivieren?",
Expand Down
Loading

0 comments on commit 4c84db2

Please sign in to comment.