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.

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

Feature/react #946

Merged
merged 330 commits into from
Dec 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
330 commits
Select commit Hold shift + click to select a range
91238c5
Merge pull request #893 from liferay/pr-892
julien Oct 23, 2018
6189e19
1.5.15
Oct 23, 2018
885782f
Build Files (auto-generated)
Oct 23, 2018
a196faf
Updates CHANGELOG for v1.5.15
Oct 23, 2018
96af150
Fix #898 | Added center align css interaction between IE11 and other …
fortunatomaldonado Nov 7, 2018
0afdb5e
Update saucelabs configuration
Nov 15, 2018
1ab8b95
Try to fix autolink test
Nov 15, 2018
d97896d
Merge pull request #907 from julien/test_autolink
jbalsas Nov 15, 2018
18ac73d
Merge pull request #899 from fortunatomaldonado/Fix#898
julien Nov 16, 2018
61380a1
Fixes #911 Use correct CSS to place drag resize handle at the corner
brianikim Nov 16, 2018
fde5fff
Fixes https://github.com/liferay/alloy-editor/issues/900 Add closing …
SpencerWoo Nov 16, 2018
192a163
LPS-87500 Add styleFn support for the ButtonStylesList component
pavel-savinov Nov 19, 2018
89e3fcd
Merge pull request #916 from pavel-savinov/LPS-87500
julien Nov 20, 2018
aab69a8
Merge pull request #912 from brianikim/LPS-87458
julien Nov 20, 2018
f7a168b
Merge pull request #913 from SpencerWoo/issue900
julien Nov 20, 2018
5397859
Fixes #915 - Checks if selection data exists in linkSelectionTest
jaclynong Nov 19, 2018
f88abdc
Merge pull request #918 from liferay/pr-917
julien Nov 20, 2018
de331d4
Fixes #908 Remove unwanted tags after paste
fortunatomaldonado Nov 20, 2018
1d404b0
1.5.16
Nov 23, 2018
7ea9e76
Build Files (auto-generated)
Nov 23, 2018
8b3925b
Updates CHANGELOG for v1.5.16
Nov 23, 2018
ff4b6da
Change dragresize implementation on IE to modify heigh and width insi…
gregory-bretall Nov 20, 2018
7f87818
Merge pull request #923 from gregory-bretall/issue-901-updated
julien Nov 26, 2018
abed0b1
Fixes #928 | Update gulp-sass to work with node v10.x.x
Nov 28, 2018
173bb54
Merge pull request #929 from liferay/feature/node_v10.x
jbalsas Nov 28, 2018
d8f3fc0
Fixes #931 | Fixes the saucelabs browser-matrix badge
Nov 29, 2018
0139136
Fixes #829 | Limit tweet text to 280 chars
Nov 29, 2018
6138c8b
Merge pull request #932 from liferay/fixes/readme
jbalsas Nov 29, 2018
0f83987
Fixes #924 Add styling for four drag handles of image resizer
Nov 22, 2018
7406081
Fixes #924 Add four drag handles to image resizer
Nov 26, 2018
a2f7a23
Fixes #924 No longer need to add/remove CSS class based on image alig…
Nov 26, 2018
73f4729
Merge pull request #934 from diana-lin/issue-924-fixup
julien Nov 30, 2018
fc8be1a
Fixes #853 | Updates toolbar position when changing image alignment
Dec 3, 2018
5d9b480
Merge pull request #933 from liferay/issues/issue_829
jbalsas Dec 4, 2018
2949f3e
Merge pull request #935 from liferay/issues/issue_853
jbalsas Dec 4, 2018
0951940
Update ckeditor
Dec 7, 2018
1ab0230
Fixes #906 | Implement feature sets
Dec 7, 2018
26a3388
Fixes #906 | Reorder toolbar buttons for full mode
Dec 7, 2018
c95d8dc
Merge pull request #930 from liferay/feature/feature_sets
jbalsas Dec 7, 2018
1076f99
Merge pull request #943 from liferay/release/v1.5.17
julien Dec 7, 2018
e8561dc
Initial refactor for AlloyEditor 2.0
jbalsas Feb 12, 2018
e17ea91
Update webpack to 4.0
matuzalemsteles Mar 20, 2018
4ed8b97
Add webpack 4.0 compatibility and create .babelrc
matuzalemsteles Mar 20, 2018
612d7ae
Regen alloy-edit-all-min.js and alloy-edit-all-min.js.map
matuzalemsteles Mar 20, 2018
9dda671
Converts calls to React.createElement into JSX elements
matuzalemsteles Mar 21, 2018
391e95f
Replace AlloyEditor.ButtonTargetList to ButtonTargetList
matuzalemsteles Mar 22, 2018
50c1662
Pass bind the handles clicks
matuzalemsteles Mar 22, 2018
4335e63
Fixes ButtonCameraImage import
matuzalemsteles Mar 22, 2018
9860353
Fixes state override using class in ButtonEmbedEdit
matuzalemsteles Mar 22, 2018
8f6fe22
Build files (auto-generated)
matuzalemsteles Mar 22, 2018
bcd2d35
Exposes SelectionTests to AlloyEditor
matuzalemsteles Mar 26, 2018
d683e73
SF
matuzalemsteles Apr 3, 2018
d9f8683
Fix builds and generate all builds with webpack
matuzalemsteles Apr 3, 2018
99e512d
Build files (auto-generated)
matuzalemsteles Apr 3, 2018
3d01b4c
Move the test utils to the scripts/test path
matuzalemsteles Apr 3, 2018
bbde075
Create useful for loader of React, ReactDOM, ReactTestUtils and Alloy…
matuzalemsteles Apr 3, 2018
dd3f171
Simplify gulp-file to run only the tests
matuzalemsteles Apr 3, 2018
b20bdd1
Import your respective components and use ReactTestUtils in the UI tests
matuzalemsteles Apr 3, 2018
bda46eb
Provides for extend, Attribute and Core tests in window.AlloyEditor
matuzalemsteles Apr 3, 2018
8938b34
Install createReactClass and use in uibridge components
matuzalemsteles Apr 3, 2018
cd3e3a7
Build files (auto-generated)
matuzalemsteles Apr 3, 2018
3e235a1
Update Demo
matuzalemsteles Apr 4, 2018
0be9cef
Adds Karma common config
matuzalemsteles Apr 4, 2018
61be070
Use karma.common.js config
matuzalemsteles Apr 4, 2018
e4adac7
Export list with src files of the UI
matuzalemsteles Apr 4, 2018
b27ae9f
Remove use of the gulp and start tests with karma cli
matuzalemsteles Apr 4, 2018
97ff94a
Set singleRun true in karma.common.js
matuzalemsteles Apr 4, 2018
0338703
Update test configuration of core and plugins
matuzalemsteles Apr 4, 2018
2960f91
Fix import on the test button-target-list
matuzalemsteles Apr 4, 2018
8489773
Add ReactTestUtils and ReactDOM to dragresize_ie.js
matuzalemsteles Apr 4, 2018
6d3fc7a
Fix Selections import on the core
matuzalemsteles Apr 4, 2018
1baf4fc
Fix ButtonImageAlignRight import
matuzalemsteles Apr 4, 2018
09471c2
Add scripts to travis.yml
matuzalemsteles Apr 4, 2018
91a74e9
Exposes Lang for the tests
matuzalemsteles Apr 4, 2018
4ffda1a
Exposes SelectionSetPosition for the tests
matuzalemsteles Apr 5, 2018
0607c59
Remove use of PropTypes
matuzalemsteles Apr 6, 2018
0e2e4c4
Update React version to 16.3.1
matuzalemsteles Apr 9, 2018
fdc4982
Replace React.addons with ReactTestUtils in assertDropdownCommandButt…
matuzalemsteles Apr 9, 2018
b702cc0
Change ButtonImage that uses old refs API to new API from the latest …
matuzalemsteles Apr 9, 2018
1cbe570
Change ButtonEmbedEdit that uses old refs API to new API from the lat…
matuzalemsteles Apr 9, 2018
fb67a70
Change ButtonLinkEdit that uses old refs API to new API from the late…
matuzalemsteles Apr 9, 2018
8f720b0
Fix import the ButtonLinkTargetEdit in ButtonLinkEdit tests
matuzalemsteles Apr 9, 2018
84c09b2
Fixes ButtonTableCell tests
matuzalemsteles Apr 9, 2018
e44f8b1
Fixes ButtonTableColumn tests
matuzalemsteles Apr 10, 2018
7b2eef6
Change ButtonTableEdit that uses old refs API to new API from the lat…
matuzalemsteles Apr 10, 2018
23600b6
Fixes ButtonTableRow tests
matuzalemsteles Apr 10, 2018
159bb69
Fixes ButtonTableHeading tests
matuzalemsteles Apr 10, 2018
2c70af3
Fixes ButtonStylesList tests
matuzalemsteles Apr 10, 2018
6ba7f3f
Fixes ButtonTargetList tests
matuzalemsteles Apr 10, 2018
5da6660
Fixes ButtonLinkTargetEdit tests
matuzalemsteles Apr 10, 2018
760f9b8
Fix the initial state implementation of the component in ButtonLinkEdit
matuzalemsteles Apr 10, 2018
2845fc2
Create a simple WidgetPosition mock for testing
matuzalemsteles Apr 12, 2018
47f9332
Install transform-class-properties for static use in class
matuzalemsteles Apr 12, 2018
33a0e13
Remove WidgetPositionComponent inside WidgetPosition to only improve …
matuzalemsteles Apr 12, 2018
c98b27c
Fixes tests of WidgetInteractionPoint to use WidgetPosition mock
matuzalemsteles Apr 12, 2018
376ed18
Fixes ButtonDropdown imports on uibridge components
matuzalemsteles Apr 13, 2018
5a6864e
Skip some tests
matuzalemsteles Apr 13, 2018
c0663cb
SF
matuzalemsteles Apr 13, 2018
8a1a928
Build files (auto-generated)
matuzalemsteles Apr 13, 2018
6eaa02f
Show only webpack information when there is an error
matuzalemsteles Apr 13, 2018
6828f10
Add targets to presets-env
matuzalemsteles Apr 13, 2018
4ace226
SF
matuzalemsteles Apr 13, 2018
ed061cf
Remove npm run dev script to run on travis
matuzalemsteles Apr 13, 2018
f11c5c1
Remove the prepublish script from package.json
matuzalemsteles Apr 13, 2018
d37e603
Build files (auto-generated)
matuzalemsteles Apr 13, 2018
6e1cbc5
Remove support the IE 9 and IE 10
matuzalemsteles Apr 16, 2018
aa2f8f7
Add gulp tasks to generate icons, css and languages
matuzalemsteles Apr 17, 2018
29bb998
Fix arguments to generate a release demo
matuzalemsteles Apr 17, 2018
9c84c93
Generate the dev build along with the build for the release
matuzalemsteles Apr 17, 2018
621e12a
Minimize css when generating build for release
matuzalemsteles Apr 17, 2018
69f94be
Fixes path of generate languages
matuzalemsteles Apr 17, 2018
3ac5977
SF
matuzalemsteles Apr 17, 2018
55c0c11
Build files (auto-generated)
matuzalemsteles Apr 17, 2018
4c9be7b
Removes karma configs from plugins and core in favor of just global k…
matuzalemsteles Apr 17, 2018
be0c77c
Fixes the build in mode dev
matuzalemsteles Apr 18, 2018
bc7f532
Update demo template
matuzalemsteles Apr 18, 2018
ce35254
Build files (auto-generated)
matuzalemsteles Apr 18, 2018
c119e56
Expose Core to API
matuzalemsteles Apr 18, 2018
7adee71
Expose Selections to API
matuzalemsteles Apr 18, 2018
f3cf7cb
Expose SelectionGetArrowBoxClasses to API
matuzalemsteles Apr 18, 2018
a7967ae
Expose SelectionSetPosition to API
matuzalemsteles Apr 18, 2018
3e9978a
Remove Core and SelectionSetPosition exposed for testing since they a…
matuzalemsteles Apr 18, 2018
ec1d645
Build files (auto-generated)
matuzalemsteles Apr 18, 2018
1b0c878
Remove unnecessary import in dragresize_ie.js
matuzalemsteles Apr 19, 2018
35518e0
Update webpack to v4.6.0
matuzalemsteles Apr 19, 2018
00d8388
Expose OOP.extend, Lang and Attribute to API
matuzalemsteles Apr 20, 2018
e015c7c
Exports the bundle without React to UMD.
matuzalemsteles Apr 20, 2018
6e55586
Build files (auto-generated)
matuzalemsteles Apr 20, 2018
98fba19
Removes unnecessary exposure from OOP.extend, Attribute and Lang for …
matuzalemsteles Apr 20, 2018
111709e
Update gulp-iconfont
Dec 14, 2018
47eea05
Regen package-lock.json
matuzalemsteles May 16, 2018
e30e4b6
Resolve conflict for cherry-pick 126f2ec49e6df7ad16627688c606d3a08825…
matuzalemsteles May 16, 2018
e65529d
1.5.2
jbalsas May 17, 2018
136a856
Resolve conflict for cherry-pick cad4c7a03eb9342e64819cea0547a9b803d9…
jbalsas May 17, 2018
25b2afc
1.5.3
jbalsas May 17, 2018
b0ce9c4
Resolve conflict for cherry-pick 1658a122b2192f126d8af9f2c05bd23a703a…
jbalsas May 17, 2018
c4ec300
Resolve b400c59401c1590aa14c1ecd6291b2d53932c53a
SpencerWoo Jun 1, 2018
e467c74
check if selection is an image
SpencerWoo Jun 1, 2018
0c14c1a
Enhance url regular expression
diegonvs Jun 1, 2018
a50112d
Adds a way to correct paste behavior of an URL
diegonvs Jun 1, 2018
8e4cadf
Adds support for URLs that are using ports
diegonvs Jun 4, 2018
89ae1ea
Fix conflict for caf17dec5790097eb405b57e816e3bfb5c7c1034
Dec 17, 2018
93a7785
1.5.4
jbalsas Jun 5, 2018
5f56a87
Fix conflict for 77c835aef6853bb4a8380df0422593e335aa09ff
jbalsas Jun 5, 2018
cdb3ebe
Fix conflict for c9ed24c100b7682ec7802ae1f2d949caca867b1c
SpencerWoo Jun 11, 2018
7a36ca0
refactor
SpencerWoo Jun 12, 2018
ea63486
Fix conflict for 11e2816e92bc1f07344bbef98f8bd2e2680d09aa
Dec 17, 2018
f1fe15d
Merge commit 'e5175416393c8c0d1c5a7a1022731487d8a7ddf8' into feature/…
Dec 17, 2018
950ca9d
Fixes image selection test
jbalsas Jun 12, 2018
783fbe2
1.5.5
jbalsas Jun 12, 2018
7672b58
Fix conflict for c1d36639612e01e943120cc420ac758d260b7e33
jbalsas Jun 12, 2018
96c1642
#858 getting right element for IE
linolaoj Jun 12, 2018
5e041d0
SF | Fixes #958
matuzalemsteles Jun 12, 2018
67c3c3a
Fix conflicts for 044ae5d4b4217bbf7f6d2cfdce575e8db6192a43
Dec 17, 2018
972a2f7
1.5.6
jbalsas Jun 12, 2018
68f7366
Fix conflict for 02f027480c0d9460be0302af51f26e4ee871c96e
jbalsas Jun 12, 2018
3028502
Fix conflict for 40a797cfd8229d9690527c21075c2969a9807918
Jun 14, 2018
3341ba5
Uses proper uiNode default
jbalsas Jun 14, 2018
b83abdd
Fix conflict for e8d0cc5551764d8ac67f65bcdf607aa0a7be0f46
Dec 17, 2018
1d564da
1.5.7
jbalsas Jun 14, 2018
162b0c7
Fix conflicts for f1d775e54d178cfb5a83f04fd99c77e7b8df8a4a
jbalsas Jun 14, 2018
e29c58c
Use uiNode in dragresize plugin
Jun 15, 2018
128efd3
Fix conflict for 9e606a51386278fa9f62b17771971673c9b6a41d
Dec 17, 2018
f2a3e88
Prevents defaulting uiNode to body if unset
jbalsas Jun 15, 2018
8d276fd
Merge commit 'd6bb222b63c3ee7e715752019d53d56b1df9ac70' into feature/…
Dec 17, 2018
a9c9f33
1.5.8
jbalsas Jun 15, 2018
c5c08ab
Fix conflict for 4e8e54e6bf94a79427797bc47d97ed60d32ffc2f
jbalsas Jun 15, 2018
a24d117
#858 getChildren is not filtering 'a'
linolaoj Jun 18, 2018
2d701b6
Fix conflict for d3c3794b8c59d0dfde2c6a7179d453a0d223955c
Dec 17, 2018
50b1840
1.5.9
jbalsas Jun 25, 2018
294621a
Fix conflict for b2e3a7e2cb7a13844f204f97fa731b40f597614e
jbalsas Jun 25, 2018
90e1108
Removes contenteditable attribute from image element when downcasting…
jbalsas Jun 26, 2018
8046bec
1.5.10
jbalsas Jun 26, 2018
1e231d1
Fix conflicts for 6aa8bc0dc15c93d6d02b06a03798c5345ad21c8c
jbalsas Jun 26, 2018
02a67c6
Controls the placement of the toolbar
Jul 11, 2018
284c4d8
Fix conflict for f10103176800c497f0e01c5c6f70a98a500cd832
Dec 17, 2018
53ba76f
1.5.11
jbalsas Jul 12, 2018
b4971c7
Fix conflict for 031ae200bed14881924e9cdf1759a9d805832e62
jbalsas Jul 12, 2018
011581a
Adjust toolbar placement on right side to prevent overflow
fortunatomaldonado Jul 17, 2018
94a6321
Fix conflict for 980e7825291c9377c0fbfb5d78a333d75698d88b
Dec 17, 2018
2a5986e
Runs only on paste actions
jbalsas Aug 2, 2018
a12fe8e
Fix conflict for c7a5948c855c72f0ad41b97336e28150dccb762d
jbalsas Aug 2, 2018
9daad07
Merge commit '2da51f895eaec032247267aefdf5d60f928f994b' into feature/…
Dec 17, 2018
6e7eb72
1.5.12
jbalsas Aug 2, 2018
c9fb14b
Fix conflicts for 2c0a76e4aacfee597df039c93d6278bfd841e4f9
jbalsas Aug 2, 2018
6c518c4
If we found < it means that most likely there's some tag and we don't…
arthurchan35 Aug 6, 2018
98c7be2
Fix conflicts for 43bf4eea96ff96301112a7c1d858efbf0086149b
Dec 17, 2018
88fb69f
Merge commit 'de3f5a60360a90c970d323ec6070ec374a05485b' into feature/…
Dec 17, 2018
476f689
Fix conflicts for 3f7a0dae5afadb7fa6c4639e869273bbae70907d
jbalsas Aug 21, 2018
793951c
Fix conflicts for c66fcb67b132c120dc83a48940e0d19f1cbbdf75
Dec 17, 2018
1848611
Merge commit 'f549d462037d2e9768dfbe6a253c797d7c74ce30' into feature/…
Dec 17, 2018
7025f3a
Fix conflict for 1fab086fd46703aa47982f613eb7b8b131ca783b
jbalsas Aug 21, 2018
e028f92
Fix conflict for 0fa7e4c066f09f38bc82c3178395f481162af80c
jbalsas Aug 21, 2018
ce39178
Updates CHANGELOG for v1.15.13
jbalsas Aug 21, 2018
db7721b
Fixes #885 | Fix editor.on paste function and enhance REGEX_URL
Sep 28, 2018
f7710d5
Fix conflict for b61bd0b53591390bba6269ce0a818d32cf829bc0
Oct 2, 2018
580c34d
Fix conflict for 43b6522dad14873ef2e17a4f579e8f9a66e1de58
Dec 17, 2018
86c7971
Fix conflict for 747a00a921195dd4b39b19a073807d94dfc4518e
Dec 17, 2018
da39cb9
Merge commit '1f1bb936ffea897d51f77e5d1b0a7f56513f8f5b' into feature/…
Dec 17, 2018
7852b8b
Fix conflict for 1108584cf513ffc241d1b6ace487ebca3b21c4ca
Oct 3, 2018
eb1a879
Fix conflicts for 43348fb354ed0112eac9c9ad1f65036b9c0786c5
Oct 3, 2018
d11c932
Updates CHANGELOG for v1.5.14
Oct 3, 2018
8abb9f3
Fix #845 - Remove resizer everytime the cursor gets out of the pillar…
rodrigopaulino Oct 18, 2018
7d39ab1
Fix conflicts for 91238c5fbc1c0042669a76d85b31d387cb621331
Dec 17, 2018
2c69c0f
Fix conflicts for 6189e1967997b54b57bbcca2a5b1ce721221c86c
Oct 23, 2018
1eedb21
Fix conflicts for 885782f238198f0ee2b6ea17a292dbdf4449274f
Oct 23, 2018
1d1b8b1
Updates CHANGELOG for v1.5.15
Oct 23, 2018
9ad5972
Fix #898 | Added center align css interaction between IE11 and other …
fortunatomaldonado Nov 7, 2018
0cecbeb
Fix conflict for 0afdb5e6a046f518a5b110040cdc8bd60b565339
Nov 15, 2018
9f48a05
Try to fix autolink test
Nov 15, 2018
34d1990
Fix conflict for d97896d65aa580dfed912f945047e557beb6eb8b
Dec 17, 2018
c52faa6
Merge commit '18ac73d6f065ab0c68919b8e58247aee222e3f1a' into feature/…
Dec 17, 2018
54f0117
Fixes #911 Use correct CSS to place drag resize handle at the corner
brianikim Nov 16, 2018
43670e6
Fixes https://github.com/liferay/alloy-editor/issues/900 Add closing …
SpencerWoo Nov 16, 2018
fb778d6
Fix conflict for 192a163751e08b5994166d73166dce5dd055770f
pavel-savinov Nov 19, 2018
cfb1cf7
Merge commit '89e3fcda530f32de42419c1c0e9a72cd559b0d61' into feature/…
Dec 17, 2018
300af45
Merge commit 'aab69a85512e1f9dddbb24bff8bda72e6cf23dc1' into feature/…
Dec 17, 2018
448bc3f
Merge commit 'f7a168bb6f2ea2f24f750ce16f68e06d2636dfe6' into feature/…
Dec 17, 2018
a5f176e
Fixes #915 - Checks if selection data exists in linkSelectionTest
jaclynong Nov 19, 2018
2cf2308
Merge commit 'f88abdcb968b99aab65f16d7f899ebb70794ac5d' into feature/…
Dec 17, 2018
e1012a0
Fixes #908 Remove unwanted tags after paste
fortunatomaldonado Nov 20, 2018
8829a58
Fix conflict for 1d404b0e37d6042050e747c965ec4dd0ea9e428d
Nov 23, 2018
4434717
Fix conflict for 7ea9e7661fe323b77aa04617bc74e9834cf0fcb7
Nov 23, 2018
d75a36b
Updates CHANGELOG for v1.5.16
Nov 23, 2018
9a1a113
Change dragresize implementation on IE to modify heigh and width insi…
gregory-bretall Nov 20, 2018
4ddf572
Fix conflict for 7f87818484f1bcb30517801c85310757c8e0b04a
Dec 17, 2018
a3dfac3
Fix conflict for abed0b17699139d658e0989ba6e631876b67f7ee
Nov 28, 2018
a74a5c5
Fix conflict for 173bb54971598bacdc340d84699a3b9003258b84
Dec 17, 2018
2fb1040
Fixes #931 | Fixes the saucelabs browser-matrix badge
Nov 29, 2018
0fbffa9
Fix conflict for 0139136f35de4affaa545ed5c61c684247490238
Nov 29, 2018
de5e755
Merge commit '6138c8b37baac5b652c36e35b04525a99b5136dc' into feature/…
Dec 17, 2018
85f2f1c
Fixes #924 Add styling for four drag handles of image resizer
Nov 22, 2018
d6145d2
Fixes #924 Add four drag handles to image resizer
Nov 26, 2018
dbd174b
Fixes #924 No longer need to add/remove CSS class based on image alig…
Nov 26, 2018
5ec74cf
Merge commit '73f472942d0e14e41ecdab12cccb902fb34cf7db' into feature/…
Dec 17, 2018
895aee0
Fixes #853 | Updates toolbar position when changing image alignment
Dec 3, 2018
f96c8b4
Merge commit '5d9b4805fa2dcf1273ef960577c1cb3fcfd6b691' into feature/…
Dec 17, 2018
aa7c755
Merge commit '2949f3e475793483e80bed3c1ee80087a6cd71d8' into feature/…
Dec 17, 2018
7781c79
Update ckeditor
Dec 7, 2018
5f7c042
Fix conflict for 1ab02307b3805e6292ea6e46dfb9c173039f0ad4
Dec 7, 2018
da89ed5
Fixes #906 | Reorder toolbar buttons for full mode
Dec 7, 2018
82f4f06
Fix conflict for c95d8dca51dcb165d92d01e8ad06140718cd0d95
Dec 17, 2018
35fca37
Merge commit '1076f991747dc4a62cfada84b127be1d70610616' into feature/…
Dec 17, 2018
2b835f4
Fix conflict for 5aabd16fc44bf55c5746d683a1180991ae0609ac
Dec 7, 2018
2377184
Fix conflict for ffe6112583e7a4635eb48d8b61846f73190154dd
Dec 7, 2018
73db55c
Updates CHANGELOG for v1.5.17
Dec 7, 2018
a257367
Update to React v16.6.3
Dec 19, 2018
1577fb4
Apply requested changes
Dec 21, 2018
861ed73
Merge branch '2.x-develop' into feature/react
julien Dec 21, 2018
bf95697
Regen package-lock
Dec 21, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ before_script:
- gem update --system
- gem install sass
- gem install compass

language: node_js

node_js:
- '8'

script:
- npm run test:saucelabs
- npm run testSaucelabs
188 changes: 188 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,193 @@
# Change Log

## [v1.5.17](https://github.com/liferay/alloy-editor/tree/v1.5.17) (2018-12-07)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.16...v1.5.17)

**Fixed bugs:**

- When Aligning an Image Context Bar Not Following Alignment \(Internet Explorer\) [\#853](https://github.com/liferay/alloy-editor/issues/853)
- Twitter link allows too many characters to be tweeted [\#829](https://github.com/liferay/alloy-editor/issues/829)

**Closed issues:**

- Alloy Editor is Mislabeled as a WYSIWYG editor [\#936](https://github.com/liferay/alloy-editor/issues/936)
- Fix saucelabs badge in README [\#931](https://github.com/liferay/alloy-editor/issues/931)
- Fix installation with node v10.13.x [\#928](https://github.com/liferay/alloy-editor/issues/928)
- Feature Request: Feature Sets [\#906](https://github.com/liferay/alloy-editor/issues/906)
- Bug when editing a image link on IE 11 [\#858](https://github.com/liferay/alloy-editor/issues/858)
- Toolbar doesn't close after hyperlinking an image [\#848](https://github.com/liferay/alloy-editor/issues/848)

**Merged pull requests:**

- Updates CHANGELOG for v1.5.16 [\#943](https://github.com/liferay/alloy-editor/pull/943) ([julien](https://github.com/julien))
- Fixes \#853 | Updates toolbar position when changing image alignment [\#935](https://github.com/liferay/alloy-editor/pull/935) ([julien](https://github.com/julien))
- Fixes \#924 Add four drag handles for image resizing [\#934](https://github.com/liferay/alloy-editor/pull/934) ([diana-lin](https://github.com/diana-lin))
- Fixes \#829 | Limit tweet text to 280 chars [\#933](https://github.com/liferay/alloy-editor/pull/933) ([julien](https://github.com/julien))
- Fixes \#931 | Fixes the saucelabs browser-matrix badge [\#932](https://github.com/liferay/alloy-editor/pull/932) ([julien](https://github.com/julien))
- Fixes \#906 | Implement feature sets [\#930](https://github.com/liferay/alloy-editor/pull/930) ([julien](https://github.com/julien))
- Fixes \#928 | Update gulp-sass to work with node v10.x.x [\#929](https://github.com/liferay/alloy-editor/pull/929) ([julien](https://github.com/julien))
- Change dragresize implementation on IE to modify heigh and width insi… [\#923](https://github.com/liferay/alloy-editor/pull/923) ([gregory-bretall](https://github.com/gregory-bretall))

## [v1.5.16](https://github.com/liferay/alloy-editor/tree/v1.5.16) (2018-11-23)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.15...v1.5.16)

**Fixed bugs:**

- Check published code for missing semi colons particularly in IE11 [\#900](https://github.com/liferay/alloy-editor/issues/900)
- Image alignment Center CSS clashes when switching from IE to Chrome [\#898](https://github.com/liferay/alloy-editor/issues/898)

**Closed issues:**

- IE11 needs four drag handles when resizing an image [\#924](https://github.com/liferay/alloy-editor/issues/924)
- AlloyEditor image resize handle position is misplaced in IE11 when image is right aligned [\#911](https://github.com/liferay/alloy-editor/issues/911)
- Copy and paste text link add tags in IE11 [\#908](https://github.com/liferay/alloy-editor/issues/908)

**Merged pull requests:**

- Fixes \#908 Remove unwanted tags after paste [\#919](https://github.com/liferay/alloy-editor/pull/919) ([fortunatomaldonado](https://github.com/fortunatomaldonado))
- Fixes \#915 - Checks if selection data exists in linkSelectionTest [\#918](https://github.com/liferay/alloy-editor/pull/918) ([julien](https://github.com/julien))
- LPS-87500 Add styleFn support for the ButtonStylesList component [\#916](https://github.com/liferay/alloy-editor/pull/916) ([pavel-savinov](https://github.com/pavel-savinov))
- Fixes https://github.com/liferay/alloy-editor/issues/900 Add closing … [\#913](https://github.com/liferay/alloy-editor/pull/913) ([SpencerWoo](https://github.com/SpencerWoo))
- Fixes \#911 Use correct CSS to place drag resize handle at the corner [\#912](https://github.com/liferay/alloy-editor/pull/912) ([brianikim](https://github.com/brianikim))
- Fix autolink test [\#907](https://github.com/liferay/alloy-editor/pull/907) ([julien](https://github.com/julien))
- Fix \#898 | Added center align css interaction between IE11 and other … [\#899](https://github.com/liferay/alloy-editor/pull/899) ([fortunatomaldonado](https://github.com/fortunatomaldonado))

## [v1.5.15](https://github.com/liferay/alloy-editor/tree/v1.5.15) (2018-10-23)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.14...v1.5.15)

**Fixed bugs:**

- Changing table column width in editor fails randomly [\#845](https://github.com/liferay/alloy-editor/issues/845)

**Merged pull requests:**

- Fix \#845 - Remove resizer everytime the cursor gets out of the pillar. Keeping the resizer there without any reason creates a black hole where the CKEditor's mousemove event is never triggered [\#893](https://github.com/liferay/alloy-editor/pull/893) ([julien](https://github.com/julien))

## [v1.5.14](https://github.com/liferay/alloy-editor/tree/v1.5.14) (2018-10-03)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.13...v1.5.14)

**Closed issues:**

- Improper formatting in editor in case of pasting a text that contains an email address or URL [\#885](https://github.com/liferay/alloy-editor/issues/885)
- How can I add/remove a CSS class to an Element via Button? [\#879](https://github.com/liferay/alloy-editor/issues/879)
- Image Toolbar extend past browser [\#876](https://github.com/liferay/alloy-editor/issues/876)

**Merged pull requests:**

- Updates CHANGELOG for v1.15.14 [\#889](https://github.com/liferay/alloy-editor/pull/889) ([julien](https://github.com/julien))
- Fixes \#876 | Fix toolbar position [\#888](https://github.com/liferay/alloy-editor/pull/888) ([julien](https://github.com/julien))
- Fixes \#885 | Fix editor.on paste function and enhance REGEX\_URL [\#886](https://github.com/liferay/alloy-editor/pull/886) ([rolandpakai](https://github.com/rolandpakai))

## [v1.5.13](https://github.com/liferay/alloy-editor/tree/v1.5.13) (2018-08-21)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.12...v1.5.13)

**Closed issues:**

- Add CONTRIBUTING.md and release documentation [\#873](https://github.com/liferay/alloy-editor/issues/873)

**Merged pull requests:**

- v1.15.13 [\#875](https://github.com/liferay/alloy-editor/pull/875) ([jbalsas](https://github.com/jbalsas))
- Fixes \#873 - Adds Contributing Guidelines and Release process documentation [\#874](https://github.com/liferay/alloy-editor/pull/874) ([jbalsas](https://github.com/jbalsas))
- \[TS\] LPS-84123 [\#872](https://github.com/liferay/alloy-editor/pull/872) ([arthurchan35](https://github.com/arthurchan35))

## [v1.5.12](https://github.com/liferay/alloy-editor/tree/v1.5.12) (2018-08-02)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.11...v1.5.12)

**Closed issues:**

- Text styling isn't removed when text is deleted [\#870](https://github.com/liferay/alloy-editor/issues/870)
- Toolbar increases in size when close to right window edge [\#866](https://github.com/liferay/alloy-editor/issues/866)

**Merged pull requests:**

- Adds special image2 version for IE11 [\#871](https://github.com/liferay/alloy-editor/pull/871) ([jbalsas](https://github.com/jbalsas))
- Adjust toolbar placement on right side to prevent overflow [\#868](https://github.com/liferay/alloy-editor/pull/868) ([fortunatomaldonado](https://github.com/fortunatomaldonado))

## [v1.5.11](https://github.com/liferay/alloy-editor/tree/v1.5.11) (2018-07-12)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.10...v1.5.11)

**Merged pull requests:**

- Controls the placement of the toolbar [\#867](https://github.com/liferay/alloy-editor/pull/867) ([julien](https://github.com/julien))

## [v1.5.10](https://github.com/liferay/alloy-editor/tree/v1.5.10) (2018-06-26)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.9...v1.5.10)

## [v1.5.9](https://github.com/liferay/alloy-editor/tree/v1.5.9) (2018-06-25)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.8...v1.5.9)

**Merged pull requests:**

- \#858 getChildren is not filtering 'a' [\#864](https://github.com/liferay/alloy-editor/pull/864) ([matuzalemsteles](https://github.com/matuzalemsteles))

## [v1.5.8](https://github.com/liferay/alloy-editor/tree/v1.5.8) (2018-06-15)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.7...v1.5.8)

**Merged pull requests:**

- Prevents defaulting uiNode to body if unset [\#863](https://github.com/liferay/alloy-editor/pull/863) ([jbalsas](https://github.com/jbalsas))
- Use uiNode in dragresize plugin [\#862](https://github.com/liferay/alloy-editor/pull/862) ([julien](https://github.com/julien))

## [v1.5.7](https://github.com/liferay/alloy-editor/tree/v1.5.7) (2018-06-14)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.6...v1.5.7)

**Merged pull requests:**

- Update position according to uiNode [\#861](https://github.com/liferay/alloy-editor/pull/861) ([jbalsas](https://github.com/jbalsas))

## [v1.5.6](https://github.com/liferay/alloy-editor/tree/v1.5.6) (2018-06-12)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.5...v1.5.6)

**Merged pull requests:**

- \#858 getting right element for IE [\#859](https://github.com/liferay/alloy-editor/pull/859) ([matuzalemsteles](https://github.com/matuzalemsteles))

## [v1.5.5](https://github.com/liferay/alloy-editor/tree/v1.5.5) (2018-06-12)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.4...v1.5.5)

**Merged pull requests:**

- Resize visible [\#855](https://github.com/liferay/alloy-editor/pull/855) ([SpencerWoo](https://github.com/SpencerWoo))
- Image link dev [\#849](https://github.com/liferay/alloy-editor/pull/849) ([SpencerWoo](https://github.com/SpencerWoo))

## [v1.5.4](https://github.com/liferay/alloy-editor/tree/v1.5.4) (2018-06-05)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.3...v1.5.4)

**Fixed bugs:**

- Drag and Drop Doesn't Work Within the Editor [\#839](https://github.com/liferay/alloy-editor/issues/839)

**Merged pull requests:**

- LPS-79540 AlloyEditor removes links with invalid characters [\#850](https://github.com/liferay/alloy-editor/pull/850) ([diegonvs](https://github.com/diegonvs))

## [v1.5.3](https://github.com/liferay/alloy-editor/tree/v1.5.3) (2018-05-17)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.2...v1.5.3)

## [v1.5.2](https://github.com/liferay/alloy-editor/tree/v1.5.2) (2018-05-17)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/v1.5.1...v1.5.2)

**Implemented enhancements:**

- Update 1.x CKEditor to 4.7? [\#797](https://github.com/liferay/alloy-editor/issues/797)

**Closed issues:**

- AlloyEditor is not working with ReactJS 16 [\#807](https://github.com/liferay/alloy-editor/issues/807)
- Crowdin setup [\#705](https://github.com/liferay/alloy-editor/issues/705)
- Internationalization Support [\#696](https://github.com/liferay/alloy-editor/issues/696)
- Support Ace inside of alloy-editor [\#400](https://github.com/liferay/alloy-editor/issues/400)
- Improve "how to use ckeditor plugins" documentation [\#384](https://github.com/liferay/alloy-editor/issues/384)

**Merged pull requests:**

- Changes the way to get the selected item in the ae\_dragresize\_ie plugin [\#841](https://github.com/liferay/alloy-editor/pull/841) ([matuzalemsteles](https://github.com/matuzalemsteles))
- Drag and Drop Doesn't Work Within the Editor Fixes \#839 [\#840](https://github.com/liferay/alloy-editor/pull/840) ([gregory-bretall](https://github.com/gregory-bretall))
- Adding webpack 4 in the build process, upgrading to React 16.3.1 and removing support for IE 9 and 10 [\#815](https://github.com/liferay/alloy-editor/pull/815) ([matuzalemsteles](https://github.com/matuzalemsteles))
- Fix broken link in README.md [\#812](https://github.com/liferay/alloy-editor/pull/812) ([lpsBetty](https://github.com/lpsBetty))
- Wraps load method to remove unwanted dependencies introduced in CKEditor plugins [\#805](https://github.com/liferay/alloy-editor/pull/805) ([jbalsas](https://github.com/jbalsas))

## [v1.5.1](https://github.com/liferay/alloy-editor/tree/v1.5.1) (2017-11-23)
[Full Changelog](https://github.com/liferay/alloy-editor/compare/1.5.0...v1.5.1)

Expand Down
161 changes: 161 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
# Contributing Guidelines

If you wish to contribute to AlloyEditor these guidelines will be important for
you. They cover instructions for setup, information on how the repository is
organized, as well as contribution requirements.

## Setup

TBD

## Repo organization

TBD

## Pull requests & Github issues

* All pull requests should be sent to the `develop` branch, as the `master`
branch should always reflect the most recent release.
* Any merged changes will remain in the `develop` branch until the next
scheduled release.
* The only exception to this rule is for emergency hot fixes, in which case the
pull request can be sent to the `master` branch.
* A Github issue should also be created for any bug fix or feature, this helps
when generating the CHANGELOG.md file.
* All commits in a given pull request should start with the `Fixes #xxx - `
message for traceability purposes.

## Tests

Any change (be it an improvement, a new feature or a bug fix) needs to include
a test, and all tests from the repo need to be passing. To run the tests you
can use our npm script:

```
npm test
```

This will run the complete test suite on Chrome. For a full test pass, you can
add local browsers to the root `karma.js` file and re-run the command.

Additionally, you can also run the test suite via Saucelabs with the following
npm script:

```
npm testSaucelabs
```

This last command is the one used by our CI integration.

## Formatting

TBD

## JS Docs

All methods should be documented, following [google's format](https://github.com/google/closure-compiler/wiki/Annotating-JavaScript-for-the-Closure-Compiler).

# Releasing

Collaborators with publish permissions should follow these steps.

There are two different workflows for publishing this project, one for scheduled
releases, and one for emergency hot fixes.

## Scheduled release

1. Create a release branch from the updated `develop` branch

```
git checkout develop
git pull upstream develop
git checkout -b release/vX.X.X
```

2. Send release PR to `master`

3. Wait to see that all tests pass and then merge with merge commit

4. Checkout and pull `master` locally

```
git checkout master && git pull upstream master
```

5. Update npm version

```
npm version patch|minor|major
```

6. Generate and commit dist files

```
gulp release
git add .
git commit -m "Build Files (auto-generated)"
```

7. Publish npm modules and push release tags

```
npm publish
git push && git push --tags
```

8. Generate changelog

github_changelog_generator (https://github.com/skywinder/github-changelog-generator)

9. Commit changelog and push to `master`

```
git add CHANGELOG.md
git commit -m "Updates CHANGELOG for vX.X.X"
git push
```

10. Sync `develop` with `master`

```
git checkout develop
git merge master
```

11. Do GitHub release using the pushed vX.X.X tag and the appropriate portion of
CHANGELOG.md

## Hot fix

1. Create a feature branch from `master` (assuming hot fix has already been
merged)

```
git checkout master
git pull upstream master
git checkout -b feature/fix_foo
```

2. Send a fix PR to `master`

3. Follow steps 3-11 of a scheduled release

## Updating CKEditor.

1. Open your favourite browser and navigate to https://ckeditor.com/cke4/builder.

2. On this page you should see a button labelled "Upload build-config.js", *click it*:

This will open a file dialog letting you choose CKEditor's build configuration file:

This file is located in `lib/ckeditor/build-config.js`, select it to upload it.

4. Optionally if you want to add more plugins, scroll down and you should see two panels:

On the left you'll see the list of selected plugins (automatically detected by parsing the `build-config.js` file uploaded previously) and on the right a list of the available plugins. Click on the plugins you wish to add and on the left arrow button ("<"), this will add the new plugins into the "selected plugins" panel.

5. Finally, scroll to the bottom of the page, agree to the terms of use and click the "Download CKEditor" button.

6. Once the file downloaded, unzip it and *replace* the `lib/ckeditor` directory with the new directory you unzipped.

7. Run `gulp release` and have a look at the demo to make sure everything is working correctly.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Works on IE9+, Chrome, Firefox and Safari.
## Features

* Smart toolbars appear right near the selected text and offer different functionality based on context
* Easily add your own buttons (see the "marquee" example in [the demo](http://alloyeditor.com/demo/))
* Easily add your own buttons (see the "marquee" example in [the docs](https://alloyeditor.com/docs/develop/create/create_buttons.html))
* Paste images from clipboard, or Drag&Drop them from another application
* Insert images from the device's camera!
* Paste rich text from any web page and preserve its formatting
Expand All @@ -32,4 +32,4 @@ Look for documentation and examples on [http://alloyeditor.com/](http://alloyedi

[![Build Status](https://travis-ci.org/liferay/alloy-editor.svg)](https://travis-ci.org/liferay/alloy-editor)

[![Sauce Test Status](https://saucelabs.com/browser-matrix/alloyui.svg)](https://saucelabs.com/u/alloyui)
[![Sauce Test Status](https://saucelabs.com/browser-matrix/alloy-editor.svg)](https://saucelabs.com/u/alloy-editor)
Loading