Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync stable branch from CKEditor4 to our fork #27

Merged
merged 9,759 commits into from
Aug 17, 2020
Merged

Sync stable branch from CKEditor4 to our fork #27

merged 9,759 commits into from
Aug 17, 2020

Conversation

deti
Copy link

@deti deti commented Aug 14, 2020

/~https://github.com/ckeditor/ckeditor4

stable – Latest stable release tag point (non-beta).

We need to sync this branch with our repo to be able to update our working copy

There are no custom changes.

jacekbogdanski and others added 30 commits February 12, 2020 13:36
@jacekbogdanski @f1ames
Added manual test for keyboard selection.
6368680
@jacekbogdanski @f1ames
Stray line.
1b10dc2
@jacekbogdanski @f1ames
Updated tests.
fcd1ae3
@jacekbogdanski @f1ames
Simplified manual tests.
3610c73
@f1ames
Tests: Minor rewording.
bed5365
@jacekbogdanski @f1ames
Skip keyboard selection fix for now.
f4db826
@jacekbogdanski @f1ames
Ignored tests on Safari.
f1ec7f3
@jacekbogdanski @f1ames
Small rewording.
b4b1a6d
@f1ames
Added missing member docs property.
186e075
@f1ames
Tests: Minor rewording. [skip ci]
56a1c8c
@f1ames
Changelog entry. [skip ci]
97fecc0
@f1ames
Merge pull request #3553 from ckeditor/t/3498
afa0929 
Prevent throwing error when partially selected widget is copied
@Comandeer
Mark IE11 as unsupported environment.
bee39bb
@Comandeer
Restrict PfLO only to content recognized by generator metatag.
405c0bc
@Comandeer
Revert "Merge pull request #3844 from ckeditor/t/3835"
1a5261e 
This reverts commit 6565b99, reversing
changes made to e6c0015.
@Comandeer
Remove IE11 and Safari fixtures.
797eecd
@f1ames
Merge pull request #3852 from ckeditor/pflo-ie
e4199cf 
Disable PfLO in IE 11
@jacekbogdanski @Comandeer
Added color selection method.
843d8d7
@jacekbogdanski @Comandeer
Added manual test for color selection.
6a49859
@jacekbogdanski @Comandeer
Added fallback into automatic color.
939fbc3
@jacekbogdanski @Comandeer
Added unit tests for color select method.
c2eb3f4
@jacekbogdanski @Comandeer
Reverted color normalization as it's more convinient to use already d…
958e656 
…eclared colors from configuration option.
@jacekbogdanski @Comandeer
Fixed test on IE8.
f53b288
@jacekbogdanski @Comandeer
Improved code readability.
aa0c0bb
@jacekbogdanski @Comandeer
Added method docs.
7a5594a
@jacekbogdanski @Comandeer
Docs private.
f89e097
@jacekbogdanski @Comandeer
Updated manual test.
803ee72
@jacekbogdanski @Comandeer
Manual test should be collapsed by default.
6a5ad3b
@jacekbogdanski @Comandeer
Removed focus requirement.
48b9c35
@Comandeer
Merge pull request #3856 from ckeditor/t/3743
1436caf 
Expose colorbutton#select method
f1ames and others added 27 commits June 5, 2020 17:14
@f1ames
Tests: Assertion messages minor rewording.
58c8656
@f1ames
Merge pull request #4096 from ckeditor/t/4084
a60c055 
Fix failing test tests/core/creators/themedui
@arpi68 @f1ames
Bugfix - Tableresize not working in maximized mode with divarea
4d31038 
Set z-index of resizer to 10000 or more
Fixes these two issues:
#1959
#909
@hub33k @f1ames
Tests: add manual test.
6f7d346
@hub33k @f1ames
Tests: minor rewording.
96b9a64
@hub33k @f1ames
Tests: add more editors to manual test.
3c2dceb
@hub33k @f1ames
Tests: move inline editor test to separate file.
5116ec2
@f1ames
Changelog entry. [skip ci]
342d6c8
@f1ames
Merge pull request #3694 from arpi68/arpi68-tableresizepatch-1
e3be5c1 
Tableresize not working when editor placed in container with higher z-index values
@hub33k
Fix widget plugin when keystorke is pressed.
d517fac
@hub33k
Tests: add manual test (widget - keystroke).
117b93a
@hub33k
Tests: add unit test (widget - keystroke).
0757c35
@f1ames
Tests: Check for browser errors on mode change.
d7ce7e4
@f1ames
Tests: Minor rewording in manual test.
c6b1524
@f1ames
Changelog entry. [skip ci]
de1353a
@f1ames
Merge pull request #4072 from ckeditor/t/3998
cb6f2c4 
Fix widget plugin when switching to source mode via custom keystroke.
@jacekbogdanski
Fix manual test ignore.
0eacde9
@f1ames
Minor reformatting.
2127d57
@f1ames
Merge pull request #4103 from ckeditor/emoji-cors-test
18c3898 
Ignore unsupported browsers for emoji manual test
@jacekbogdanski
Ignore unsupported mobile tests.
1c2ad39
@f1ames
Tests: Typo fix. [skip ci]
4b96698
@f1ames
Merge pull request #4108 from ckeditor/mobile-tests
08e0b8b 
Ignore unsupported mobile manual tests
@wwalc
Updated language files.
780c439
@AnnaTomanek
Changelog corrected.
d76dbdf
@f1ames
Added SCAYT/WSC changelog entry. [skip ci]
dfd2e16
@AnnaTomanek
Changelog corrected.
eb2d116
@AnnaTomanek
Docs: Minor corrections in API documentation.
ccc34f3
bocribbz
bocribbz reviewed Aug 14, 2020
View reviewed changes
Copy link

@bocribbz bocribbz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to stay a sane person so im not going to do a code review for 5000+ files.

Since there are no custom changes. Since this was probably reviewed for the main ckeditor repo by the ckeditor contributors, i'd be ok with merging it in if we do need it.

@deti deti merged commit 892bc68 into PolicyStat:stable Aug 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bocribbz bocribbz bocribbz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.