Skip to content

Bug/aside images#50

Merged
urchykli merged 10 commits intodevelopmentfrom
bug/aside-images
May 14, 2021
Merged

Bug/aside images#50
urchykli merged 10 commits intodevelopmentfrom
bug/aside-images

Conversation

@urchykli
Copy link
Copy Markdown
Member

No description provided.

@urchykli urchykli merged commit 7294ae3 into development May 14, 2021
@urchykli urchykli deleted the bug/aside-images branch May 14, 2021 19:57
urchykli added a commit that referenced this pull request May 14, 2021
* Delete MAMP PRO logo

* Gulp config and github actions (#49)

* Update gulpfile to use gulp config instead of config.json to make site work with Local by flywheel

* Add github files for github actions deployment

* Update github workflow to deploy to multiple environments

* Git include and exclude files included in git deploy workflow

* Define local branch names in github deploy script

* Fix run syntax in GH deploy script

* Change GH WPE deployment script to single site

* Update secret key name and local branch in deployment script

* Update wpengine-deploy.yml

* Remove working directory in WPE deploy script

* Revert to reconcile merge conflicts

* Remove working directory in WPE deploy script

* Gulp config points to correct sass src directory

* Bug/aside images (#50)

* Removed $.trim from tinymce.js on insert function.

* Updatepackage lock

* Remove node sass

* Reinstall node sass

* Remove cache npm from travis file as it's causing the build to error

* Install node-gyp

* Remove node-sass

* In travis file change npm ci to npm install

* Update package.json and run npm install

Co-authored-by: MrBachChoi <55605733+MrBachChoi@users.noreply.github.com>

* Update readme with correct gulp config file

Co-authored-by: Jacque Schrag <jnschrag@users.noreply.github.com>
Co-authored-by: MrBachChoi <55605733+MrBachChoi@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants