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

merge master to dev #128

Merged
merged 25 commits into from
May 1, 2024
Merged

merge master to dev #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
42fa7f9
Merge pull request #93 from mostafaznv/dev
mostafaznv Oct 31, 2023
8226818
Merge pull request #95 from mostafaznv/dev
mostafaznv Nov 1, 2023
9212a16
Merge pull request #96 from mostafaznv/dev
mostafaznv Nov 1, 2023
53a7ed9
Merge pull request #98 from mostafaznv/dev
mostafaznv Nov 10, 2023
d48ccc3
Merge pull request #100 from mostafaznv/dev
mostafaznv Nov 23, 2023
f1cf7f9
Merge pull request #101 from mostafaznv/dev
mostafaznv Nov 23, 2023
c87f67c
Create FUNDING.yml
mostafaznv Dec 6, 2023
fc04e6f
chore: delete FUNDING.yml
mostafaznv Dec 9, 2023
556f7bb
Merge pull request #102 from mostafaznv/dev
mostafaznv Dec 18, 2023
66296cd
Merge pull request #104 from mostafaznv/dev
mostafaznv Dec 22, 2023
f6fa30c
Merge pull request #105 from mostafaznv/dev
mostafaznv Dec 24, 2023
c1a7f11
Merge pull request #106 from mostafaznv/dev
mostafaznv Dec 24, 2023
244b218
Merge pull request #107 from mostafaznv/dev
mostafaznv Dec 24, 2023
33b0efe
Merge pull request #108 from mostafaznv/dev
mostafaznv Dec 24, 2023
efdb21a
Merge pull request #109 from mostafaznv/dev
mostafaznv Dec 24, 2023
6ed45d8
Merge pull request #110 from mostafaznv/dev
mostafaznv Dec 25, 2023
ddc3677
Merge pull request #115 from mostafaznv/dev
mostafaznv Feb 29, 2024
43995a8
Merge pull request #116 from mostafaznv/dev
mostafaznv Mar 14, 2024
e2b3e62
Merge pull request #119 from mostafaznv/dev
mostafaznv Mar 22, 2024
627b6a6
Merge pull request #123 from mostafaznv/dev
mostafaznv Apr 5, 2024
3108ef7
Merge pull request #124 from mostafaznv/dev
mostafaznv Apr 5, 2024
1881d98
Merge pull request #125 from mostafaznv/dev
mostafaznv Apr 5, 2024
e10d756
Merge pull request #126 from mostafaznv/dev
mostafaznv Apr 5, 2024
e11b0f6
feat: support ImageInsert
marcobax May 1, 2024
2fc02bf
Merge pull request #127 from marcobax/master
mostafaznv May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/nova-ckeditor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,8 @@
'resizeImage:50',
'resizeImage:75',
'resizeImage:original',
'|',
'insertImage',
],

'styles' => [
Expand Down
2 changes: 2 additions & 0 deletions resources/js/ckeditor/ckeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed'
import HtmlEmbed from '@ckeditor/ckeditor5-html-embed/src/htmlembed'
import ImageTextAlternative from '@ckeditor/ckeditor5-image/src/imagetextalternative'
import {LinkImage} from '@ckeditor/ckeditor5-link'
import { ImageInsert } from '@ckeditor/ckeditor5-image'

// Intend
import Indent from '@ckeditor/ckeditor5-indent/src/indent';
Expand Down Expand Up @@ -127,6 +128,7 @@ export default class CkEditor extends ClassicEditorBase {
ImageCaption,
ImageResize,
LinkImage,
ImageInsert,
ImageToolbar,
ImageTextAlternative,
MediaEmbed,
Expand Down
Loading