From ba9de17b87f3fb6b832dfccc65868334fabfabf2 Mon Sep 17 00:00:00 2001 From: gernert Date: Fri, 28 Aug 2020 16:38:47 +0200 Subject: [PATCH 01/10] Update SystemTag_ $__tags_Macro_View.tid (#4604) --- .../tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid index 9bcefa85c..723b0b130 100644 --- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Macro_View.tid @@ -1,9 +1,9 @@ caption: $:/tags/Macro/View created: 20200103092530990 -description: marks global macros +description: marks global macros only active in View template modified: 20200103092606462 tags: SystemTags title: SystemTag: $:/tags/Macro/View type: text/vnd.tiddlywiki -The [[system tag|SystemTags]] `$:/tags/Macro/View` marks macros that are only made available within the main view templates and the preview panel. \ No newline at end of file +The [[system tag|SystemTags]] `$:/tags/Macro/View` marks macros that are only made available within the main view templates and the preview panel. From 8bfd8f3a261b840cd76c14461c9002735f8ae8cd Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Fri, 28 Aug 2020 15:41:33 +0100 Subject: [PATCH 02/10] Update $:/tags/TextEditor/Snippet docs Fixes #4603 --- .../systemtags/SystemTag_ $__tags_Texteditor_Snippet.tid | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Texteditor_Snippet.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Texteditor_Snippet.tid index 131eef8b2..7d64c0537 100644 --- a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Texteditor_Snippet.tid +++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_Texteditor_Snippet.tid @@ -1,9 +1,9 @@ -caption: $:/tags/Texteditor/Snippet +caption: $:/tags/TextEditor/Snippet created: 20180926170345251 description: marks text snippets -modified: 20180926171456546 +modified: 20200828154100425 tags: SystemTags -title: SystemTag: $:/tags/Texteditor/Snippet +title: SystemTag: $:/tags/TextEditor/Snippet type: text/vnd.tiddlywiki -The [[system tag|SystemTags]] `$:/tags/Texteditor/Snippet` marks text snippets \ No newline at end of file +The [[system tag|SystemTags]] `$:/tags/TextEditor/Snippet` marks text snippets \ No newline at end of file From 4eda601a32105fef489d521abedf6b3eaaa0df8a Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Fri, 28 Aug 2020 15:46:29 +0100 Subject: [PATCH 03/10] Update "Hidden Setting: Disable Drag and Drop" with version tag Fixes #4573 --- .../hiddensettings/Hidden Setting_ Disable Drag and Drop.tid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Disable Drag and Drop.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Disable Drag and Drop.tid index 5348a15ea..62c07916a 100644 --- a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Disable Drag and Drop.tid +++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Disable Drag and Drop.tid @@ -4,7 +4,7 @@ tags: [[Hidden Settings]] title: Hidden Setting: Disable Drag and Drop type: text/vnd.tiddlywiki -To disable all the drag and drop operations that are built into the core, set the following tiddler to "no": +<.from-version "5.1.22">> To disable all the drag and drop operations that are built into the core, set the following tiddler to "no": $:/config/DragAndDrop/Enable From c187f4b238c307c14e13d55e846cbca6d293badd Mon Sep 17 00:00:00 2001 From: Habash Date: Fri, 28 Aug 2020 19:30:00 +0300 Subject: [PATCH 04/10] Signing the CLA (#4833) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 183c36bd8..b6446aee2 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -405,3 +405,5 @@ Csaba Molnar, @mocsa, 2020/04/29 Dazhong Xia, @jdangerx, 2020/06/23 Diep Pham, @favadi, 2020/07/30 + +Kamal Habash, @Kamal-Habash, 2020/08/28 From c60402b06d62124cc1ac852be6092a9fd339b2b9 Mon Sep 17 00:00:00 2001 From: Devin Weaver Date: Tue, 8 Sep 2020 06:34:35 -0400 Subject: [PATCH 05/10] Add Reveal.js plugin entry to Resources (#4842) --- .../examples/Reveal.js by Devin Weaver.tid | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 editions/tw5.com/tiddlers/community/examples/Reveal.js by Devin Weaver.tid diff --git a/editions/tw5.com/tiddlers/community/examples/Reveal.js by Devin Weaver.tid b/editions/tw5.com/tiddlers/community/examples/Reveal.js by Devin Weaver.tid new file mode 100644 index 000000000..bdca5af6f --- /dev/null +++ b/editions/tw5.com/tiddlers/community/examples/Reveal.js by Devin Weaver.tid @@ -0,0 +1,20 @@ +created: 20200907161522189 +modified: 20200907162234327 +tags: Resources +title: "Reveal.js" by Devin Weaver +type: text/vnd.tiddlywiki +url: https://sukima.github.io/tiddlywiki-reveal-js/ + +Embed [[Reveal.js|https://revealjs.com]] presentations inside your [[TiddlyWiki]]. + +{{!!url}} + +<<< +reveal.js enables you to create beautiful interactive slide decks using HTML. + +With the power of TiddlyWiki and Reveal.js one can… + +* …make an interactive tiddler with fancy animations +* …Make it go full screen for professional keynote +* …Distribute the slideshow with examples and additional resources in one HTML file +<<< From 68b455565baec267af76d2a1d198c45e85f2fa77 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Tue, 8 Sep 2020 12:55:07 +0100 Subject: [PATCH 06/10] Update workflow file --- .github/workflows/ci.yml | 74 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..9ac889fe9 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,74 @@ +on: + pull_request: + push: + branches: + - master + - tiddlywiki-com +env: + NODE_VERSION: "12" +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: "${{ env.NODE_VERSION }}" + - run: "./bin/test.sh" + build-prerelease: + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/master' + needs: test + env: + TW5_BUILD_TIDDLYWIKI: "./tiddlywiki.js" + TW5_BUILD_MAIN_EDITION: "./editions/prerelease" + TW5_BUILD_OUTPUT: "./output/prerelease" + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: "${{ env.NODE_VERSION }}" + - run: "./bin/ci-pre-build.sh" + # There's another near-duplicate "Set dynamic environment variables" step in + # the `build-tiddlywiki-com` job. + # These _could_ be extracted as a script (or moved into `ci-pre-build.sh`) to do away with the + # duplication, but, the visibility that comes from having these in the workflow file seems + # valuable. Environment variables are global variables and setting them at the top-level + # makes sense. + # Time to reconsider this decision might be when this setup turns out to be mistake-prone. + - name: "Set dynamic environment variables" + run: | + TW5_BUILD_BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }') + echo ::set-env name=TW5_BUILD_BRANCH::${TW5_BUILD_BRANCH} + echo ::set-env name=TW5_BUILD_VERSION::$(./bin/get-plugin-library-version-number) + echo ::set-env name=TW5_BUILD_DETAILS::Prerelease built from branch \'$TW5_BUILD_BRANCH\' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z') + - run: "./bin/build-site.sh" + - run: "./bin/ci-push.sh" + env: + GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }} + build-tiddlywiki-com: + runs-on: ubuntu-latest + if: github.ref == 'refs/heads/tiddlywiki-com' + needs: test + env: + TW5_BUILD_TIDDLYWIKI: "./node_modules/tiddlywiki/tiddlywiki.js" + TW5_BUILD_MAIN_EDITION: "./editions/tw5.com" + TW5_BUILD_OUTPUT: "./output" + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: "${{ env.NODE_VERSION }}" + - run: "./bin/ci-pre-build.sh" + # When making a change here, don't forget to see if it also applies to the step + # with the same name in the `build-prerelease` job. + - name: "Set dynamic environment variables" + run: | + TW5_BUILD_BRANCH=$(echo $GITHUB_REF | awk 'BEGIN { FS = "/" } ; { print $3 }') + echo ::set-env name=TW5_BUILD_BRANCH::${TW5_BUILD_BRANCH} + echo ::set-env name=TW5_BUILD_VERSION::$(./bin/get-plugin-library-version-number) + echo ::set-env name=TW5_BUILD_DETAILS::Built from branch \'$TW5_BUILD_BRANCH\' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z') + - run: "./bin/build-site.sh" + - run: "./bin/ci-push.sh" + env: + GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }} From 87dc67d0cd55454ff65a90ffa8839b4caef6e3b5 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Tue, 8 Sep 2020 12:59:37 +0100 Subject: [PATCH 07/10] Update CI scripts --- bin/ci-pre-build.sh | 10 ++++++++++ bin/ci-push.sh | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100755 bin/ci-pre-build.sh create mode 100755 bin/ci-push.sh diff --git a/bin/ci-pre-build.sh b/bin/ci-pre-build.sh new file mode 100755 index 000000000..6f4b0ca78 --- /dev/null +++ b/bin/ci-pre-build.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +# Install latest current release from npm +# (we need to force because otherwise npm will refuse to install a module of the same name) + +npm --force install tiddlywiki || exit 1 + +# Pull existing GitHub pages content + +git clone --depth=1 --branch=master "https://github.com/Jermolene/jermolene.github.io.git" output diff --git a/bin/ci-push.sh b/bin/ci-push.sh new file mode 100755 index 000000000..670d2acdf --- /dev/null +++ b/bin/ci-push.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# Push output back to GitHub + + +cd output || exit 1 + +git config --global user.email "actions@github.com" || exit 1 + +git config --global user.name "GitHub Actions" || exit 1 + +git add -A . || exit 1 + +git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" || exit 1 + +git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null || exit 1 + +git push deploy master &>/dev/null || exit 1 + +cd .. || exit 1 From 773dcce71339a0ae5777e748d5c7efaec3c74e3b Mon Sep 17 00:00:00 2001 From: Florian Kohrt Date: Thu, 24 Sep 2020 20:08:23 +0200 Subject: [PATCH 08/10] Signing the CLA (#4845) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index b6446aee2..60618fff2 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -407,3 +407,5 @@ Dazhong Xia, @jdangerx, 2020/06/23 Diep Pham, @favadi, 2020/07/30 Kamal Habash, @Kamal-Habash, 2020/08/28 + +Florian Kohrt, @fkohrt, 2020/09/10 From 405c618b6bb0470881f48c3e69d49589d3f04da9 Mon Sep 17 00:00:00 2001 From: Gerald Date: Fri, 25 Sep 2020 20:07:08 +0800 Subject: [PATCH 09/10] Signing the CLA (#4867) --- licenses/cla-individual.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md index 60618fff2..abddae206 100644 --- a/licenses/cla-individual.md +++ b/licenses/cla-individual.md @@ -409,3 +409,5 @@ Diep Pham, @favadi, 2020/07/30 Kamal Habash, @Kamal-Habash, 2020/08/28 Florian Kohrt, @fkohrt, 2020/09/10 + +Gerald Liu, @gera2ld, 2020/09/25 From 5ebd98779a97733e0bf24c12acd9e542bd548ad5 Mon Sep 17 00:00:00 2001 From: "jeremy@jermolene.com" Date: Thu, 8 Oct 2020 16:46:57 +0100 Subject: [PATCH 10/10] Update Quine 2 URL --- editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid index b32116f1a..4985f4dc7 100644 --- a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid +++ b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid @@ -5,12 +5,12 @@ created: 20131129101027725 delivery: App description: iPad/iPhone app for working with TiddlyWiki method: save -modified: 20200507104206754 +modified: 20201007205336209 tags: Saving iOS title: Saving on iPad/iPhone type: text/vnd.tiddlywiki -The iPad/iPhone app ''Quine 2'' makes it possible to view, edit and then save changes to TiddlyWiki5 on iOS. [[Download it here|https://itunes.apple.com/us/app/quine/id1228682923?mt=8]]. +The iPad/iPhone app ''Quine 2'' makes it possible to view, edit and then save changes to TiddlyWiki5 on iOS. [[Download it here|https://apps.apple.com/us/app/quine-2/id1450128957]]. Instructions for use: