Compare commits
19 commits
63a732c499
...
395c7c1d51
Author | SHA1 | Date | |
---|---|---|---|
Simon Vieille | 395c7c1d51 | ||
Simon Vieille | 74613fca63 | ||
Simon Vieille | e8364a3876 | ||
Simon Vieille | 0320aef511 | ||
Simon Vieille | 2c9b1aef6b | ||
Simon Vieille | 77b100ff4c | ||
Simon Vieille | d4561c3db0 | ||
Simon Vieille | 65b35c990c | ||
Simon Vieille | 42985ef2d8 | ||
Simon Vieille | 68edabf1ad | ||
Simon Vieille | 8d77e9ce0a | ||
Simon Vieille | 5d7b3bc0ea | ||
Simon Vieille | 519d3be52f | ||
Simon Vieille | ae64ce900a | ||
Simon Vieille | a054445de6 | ||
Simon Vieille | 7afc3c4933 | ||
Simon Vieille | 9cc7575277 | ||
Simon Vieille | 561bc37e94 | ||
Simon Vieille | a5ef7a982c |
|
@ -9,15 +9,47 @@ steps:
|
|||
fi
|
||||
mkdocs build
|
||||
|
||||
deploy:
|
||||
image: eeacms/rsync
|
||||
secrets: [ssh_user_host, ssh_priv_key]
|
||||
commit:
|
||||
image: alpine/git
|
||||
secrets: [ssh_private_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
|
||||
- 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
|
||||
|
|
|
@ -5,7 +5,19 @@ hide:
|
|||
|
||||
# Changelog
|
||||
|
||||
???+ success "[v1.23.0] - 2023-11-01"
|
||||
???+ 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"
|
||||
|
||||
**Added**
|
||||
|
||||
|
|
|
@ -118,21 +118,23 @@ import '../../vendor/murph/murph-core/src/core/Resources/assets/js/admin.js'
|
|||
|
||||
window.tinymce.language = 'fr_FR'
|
||||
|
||||
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: '...'
|
||||
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: '...'
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
|
|
Loading…
Reference in a new issue