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

update v3 #17

Open
wants to merge 57 commits into
base: feature/v3-upgrade
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
ca0c5da
Updated README structure and added HTML Purifier config section
Jun 23, 2019
45d960c
Merge branch 'develop'
Jun 23, 2019
cd0ee18
updated readme
singhmonaaccolite Nov 28, 2019
c08aaf1
readme updated
singhmonaaccolite Nov 28, 2019
0fe8707
changes in readme
singhmonaaccolite Nov 29, 2019
d4439e9
Update to V3
kapil2704 Jan 21, 2020
ddbb66a
V3 Plugin Launch
kapil2704 Jan 21, 2020
3419076
v3 Update
kapil2704 Jan 21, 2020
3b3e251
v3 Image Update
kapil2704 Jan 21, 2020
27b3311
image update in readme
kapil2704 Jan 22, 2020
800b6e6
Merge pull request #16 from singhmonaaccolite/readme-v3
kapil2704 Jan 24, 2020
82543bd
Update to 3.1.0
kapil2704 Jan 27, 2020
e0f02fa
Merge branch 'feature/v3-upgrade' into develop
kapil2704 Jan 27, 2020
b6f4bb4
Update to v3.1.10
kapil2704 Jan 28, 2020
26acb04
Update to 3.2.0
kapil2704 Jul 22, 2020
ff7be71
Merge branch 'master' of github.com:froala/Craft-3-Froala-WYSIWYG int…
kapil2704 Aug 5, 2020
c0aff27
Update to v3.2.1
kapil2704 Aug 5, 2020
a4f55f5
Update to 3.2.5-1 version
kapil2704 Jan 6, 2021
3d155b9
Update to 3.2.5-2 version
kapil2704 Jan 19, 2021
b4c5ff8
Update to 3.2.6 version
kapil2704 Jan 25, 2021
a9955cd
Update to 3.2.6-1 version
kapil2704 Feb 5, 2021
0f9227f
Updated to v3.2.7
kapil2704 May 19, 2021
0c8613c
Updated to v4.0.0
kapil2704 Jun 1, 2021
c0309af
Update to v4.0.1
kapil2704 Jun 9, 2021
18c5faa
Update to 4.0.2
harasunu-narayan Jun 30, 2021
3468ff2
Updated to v4.0.3
harasunu-narayan Jul 6, 2021
2cae6d0
Updated to v4.0.4
harasunu-narayan Aug 3, 2021
8a20e3a
Updated to v4.0.5
harasunu-narayan Sep 20, 2021
148fef7
Update to v4.0.6
harasunu-narayan Oct 19, 2021
51262e1
Update to v4.0.7
harasunu-narayan Nov 23, 2021
6114f5a
Update to v4.0.8
harasunu-narayan Dec 21, 2021
7127890
Fix: Craft CMS integration is broken
jiteshgupta1995 Jan 4, 2022
78347ff
Fix: Craft CMS integration is broken
jiteshgupta1995 Jan 4, 2022
342e6f5
Merge pull request #24 from CelestialSystem/cel-4195
harasunu-narayan Jan 5, 2022
39fa1b7
Update to v4.0.9
harasunu-narayan Feb 2, 2022
d74fcb9
Update to v4.0.10
harasunu-narayan Mar 16, 2022
e9620e1
Update to v4.0.11
harasunu-narayan May 9, 2022
a937301
Update to v4.0.12
harasunu-narayan Jun 9, 2022
ee25181
Update to v4.0.13
harasunu-narayan Jul 11, 2022
7900fad
Update to v4.0.14
harasunu-narayan Aug 25, 2022
adf492c
Update to v4.0.15
harasunu-narayan Oct 12, 2022
4733f83
Update to v4.0.16
harasunu-narayan Nov 23, 2022
aa4fb28
Update to v4.0.17
harasunu-narayan Jan 19, 2023
5d815c6
Update to v4.0.18
harasunu-narayan Mar 23, 2023
c4d21e0
Update to v4.0.19
harasunu-narayan May 16, 2023
b0c7f5f
CI/CD implementation (#28)
froala-travis-bot Jun 29, 2023
356d884
Update to v4.1.0
harasunu-narayan Jul 12, 2023
64344f9
Update to v4.1.1
harasunu-narayan Aug 17, 2023
ccf1dd6
Update to v4.1.2
harasunu-narayan Sep 12, 2023
3467dd3
Update to v4.1.3
harasunu-narayan Oct 20, 2023
f7caaaf
Update to v4.1.4
harasunu-narayan Dec 7, 2023
135ee03
Update to v4.2.0
harasunu-narayan Mar 21, 2024
f537dc4
Update to v4.2.1
harasunu-narayan Jun 14, 2024
b872477
Update to v4.2.2
harasunu-narayan Sep 3, 2024
c327e04
Update to v4.3.0
harasunu-narayan Oct 1, 2024
3c14c0f
Update to v4.3.1
harasunu-narayan Nov 18, 2024
5ca8491
Update to v4.4.0
harasunu-narayan Jan 8, 2025
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
8 changes: 7 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
/screenshots export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.gitignore export-ignore
.travis.yml export-ignore
deploy_sdk.sh export-ignore
docker-compose.yml.template export-ignore
Dockerfile export-ignore
push-image-to-nexus.sh export-ignore
version.json export-ignore
35 changes: 35 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
git:
depth: false
quiet: false
language: generic
dist: bionic
sudo: required
branches:
only:
- /dev*/
- /AO-dev*/
- /QA*/
- /QE*/
- /RC*/
- /Release-Master*/

env:
- SHORT_COMMIT= `git rev-parse --short=7 ${TRAVIS_COMMIT}`

before_install:
- echo $TRAVIS_BRANCH
- echo $PWD
- echo $TRAVIS_COMMIT
- echo $BUILD_REPO_NAME
jobs:
include:
if: commit_message =~ /(deploy-yes)/
script:
- chmod u+x push-image-to-nexus.sh && bash push-image-to-nexus.sh
- chmod u+x deploy_sdk.sh && bash deploy_sdk.sh
notifications:
email:
recipients:
- [email protected]
on_success: always
on_failure: always
125 changes: 125 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,130 @@
# Craft CMS 3 - Froala WYSIWYG Editor Changelog

- Updated editor to version 4.4.0 along with the plugin version
## v4.4.0 - 2025-01-08

- Updated editor to version 4.3.1 along with the plugin version
## v4.3.1 - 2024-11-18

- Updated editor to version 4.3.0 along with the plugin version
## v4.3.0 - 2024-10-01

- Updated editor to version 4.2.2 along with the plugin version
## v4.2.2 - 2024-09-03

- Updated editor to version 4.2.1 along with the plugin version
## v4.2.1 - 2024-06-14

- Updated editor to version 4.2.0 along with the plugin version
## v4.2.0 - 2024-03-21

- Updated editor to version 4.1.4 along with the plugin version
## v4.1.4 - 2023-12-07

- Updated editor to version 4.1.3 along with the plugin version
## v4.1.3 - 2023-10-20

- Updated editor to version 4.1.2 along with the plugin version
## v4.1.2 - 2023-09-12

- Updated editor to version 4.1.1 along with the plugin version
## v4.1.1 - 2023-08-17

- Updated editor to version 4.1.0 along with the plugin version
## v4.1.0 - 2023-07-12

- Updated editor to version 4.0.19 along with the plugin version
## v4.0.19 - 2023-05-16

- Updated editor to version 4.0.18 along with the plugin version
## v4.0.18 - 2023-03-23

- Updated editor to version 4.0.17 along with the plugin version
## v4.0.17 - 2023-01-19

- Updated editor to version 4.0.16 along with the plugin version
## v4.0.16 - 2022-11-23

- Updated editor to version 4.0.15 along with the plugin version
## v4.0.15 - 2022-10-12

- Updated editor to version 4.0.14 along with the plugin version
## v4.0.14 - 2022-08-25

- Updated editor to version 4.0.13 along with the plugin version
## v4.0.13 - 2022-07-11

- Updated editor to version 4.0.12 along with the plugin version
## v4.0.12 - 2022-06-09

- Updated editor to version 4.0.11 along with the plugin version
## v4.0.11 - 2022-05-09

- Updated editor to version 4.0.10 along with the plugin version
## v4.0.10 - 2022-03-16

- Updated editor to version 4.0.9 along with the plugin version
## v4.0.9 - 2022-02-02

- Updated editor to version 4.0.8 along with the plugin version
## v4.0.8 - 2021-12-21

- Updated editor to version 4.0.7 along with the plugin version
## v4.0.7 - 2021-11-23

- Updated editor to version 4.0.6 along with the plugin version
## v4.0.6 - 2021-10-19

- Updated editor to version 4.0.5 along with the plugin version
## v4.0.5 - 2021-09-20

- Updated editor to version 4.0.4 along with the plugin version
## v4.0.4 - 2021-08-03

- Updated editor to version 4.0.3 along with the plugin version
## v4.0.3 - 2021-07-06

- Updated editor to version 4.0.2 along with the plugin version
## v4.0.2 - 2021-06-30

- Updated editor to version 4.0.1 along with the plugin version
## v4.0.1 - 2021-05-18

- Updated editor to version 3.2.6-1 along with the plugin version
## v3.2.6-1 - 2021-02-06

- Updated editor to version 3.2.6 along with the plugin version
## v3.2.6 - 2021-01-25

### Changed


- Updated editor to version 3.2.5-2 along with the plugin version
## v3.2.5-2 - 2021-01-06


### Changed

- Updated editor to version 3.2.5-1 along with the plugin version

## v3.2.1 - 2020-08-05

### Changed

- Updated editor to version 3.2.1 along with the plugin version

## v3.2.0 - 2020-07-23

### Changed

- Updated editor to version 3.2.0 along with the plugin version

## v3.1.0 - 2020-01-28

### Changed

- Updated editor to version 3.1.0 along with the plugin version

## v2.9.5 - 2019-06-08

### Changed
Expand Down
68 changes: 68 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
FROM php:8.1.19-apache
WORKDIR /var/www/html/

ENV APACHE_DOCUMENT_ROOT /var/www/html/
ENV CRAFT_ALLOW_SUPERUSER 1
ARG PackageName
ARG PackageVersion
ARG NexusUser
ARG NexusPassword

COPY --from=composer:2 /usr/bin/composer /usr/bin/composer

RUN apt-get update \
&& apt-get install -y git zip unzip zlib1g-dev libzip-dev wget netstat-nat net-tools libmagickwand-dev libicu-dev zlib1g-dev libicu-dev g++ --no-install-recommends \
&& apt-get -y autoremove \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

#RUN apt-get update && apt-get install -y libmagickwand-dev libicu-dev zlib1g-dev libicu-dev g++ --no-install-recommends && rm -rf /var/lib/apt/lists/*
RUN pecl install imagick-beta
#RUN docker-php-ext-enable imagick

RUN docker-php-ext-install zip \
&& docker-php-ext-install pcntl \
&& docker-php-ext-install bcmath \
&& docker-php-ext-configure intl \
&& docker-php-ext-install intl \
&& docker-php-ext-install mysqli pdo pdo_mysql \
&& docker-php-ext-enable pdo_mysql \
&& docker-php-ext-enable imagick


WORKDIR /var/www/html/
RUN composer create-project craftcms/craft=^1 .
# COPY . .
RUN chmod -R 777 /var/www/html/
# RUN composer global config --no-plugins allow-plugins.craftcms/plugin-installer true
RUN cat composer.json

RUN chmod -R 777 /var/www/html/config
RUN chmod -R 777 /var/www/html/web/cpresources
RUN chmod -R 777 /var/www/html/composer.json
# RUN chmod -R 777 /var/www/html/craft/

# RUN composer config --no-plugins allow-plugins.composer/installers true

RUN composer require froala/craft-froala-wysiwyg

RUN cat composer.json

RUN composer install

COPY . /var/www/html/vendor/froala/craft-froala-wysiwyg

RUN wget --no-check-certificate --user ${NexusUser} --password ${NexusPassword} https://nexus.tools.froala-infra.com/repository/Froala-npm/${PackageName}/-/${PackageName}-${PackageVersion}.tgz
RUN tar -xvf ${PackageName}-${PackageVersion}.tgz

RUN cp -a package/. /var/www/html/vendor/froala/wysiwyg-editor/
RUN rm -rf package ${PackageName}-${PackageVersion}.tgz

#RUN ./craft plugin/install froala-editor

EXPOSE 80
RUN sed -ri -e "s|/var/www/html|${APACHE_DOCUMENT_ROOT}|g" /etc/apache2/sites-available/*.conf
RUN sed -ri -e "s|/var/www/|${APACHE_DOCUMENT_ROOT}|g" /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
RUN chown -R www-data:www-data /var/www/html/
RUN chown -R www-data:www-data /var/www/html/craft
RUN a2enmod rewrite
83 changes: 75 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,96 @@ The implementation of the Froala Editor (license not included) for Craft CMS (v3

__[Check the Craft CMS v2 version here](https://github.com/froala/Craft-Froala-WYSIWYG/)__

![Entry Field Example](screenshots/editor-on-entry.png "Entry Field Example")
![Entry Field Example](screenshots/editor-on-entry.jpg "Entry Field Example")

## Installation

You can install this plugin from the Plugin Store or with Composer.

#### From the Plugin Store

Go to the Plugin Store in your project's Control Panel and search for "Froala". Then click on the "Install" button in its modal window.

#### With Composer

Open your terminal and run the following commands:

```bash
# go to the project directory
cd /path/to/my-project

# tell Composer to load the plugin
composer require froala/craft-froala-wysiwyg

# tell Craft to install the plugin
./craft install/plugin froala-editor
```

## Known issue (help wanted!)

Adding links to Craft Entries causing issues when you double click on the entry to link to. Just click once and use the "Select" button.

Sorry for the inconvience. We're working on these annoying issues. But we decided to release a new version because of some missing important other features (like saving links the Craft way).

## Installation
## Configuration

Tell composer to load the plugin
### Froala Configs

```terminal
composer require froala/craft-froala-wysiwyg
You can create custom configs that will be available to your Froala fields. They should be created as JSON files in your `config/froalaeditor/` folder.

For example, if you created a `config/froalaeditor/Simple.json` file with the following content:

```json
{
"toolbarButtons": [
"bold", "italic", "underline", "strikeThrough", "formatOL", "formatUL", "insertHR", "|",
"undo", "redo", "|", "paragraphFormat", "paragraphStyle", "|", "html"
],
"paragraphFormat": {
"N": "Normal",
"H1": "Heading 1",
"H2": "Heading 2",
"H3": "Heading 3",
"H4": "Heading 4"
}
}
```

Afterwards you have to install the plugin via the control panel:
…then a "Simple" option would become available within the config section on your Froala field’s settings.

See the [Froala documentation](https://www.froala.com/wysiwyg-editor/docs/options) for a list of available config options and buttons.

## Third party plugins

```html
<!-- Include third party plugins -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<script src="../../js/third_party/font_awesome.min.js"></script>
<script src="../../js/third_party/spell_checker.min.js"></script>
<script src="../../js/third_party/embedly.min.js"></script>
<script src="../../js/third_party/image_tui.min.js"></script>
<link rel="stylesheet" href="../../css/third_party/image_tui.min.css">
```
Settings > Plugins > Froala WYSIWYG > Install

### HTML Purifier Configs

Froala fields use [HTML Purifier](http://htmlpurifier.org) to ensure that no malicious code makes it into its field values, to prevent XSS attacks and other vulnerabilities.

You can create custom HTML Purifier configs that will be available to your Froala fields. They should be created as JSON files in your `config/htmlpurifier/` folder.

Use this as a starting point, which is the default config that Froala fields use if no custom HTML Purifier config is selected:

```json
{
"Attr.AllowedFrameTargets": ["_blank"],
"Attr.EnableID": true,
"HTML.AllowedComments": ["pagebreak"]
}
```

Or use the Craft CMS plugin store to install the plugin.
(The [HTML.AllowedComments](http://htmlpurifier.org/live/configdoc/plain.html#HTML.AllowedComments) option is required for the `pagebreak` plugin.)

See the [HTML Purifier documentation](http://htmlpurifier.org/live/configdoc/plain.html) for a list of available config options.

## Contributing

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "froala/craft-froala-wysiwyg",
"description": "Craft 3 CMS plugin for Froala WYSIWYG HTML Rich Text Editor.",
"type": "craft-plugin",
"version": "3.0.0-rc.2",
"version": "4.4.0",
"keywords": [
"craft",
"craftcms",
Expand All @@ -15,7 +15,7 @@
"license": "MIT",
"require": {
"craftcms/cms": "^3.1",
"froala/wysiwyg-editor": "v3.0.0-rc.2"
"froala/wysiwyg-editor": "4.4.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading