Przeglądaj źródła

Merge branch 'master' into t/1509

Piotrek Koszuliński 6 lat temu
rodzic
commit
6fdad040f6

+ 3 - 3
.travis.yml

@@ -1,8 +1,10 @@
 sudo: required
-dist: trusty
+dist: xenial
 addons:
   chrome: stable
 language: node_js
+services:
+- xvfb
 cache:
   yarn: true
 node_js:
@@ -11,8 +13,6 @@ cache:
 - node_modules
 before_install:
 - export START_TIME=$( date +%s )
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
 - npm i -g yarn
 install:
 - yarn add mrgit --ignore-workspace-root-check

+ 13 - 2
README.md

@@ -7,7 +7,6 @@ CKEditor 5 [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?styl
 [![Dependency Status](https://img.shields.io/david/ckeditor/ckeditor5.svg)](https://david-dm.org/ckeditor/ckeditor5)
 [![devDependency Status](https://img.shields.io/david/dev/ckeditor/ckeditor5.svg)](https://david-dm.org/ckeditor/ckeditor5?type=dev)
 
-[![Join the chat at https://gitter.im/ckeditor/ckeditor5](https://badges.gitter.im/ckeditor/ckeditor5.svg)](https://gitter.im/ckeditor/ckeditor5?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![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)
 
@@ -504,13 +503,25 @@ See CKEditor 5 release blog posts [on the CKEditor blog](https://ckeditor.com/bl
 
 <tr>
 	<td>
+		<a href="https://github.com/ckeditor/ckeditor5-horizontal-rule"><code>@ckeditor/ckeditor5-horizontal-rule</code></a>
+	</td>
+	<td>
+		<a href="https://www.npmjs.com/package/@ckeditor/ckeditor5-horizontal-rule"><img src="https://img.shields.io/npm/v/@ckeditor/ckeditor5-horizontal-rule.svg" alt="@ckeditor/ckeditor5-horizontal-rule npm package badge"></a>
+	</td>
+	<td>
+		The horizontal rule feature.
+	</td>
+</tr>
+
+<tr>
+	<td>
 		<a href="https://github.com/ckeditor/ckeditor5-image"><code>@ckeditor/ckeditor5-image</code></a>
 	</td>
 	<td>
 		<a href="https://www.npmjs.com/package/@ckeditor/ckeditor5-image"><img src="https://img.shields.io/npm/v/@ckeditor/ckeditor5-image.svg" alt="@ckeditor/ckeditor5-image npm package badge"></a>
 	</td>
 	<td>
-		The image feature. Supports image styles and captioning.
+		The image feature. Supports image styles, captioning, upload, resizing, and more.
 	</td>
 </tr>
 

+ 0 - 22
docs/builds/guides/support/getting-support.md

@@ -19,28 +19,6 @@ Refer to {@link builds/guides/support/reporting-issues Reporting issues} guide f
 
 Make sure to tag your questions with ["ckeditor"](https://stackoverflow.com/questions/tagged/ckeditor) and ["ckeditor5"](https://stackoverflow.com/questions/tagged/ckeditor5) to reach the widest audience.
 
-## Gitter
-
-[CKEditor 5 Gitter channel](https://gitter.im/ckeditor/ckeditor5) is the place where you can discuss all matters that do not fit GitHub or Stack Overflow.
-
-Gitter is convenient for asking quick questions, however, it is not the best place for more complex topics which might interest other developers (Gitter logs are indexed via Google but rather poorly). Therefore, try to avoid lengthy discussions on topics which would make sense to be reported either on GitHub or Stack Overflow.
-
-DOs:
-
-* Is it a known bug that "..."?
-* Do you plan to tag the new release this week?
-* I can't find XYZ's documentation. Is it available somewhere?
-* I'm in Warsaw. Anyone for a coffee?
-
-DON'Ts:
-
-* How to extend the selection to the end of the block?
-* Could you implement support for XYZ?
-* I can't make X and Y work together in my app. I developed this plugin and...
-* The editor crashes if I press <kbd>Enter</kbd>. Please help.
-
-And most importantly, be kind to everyone.
-
 ## Commercial support
 
 CKEditor 5 also comes with commercial licensing benefits, such as direct support from the core CKEditor development team. Commercial licenses are designed with professionals and enterprises in mind.

+ 1 - 1
docs/framework/guides/contributing/contributing.md

@@ -14,7 +14,7 @@ Before you start, here are some things to keep in mind:
 * We expect contributions to follow the high-quality code standards that we follow, including [coding style](#code-style) and [tests](#tests). Lack of attention to this point may either make it slow to adopt a contribution or even force us to reject it altogether.
 * There is no guarantee that your contribution will be incorporated into the project code. Still, pull requests make it easy for you to keep them for your own use or for others who may be interested in them.
 * If you plan to start working on a bigger task, it might be worth asking the core team (beforehand) whether a specific feature or a solution to an issue will be accepted.
-* If you need any assistance when creating a patch or implementing a feature, ping us under the ticket or on [Gitter](https://gitter.im/ckeditor/ckeditor5).
+* If you need any assistance when creating a patch or implementing a feature, ping us under the ticket.
 * [Having a CLA](#contributor-license-agreement-cla) is essential to have your contributions accepted.
 
 ### Setting up the development environment

Plik diff jest za duży
+ 23 - 22
docs/framework/guides/contributing/testing-environment.md


+ 2 - 1
mrgit.json

@@ -29,7 +29,8 @@
     "@ckeditor/ckeditor5-essentials": "ckeditor/ckeditor5-essentials",
     "@ckeditor/ckeditor5-font": "ckeditor/ckeditor5-font",
     "@ckeditor/ckeditor5-heading": "ckeditor/ckeditor5-heading",
-    "@ckeditor/ckeditor5-highlight": "ckeditor/ckeditor5-highlight",
+	"@ckeditor/ckeditor5-highlight": "ckeditor/ckeditor5-highlight",
+	"@ckeditor/ckeditor5-horizontal-rule": "ckeditor/ckeditor5-horizontal-rule",
     "@ckeditor/ckeditor5-image": "ckeditor/ckeditor5-image",
     "@ckeditor/ckeditor5-indent": "ckeditor/ckeditor5-indent",
     "@ckeditor/ckeditor5-link": "ckeditor/ckeditor5-link",

+ 2 - 1
package.json

@@ -47,7 +47,8 @@
     "@ckeditor/ckeditor5-essentials": "^11.0.5",
     "@ckeditor/ckeditor5-font": "^11.2.2",
     "@ckeditor/ckeditor5-heading": "^11.0.5",
-    "@ckeditor/ckeditor5-highlight": "^11.0.5",
+	"@ckeditor/ckeditor5-highlight": "^11.0.5",
+	"@ckeditor/ckeditor5-horizontal-rule": "^0.0.1",
     "@ckeditor/ckeditor5-image": "^14.0.0",
     "@ckeditor/ckeditor5-indent": "^10.1.0",
     "@ckeditor/ckeditor5-link": "^11.1.2",