Skip to content

Commit

Permalink
Merge pull request #27 from ckeditor/stable
Browse files Browse the repository at this point in the history
Sync stable branch from CKEditor4 to our fork
  • Loading branch information
deti authored Aug 17, 2020
2 parents e98277f + ccc34f3 commit 892bc68
Show file tree
Hide file tree
Showing 9,065 changed files with 770,580 additions and 38,729 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 17 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Contributing to CKEditor

We are happy to see that you would like to contribute to CKEditor! CKEditor is an Open Source product that is free for
anyone to download, use, and customize. It has an amazing community around it that supports it in all possible ways.
There are a few guidelines that we need contributors to follow so that the workflow is as smooth and efficient as possible.

If you are preparing a pull request, see [Contributing Code and Providing Patches to CKEditor](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_contributing_code.html).

If you would like to contribute in any other way, you can consider the following actions:

1. Create your own [plugins](https://ckeditor.com/docs/ckeditor4/latest/guide/plugin_sdk_sample.html) or [skins](https://ckeditor.com/docs/ckeditor4/latest/guide/skin_sdk_intro.html)
and submit them to [CKEditor Add-Ons Repository](https://ckeditor.com/cke4/addons/plugins/).
2. Help localize CKEditor into your native language and update existing localizations by joining us at the
[CKEditor UI Translation Center](https://www.transifex.com/ckeditor/ckeditor/).
3. Join StackOverflow and share your knowledge with [fellow CKEditor users and developers](http://stackoverflow.com/questions/tagged/ckeditor).

**Your help will be much appreciated!**
45 changes: 45 additions & 0 deletions .github/ISSUE_TEMPLATE/1-bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
name: "\U0001F41B Bug report"
about: Report that something isn't working as expected.
title: ''
labels: type:bug
assignees: ''

---

## Type of report

Bug

## Provide detailed reproduction steps (if any)

<!--
Including a simple sample reproducing the issue is also a good idea. It can drastically
decrease the time needed to reproduce the issue by our team, which means it can speed up helping you!
You can use one of our samples to create the reproduction sample:
* CodePen: https://codepen.io/Comandeer/pen/ExaMgpz?editors=1010
* JSFiddle: https://jsfiddle.net/Comandeer/d6ey8a2w
* JSBin: https://jsbin.com/keqekef/1/edit?html,js,output
* StackBlitz: https://stackblitz.com/edit/js-vcqfw3
-->

1.
2.
3.

### Expected result

*What is the expected result of the above steps?*

### Actual result

*What is the actual result of the above steps?*

## Other details

* Browser: …
* OS: …
* CKEditor version: …
* Installed CKEditor plugins: …
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/2-feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: "⭐ Feature request"
about: Propose something new.
title: ''
labels: type:feature
assignees: ''

---

## Type of report

Feature request

## Provide description of the new feature

*What is the expected behavior of the proposed feature?*
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/3-docs-issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: "\U0001F4DA Docs issue"
about: Report an issue related to documentation.
title: ''
labels: type:docs
assignees: ''

---

## Type of report

Docs

## Provide a description of requested docs changes

*What is the purpose and what should be changed?*
23 changes: 23 additions & 0 deletions .github/ISSUE_TEMPLATE/4-task.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
name: "\U0001F477 Task"
about: It's neither a bug nor feature request.
title: ''
labels: type:task
assignees: ''

---

## Type of report

Task

## Provide description of the task

*What steps should be taken to fulfil the task?*

## Other details

* Browser: …
* OS: …
* CKEditor version: …
* Installed CKEditor plugins: …
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: "\U0001F6A8 Security issue"
about: Report a security issue.
url: https://ckeditor.com/contact/
- name: "\U0001F4F1 Licensed Customers support"
about: Support channel for Licensed Customers.
url: https://support.ckeditor.com/hc/en-us/requests/new
37 changes: 37 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
## What is the purpose of this pull request?

<!-- Bug fix / New feature / Typo fix / Other, please explain -->

## Does your PR contain necessary tests?

All patches that change the editor code must include tests. You can always read more
on [PR testing](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_contributing_code.html#tests),
[how to set the testing environment](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_tests.html) and
[how to create tests](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_tests.html#creating-your-own-test)
in the official CKEditor documentation.

### This PR contains

- [ ] Unit tests
- [ ] Manual tests

## Did you follow the CKEditor 4 code style guide?

Your code should follow the guidelines from the [CKEditor 4 code style guide](/~https://github.com/ckeditor/ckeditor4/blob/major/dev/docs/codestyle.md) which helps keep the entire codebase consistent.

- [ ] PR is consistent with the code style guide

## What is the proposed changelog entry for this pull request?

```
*[#<ISSUE_NUMBER>](/~https://github.com/ckeditor/ckeditor4/issues/<ISSUE_NUMBER>): Describe the purpose of the pull request in a few simple sentences.
```

## What changes did you make?

*Give an overview…*

## Which issues does your PR resolve?

Closes #<ISSUE_NUMBER>.
<!-- Closes #<ANOTHER_ISSUE_NUMBER>. -->
23 changes: 23 additions & 0 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
If you feel you are unable to get going by yourself, you can use the following channels:

## Community Support

[Stack Overflow](https://stackoverflow.com/tags/ckeditor) – a place to share problems and solutions by CKEditor developers and integrators which you can use for usage and implementation issues. CKEditor has grown as an Open Source product, thanks to the amazing community of developers and users. Use the [[ckeditor](https://stackoverflow.com/tags/ckeditor)] tag to ask a question or to help fellow developers.

[GitHub Issue Tracker](/~https://github.com/ckeditor/ckeditor4/issues) – a place to report bugs, and to request new features. Before you attempt to do so, please make sure you read [the issue tracker instructions](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_issues_tracker.html) and thus help us optimize the management of issues. Make sure that the bug you report is not caused by a third-party software or your customizations.

Please refer to the [CONTRIBUTING](/~https://github.com/ckeditor/ckeditor4/blob/master/.github/CONTRIBUTING.md) file for more information on how to support the development of CKEditor.

## Commercial Support

[Professional Support Channel](https://ckeditor.com/contact) – a dedicated channel for users with commercial license.

For more advanced needs (e.g. CKEditor integration in your products, or development of customized plugins and features), you can get access to CKEditor core developers through [Assistance Package](https://ckeditor.com/pricing/#assistance) or [Custom Development](https://ckeditor.com/pricing/#custom-development) services.

## Documentation & Examples

For more reading visit our supporting resources:

* An extensive [CKEditor 4 documentation](https://ckeditor.com/docs/ckeditor4/latest/index.html) with information about CKEditor features and configuration settings.
* [CKEditor 4 examples](https://ckeditor.com/docs/ckeditor4/latest/examples/index.html) that you can try out and even download to copy and implement in your own environment.
* A knowledge base with [Frequently Asked Questions](https://support.ckeditor.com/hc/en-us/sections/115000842245-CKEditor-4-FAQ).
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

node_modules/**
build/**
coverage/**

dev/builder/release/**
dev/builder/ckbuilder/**
Expand All @@ -19,8 +20,13 @@ samples/toolbarconfigurator/.bender/**
samples/toolbarconfigurator/node_modules/**
samples/toolbarconfigurator/docs/**

tests/security
tests/plugins/mathjax/_assets/mathjax/**

*.css.map

bender-*.log

!.github/**
!.npm/*
.DS_Store
7 changes: 4 additions & 3 deletions .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
},
"validateIndentation": {
"value": "\t",
"allExcept": [ "comments" ]
}
}
"allExcept": [ "comments", "emptyLines" ]
},
"requireLineFeedAtFileEnd": true
}
2 changes: 1 addition & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
"validthis": true,

"predef": [ "CKEDITOR", "assert", "arrayAssert", "bender", "JSON", "objectAssert", "resume", "sinon", "wait", "YUITest" ]
}
}
81 changes: 81 additions & 0 deletions .npm/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# CKEditor 4 (dev) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Check%20out%20CKEditor%204%20on%20npm&url=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2Fckeditor4-dev)

[![GitHub tag](https://img.shields.io/github/tag/ckeditor/ckeditor4.svg)](/~https://github.com/ckeditor/ckeditor4)
[![Dependencies](https://img.shields.io/david/ckeditor/ckeditor4.svg)](https://david-dm.org/ckeditor/ckeditor4)
[![Dev dependencies](https://img.shields.io/david/dev/ckeditor/ckeditor4.svg)](https://david-dm.org/ckeditor/ckeditor4?type=dev)

[![Join newsletter](https://img.shields.io/badge/join-newsletter-00cc99.svg)](http://eepurl.com/c3zRPr)
[![Follow twitter](https://img.shields.io/badge/follow-twitter-00cc99.svg)](https://twitter.com/ckeditor)

A highly configurable WYSIWYG HTML editor with hundreds of features, from creating rich text content with captioned images, videos, tables, or media embeds to pasting from Word and drag&drop image upload.

Supports a broad range of browsers, including legacy ones.

**Note: This is a developer version.** Use the [CKEditor 4 optimized package](https://www.npmjs.com/package/ckeditor4) for production environment.

![CKEditor 4 screenshot](https://c.cksource.com/a/1/img/npm/ckeditor4.png)

## Getting Started

```
npm install --save ckeditor4-dev
```

Use it on your website:

```html
<div id="editor">
<p>This is the editor content.</p>
</div>
<script src="./node_modules/ckeditor4-dev/ckeditor.js"></script>
<script>
CKEDITOR.replace( 'editor' );
</script>
```

You can also load CKEditor 4 using [CDN](https://cdn.ckeditor.com/#ckeditor4).

## Features

* Over 500 plugins in the [Add-ons Repository](https://ckeditor.com/cke4/addons).
* Pasting from Microsoft Word and Excel.
* Drag&drop image uploads.
* Media embeds to insert videos, tweets, maps, slideshows.
* Powerful clipboard integration.
* Content quality control with Advanced Content Filter.
* Extensible widget system.
* Custom table selection.
* Accessibility conforming to WCAG and Section 508.
* Over 60 localizations available with full RTL support.

## Presets

The CKEditor 4 dev npm package comes in the `full-all` preset, so it includes all official CKEditor plugins, with those from the [full package](https://ckeditor.com/docs/ckeditor4/latest/examples/fullpreset.html) active by default.

## Further Resources

* [CKEditor 4 demo](https://ckeditor.com/ckeditor-4/)
* [Documentation](https://ckeditor.com/docs/ckeditor4/latest/)
* [API documentation](https://ckeditor.com/docs/ckeditor4/latest/api/index.html)
* [Configuration reference](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html)
* [CKEditor Examples](https://ckeditor.com/docs/ckeditor4/latest/examples/index.html)

If you are looking for CKEditor 5, here's a link to the relevant npm package: <https://www.npmjs.com/package/ckeditor5>

## Browser Support

| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome (Android) | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari-ios/safari-ios_48x48.png" alt="iOS Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>iOS Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera |
| --------- | --------- | --------- | --------- | --------- | --------- | --------- |
| IE8, IE9, IE10, IE11, Edge| latest version| latest version| latest version| latest version| latest version| latest version

Find out more in the [Browser Compatibility guide](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_browsers.html#officially-supported-browsers).

## Contribute

If you would like to help maintain the project, follow the [Contribution instructions](/~https://github.com/ckeditor/ckeditor4/blob/master/.github/CONTRIBUTING.md).

## License

Copyright (c) 2003-2020, CKSource - Frederico Knabben. All rights reserved.

For licensing, see LICENSE.md or <https://ckeditor.com/legal/ckeditor-oss-license>
44 changes: 44 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
sudo: required
dist: xenial
services:
- xvfb

branches:
only:
- master
- major
- stable
- latest
- /^\d+\.\d+(\.\d+)?(-\S*)?$/
- /^release\/\d+\.\d+\.x$/

language: node_js

node_js:
- 10

env:
- BUILD=0 BROWSER=Chrome
- BUILD=1 BROWSER=Chrome
- BUILD=0 BROWSER=Firefox MOZ_HEADLESS=1
- BUILD=1 BROWSER=Firefox MOZ_HEADLESS=1

addons:
firefox: "latest"
chrome: stable

before_script:
# Prepare environment.
- 'npm install benderjs-cli -g'
- 'export DISPLAY=:99.0'
- 'sleep 3'

# The $TRAVIS_BRANCH points to target branch for PRs and for other branches it is the current branch name.
- 'BUILD_PATH=0'
- 'if [ "$BUILD" = "1" ] && ( [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "major" ] ); then
sh -e ./dev/travis/build.sh $TRAVIS_BRANCH && BUILD_PATH="$(sh -e ./dev/travis/buildpath.sh)";
fi'

script:
- 'if [ "$BUILD" = "0" ]; then bender run -c bender.ci.js; fi'
- 'if [ "$BUILD" = "1" ] && [ "$BUILD_PATH" != "0" ]; then cd $BUILD_PATH && bender run -c bender.ci.js; fi'
Loading

0 comments on commit 892bc68

Please sign in to comment.