Compare commits

..

No commits in common. "395c7c1d516d01641d37e90f3d3e0967713a3b23" and "63a732c49940b7794dd2bb32217ff2ad2c1de1fb" have entirely different histories.

3 changed files with 27 additions and 73 deletions

View file

@ -9,47 +9,15 @@ steps:
fi
mkdocs build
commit:
image: alpine/git
secrets: [ssh_private_key]
deploy:
image: eeacms/rsync
secrets: [ssh_user_host, ssh_priv_key]
commands:
- eval $(ssh-agent -s)
- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
- mkdir -p ~/.ssh && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
- git config --global user.email ci@gitnet.fr
- git config --global user.name CI
- git commit -m build -a
- git fetch --no-tags origin +refs/heads/pages
- git remote add upstream git@gitnet.fr:murph/murph-doc.git
- git switch pages
- mv site /tmp/
- rm * -fr
- mv /tmp/site/* .
- echo doc.murph-project.org > .domains
- git add .
- git commit -m "Build ${CI_BUILD_NUMBER}"
- git push upstream pages
# push:
# image: appleboy/drone-git-push
# commands:
# settings:
# branch: pages
# remote: git@gitnet.fr:murph/murph-doc.git
# force: false
# commit: false
# ssh_key:
# from_secret: ssh_key
#deploy:
# image: eeacms/rsync
# secrets: [ssh_user_host, ssh_priv_key]
# commands:
# - mkdir "$HOME/.ssh"
# - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
# - chmod 700 "$HOME/.ssh"
# - chmod 600 "$HOME/.ssh/id_ed25519"
# - rsync -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --delete ./site/ "$SSH_USER_HOST:web/"
# when:
# branch:
# - master
- mkdir "$HOME/.ssh"
- echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
- chmod 700 "$HOME/.ssh"
- chmod 600 "$HOME/.ssh/id_ed25519"
- rsync -e "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --delete ./site/ "$SSH_USER_HOST:web/"
when:
branch:
- master

View file

@ -5,19 +5,7 @@ hide:
# Changelog
???+ success "[v1.24.0] - 2024-01-27"
**Added**
* add CSS class `no-wrap`
* copy the pager of the CRUD at the bottom of the list
**Fixed**
* fix an issue with the file manager when editing an item opened in a modal
* fix type casting in slugifier
??? abstract "[v1.23.0] - 2023-11-01"
???+ success "[v1.23.0] - 2023-11-01"
**Added**

View file

@ -118,23 +118,21 @@ import '../../vendor/murph/murph-core/src/core/Resources/assets/js/admin.js'
window.tinymce.language = 'fr_FR'
window.tinymceModes = {
myCustomMode: {
plugins: '...',
menubar: '...',
toolbar: '...'
quickbars_selection_toolbar: '...'
contextmenu: '...'
templates: [
{
title: 'Container',
description: 'Add a bootstrap container',
content: '<div class="container"><div class="selcontent"></div></div>'
}
// ...
],
content_style: '...'
}
window.tinymce.murph.modes.myCustomMode = {
plugins: '...',
menubar: '...',
toolbar: '...'
quickbars_selection_toolbar: '...'
contextmenu: '...'
templates: [
{
title: 'Container',
description: 'Add a bootstrap container',
content: '<div class="container"><div class="selcontent"></div></div>'
}
// ...
],
content_style: '...'
}
```