diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 556b93919..dca23b783 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Discuss feature request - url: https://github.com/Jermolene/TiddlyWiki5/discussions + url: https://github.com/TiddlyWiki/TiddlyWiki5/discussions about: Open new discussion about new feature - name: Talk.Tiddlywiki Forum url: https://talk.tiddlywiki.org diff --git a/.github/workflows/cla-check.yml b/.github/workflows/cla-check.yml index c6927fad9..72bba1c54 100644 --- a/.github/workflows/cla-check.yml +++ b/.github/workflows/cla-check.yml @@ -18,10 +18,10 @@ jobs: echo "CLA not signed" gh pr comment "$NUMBER" -b "@$USER It appears that this is your first contribution to the project, welcome. - With apologies for the bureaucracy, please could you prepare a separate PR to the 'tiddlywiki-com' branch with your signature for the Contributor License Agreement (see [contributing.md](https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md))." + With apologies for the bureaucracy, please could you prepare a separate PR to the 'tiddlywiki-com' branch with your signature for the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))." else echo "CLA already signed" - gh pr comment "$NUMBER" -b "**$USER** has signed the Contributor License Agreement (see [contributing.md](https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md))" + gh pr comment "$NUMBER" -b "Confirmed: **$USER** has already signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))" fi env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/cla-signed.yml b/.github/workflows/cla-signed.yml index fc3b205b8..6783219d1 100644 --- a/.github/workflows/cla-signed.yml +++ b/.github/workflows/cla-signed.yml @@ -66,5 +66,5 @@ jobs: for number in "${prs[@]}" do - gh pr comment "$number" -b "**$AUTHOR** has signed the Contributor License Agreement (see [contributing.md](https://github.com/Jermolene/TiddlyWiki5/blob/master/contributing.md))" + gh pr comment "$number" -b "**$AUTHOR** has signed the Contributor License Agreement (see [contributing.md](https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/contributing.md))" done diff --git a/bin/ci-pre-build.sh b/bin/ci-pre-build.sh index 6f4b0ca78..a11b8e0c4 100755 --- a/bin/ci-pre-build.sh +++ b/bin/ci-pre-build.sh @@ -7,4 +7,4 @@ 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 +git clone --depth=1 --branch=master "https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" output diff --git a/bin/ci-push.sh b/bin/ci-push.sh index dff297c80..fe8373785 100755 --- a/bin/ci-push.sh +++ b/bin/ci-push.sh @@ -10,6 +10,6 @@ git config --global user.email "actions@github.com" git config --global user.name "GitHub Actions" git add -A . git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" -git remote add deploy "https://$GH_TOKEN@github.com/Jermolene/jermolene.github.io.git" &>/dev/null +git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.com-gh-pages.git" &>/dev/null git push deploy master &>/dev/null cd .. diff --git a/boot/bootprefix.js b/boot/bootprefix.js index 0ae236c21..4dae1b28f 100644 --- a/boot/bootprefix.js +++ b/boot/bootprefix.js @@ -21,7 +21,7 @@ $tw.boot = $tw.boot || Object.create(null); // Detect platforms if(!("browser" in $tw)) { - $tw.browser = typeof(window) !== "undefined" ? {} : null; + $tw.browser = typeof(window) !== "undefined" && typeof(document) !== "undefined" ? {} : null; } if(!("node" in $tw)) { $tw.node = typeof(process) === "object" ? {} : null; diff --git a/contributing.md b/contributing.md index 549e862a6..707c34110 100644 --- a/contributing.md +++ b/contributing.md @@ -1,3 +1,3 @@ -

Contributing to TiddlyWiki5

Here we focus on contributions via GitHub Pull Requests but there are many other ways that anyone can help the TiddlyWiki project, such as reporting bugs or helping to improve our documentation.

Rules for Pull Requests

PRs must meet these minimum requirements before they can be considered for merging:

Imperative Mood for PR Titles

The "imperative mood" means written as if giving a command or instruction. See this post for more details, but the gist is that the title of the PR should make sense when used to complete the sentence "If applied, this commit will...". So for example, these are good PR titles:

These a poorly worded PR titles:

PR titles may also include a short prefix to indicate the subsystem to which they apply. For example:

Commenting on Pull Requests

One of the principles of open source is that many pairs of eyes on the code can improve quality. So, we welcome comments and critiques of pending PRs. Conventional Comments has some techniques to help make comments as constructive and actionable as possible. Notably, they recommend prefixing a comment with a label to clarify the intention:

praisePraises highlight something positive. Try to leave at least one of these comments per review. Do not leave false praise (which can actually be damaging). Do look for something to sincerely praise
nitpickNitpicks are small, trivial, but necessary changes. Distinguishing nitpick comments significantly helps direct the reader's attention to comments requiring more involvement
suggestionSuggestions are specific requests to improve the subject under review. It is assumed that we all want to do what's best, so these comments are never dismissed as “mere suggestions”, but are taken seriously
issueIssues represent user-facing problems. If possible, it's great to follow this kind of comment with a suggestion
questionQuestions are appropriate if you have a potential concern but are not quite sure if it's relevant or not. Asking the author for clarification or investigation can lead to a quick resolution
thoughtThoughts represent an idea that popped up from reviewing. These comments are non-blocking by nature, but they are extremely valuable and can lead to more focused initiatives and mentoring opportunities
choreChores are simple tasks that must be done before the subject can be “officially” accepted. Usually, these comments reference some common process. Try to leave a link to the process description so that the reader knows how to resolve the chore

Contributor License Agreement

Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).

How to sign the CLA

Create a GitHub pull request to add your name to cla-individual.md or cla-entity.md, with the date in the format (YYYY/MM/DD).

step by step

  1. Navigate to licenses/CLA-individual or licenses/CLA-entity according to whether you are signing as an individual or representative of an organisation
  2. Ensure that the "branch" dropdown at the top left is set to tiddlywiki-com
  3. Click the "edit" button at the top-right corner (clicking this button will fork the project so you can edit the file)
  4. Add your name at the bottom
  5. Below the edit box for the CLA text you should see a box labelled Propose file change
  6. Enter a brief title to explain the change (eg, "Signing the CLA")
  7. Click the green button labelled Propose file change
  8. On the following screen, click the green button labelled Create pull request

The CLA documents used for this project were created using Harmony Project Templates. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity". +

Contributing to TiddlyWiki5

Here we focus on contributions via GitHub Pull Requests but there are many other ways that anyone can help the TiddlyWiki project, such as reporting bugs or helping to improve our documentation.

Rules for Pull Requests

PRs must meet these minimum requirements before they can be considered for merging:

Imperative Mood for PR Titles

The "imperative mood" means written as if giving a command or instruction. See this post for more details, but the gist is that the title of the PR should make sense when used to complete the sentence "If applied, this commit will...". So for example, these are good PR titles:

These a poorly worded PR titles:

PR titles may also include a short prefix to indicate the subsystem to which they apply. For example:

Commenting on Pull Requests

One of the principles of open source is that many pairs of eyes on the code can improve quality. So, we welcome comments and critiques of pending PRs. Conventional Comments has some techniques to help make comments as constructive and actionable as possible. Notably, they recommend prefixing a comment with a label to clarify the intention:

praisePraises highlight something positive. Try to leave at least one of these comments per review. Do not leave false praise (which can actually be damaging). Do look for something to sincerely praise
nitpickNitpicks are small, trivial, but necessary changes. Distinguishing nitpick comments significantly helps direct the reader's attention to comments requiring more involvement
suggestionSuggestions are specific requests to improve the subject under review. It is assumed that we all want to do what's best, so these comments are never dismissed as “mere suggestions”, but are taken seriously
issueIssues represent user-facing problems. If possible, it's great to follow this kind of comment with a suggestion
questionQuestions are appropriate if you have a potential concern but are not quite sure if it's relevant or not. Asking the author for clarification or investigation can lead to a quick resolution
thoughtThoughts represent an idea that popped up from reviewing. These comments are non-blocking by nature, but they are extremely valuable and can lead to more focused initiatives and mentoring opportunities
choreChores are simple tasks that must be done before the subject can be “officially” accepted. Usually, these comments reference some common process. Try to leave a link to the process description so that the reader knows how to resolve the chore

Contributor License Agreement

Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).

How to sign the CLA

Create a GitHub pull request to add your name to cla-individual.md or cla-entity.md, with the date in the format (YYYY/MM/DD).

step by step

  1. Navigate to licenses/CLA-individual or licenses/CLA-entity according to whether you are signing as an individual or representative of an organisation
  2. Ensure that the "branch" dropdown at the top left is set to tiddlywiki-com
  3. Click the "edit" button at the top-right corner (clicking this button will fork the project so you can edit the file)
  4. Add your name at the bottom
  5. Below the edit box for the CLA text you should see a box labelled Propose file change
  6. Enter a brief title to explain the change (eg, "Signing the CLA")
  7. Click the green button labelled Propose file change
  8. On the following screen, click the green button labelled Create pull request

The CLA documents used for this project were created using Harmony Project Templates. "HA-CLA-I-LIST Version 1.0" for "CLA-individual" and "HA-CLA-E-LIST Version 1.0" for "CLA-entity".

This file was automatically generated by TiddlyWiki5

\ No newline at end of file diff --git a/core/modules/savers/put.js b/core/modules/savers/put.js index de9ba9465..a1ebef4bb 100644 --- a/core/modules/savers/put.js +++ b/core/modules/savers/put.js @@ -48,7 +48,7 @@ var PutSaver = function(wiki) { var self = this; var uri = this.uri(); // Async server probe. Until probe finishes, save will fail fast - // See also https://github.com/Jermolene/TiddlyWiki5/issues/2276 + // See also https://github.com/TiddlyWiki/TiddlyWiki5/issues/2276 $tw.utils.httpRequest({ url: uri, type: "OPTIONS", diff --git a/core/modules/storyviews/classic.js b/core/modules/storyviews/classic.js index c2848c435..044cd97f0 100644 --- a/core/modules/storyviews/classic.js +++ b/core/modules/storyviews/classic.js @@ -82,6 +82,10 @@ ClassicStoryView.prototype.remove = function(widget) { removeElement = function() { widget.removeChildDomNodes(); }; + // Blur the focus if it is within the descendents of the node we are removing + if($tw.utils.domContains(targetElement,targetElement.ownerDocument.activeElement)) { + targetElement.ownerDocument.activeElement.blur(); + } // Abandon if the list entry isn't a DOM element (it might be a text node) if(!targetElement || targetElement.nodeType === Node.TEXT_NODE) { removeElement(); diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js index 4ba037ed5..0b71e128c 100644 --- a/core/modules/utils/dom/dom.js +++ b/core/modules/utils/dom/dom.js @@ -270,6 +270,7 @@ Copy plain text to the clipboard on browsers that support it */ exports.copyToClipboard = function(text,options) { options = options || {}; + text = text || ""; var textArea = document.createElement("textarea"); textArea.style.position = "fixed"; textArea.style.top = 0; @@ -289,7 +290,7 @@ exports.copyToClipboard = function(text,options) { var succeeded = false; try { succeeded = document.execCommand("copy"); - } catch (err) { + } catch(err) { } if(!options.doNotNotify) { var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded", @@ -326,7 +327,7 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) { variables["tv-popup-coords"] = Popup.buildCoordinates(Popup.coordinatePrefix.csOffsetParent,nodeRect); var absRect = $tw.utils.extend({}, nodeRect); - for (var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) { + for(var currentNode = selectedNode.offsetParent; currentNode; currentNode = currentNode.offsetParent) { absRect.left += currentNode.offsetLeft; absRect.top += currentNode.offsetTop; } diff --git a/core/modules/utils/filesystem.js b/core/modules/utils/filesystem.js index 5319e0481..86001c291 100644 --- a/core/modules/utils/filesystem.js +++ b/core/modules/utils/filesystem.js @@ -238,7 +238,7 @@ exports.generateTiddlerFileInfo = function(tiddler,options) { } else { // Save as a .tid or a text/binary file plus a .meta file var tiddlerType = tiddler.fields.type || "text/vnd.tiddlywiki"; - if(tiddlerType === "text/vnd.tiddlywiki" || tiddler.hasField("_canonical_uri")) { + if(tiddlerType === "text/vnd.tiddlywiki" || tiddlerType === "text/vnd.tiddlywiki-multiple" || tiddler.hasField("_canonical_uri")) { // Save as a .tid file fileInfo.type = "application/x-tiddler"; fileInfo.hasMetaFile = false; diff --git a/core/ui/TestCases/DefaultTemplate.tid b/core/ui/TestCases/DefaultTemplate.tid index fb6e9edf1..04623cbc6 100644 --- a/core/ui/TestCases/DefaultTemplate.tid +++ b/core/ui/TestCases/DefaultTemplate.tid @@ -1,4 +1,5 @@ title: $:/core/ui/testcases/DefaultTemplate +code-body: yes \whitespace trim \procedure linkcatcherActions() @@ -46,7 +47,7 @@ title: $:/core/ui/testcases/DefaultTemplate <$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]" variable="listItem" > - <$transclude tiddler=<> mode="inline"/> + <$transclude $tiddler=<> $mode="inline"/> @@ -56,7 +57,7 @@ title: $:/core/ui/testcases/DefaultTemplate <%if [[Narrative]is[tiddler]] %>
- <$transclude $tiddler="Narrative" mode="block"/> + <$transclude $tiddler="Narrative" $mode="block"/>
<%endif%> <%if [match[fail]] %> diff --git a/core/ui/ViewTemplate/body/import.tid b/core/ui/ViewTemplate/body/import.tid index a456e1a4f..d8618c7cf 100644 --- a/core/ui/ViewTemplate/body/import.tid +++ b/core/ui/ViewTemplate/body/import.tid @@ -6,6 +6,7 @@ title: $:/core/ui/ViewTemplate/body/import \whitespace trim <$action-confirm $message={{$:/language/Import/Listing/Cancel/Warning}} > <$action-deletetiddler $tiddler=<>/> +<$action-deletetiddler $tiddler="$:/state/import/select-all"/> <$action-sendmessage $message="tm-close-tiddler" title=<>/> \end diff --git a/editions/de-AT/tiddlers/HelloThere.tid b/editions/de-AT/tiddlers/HelloThere.tid index aa8bf52e7..4c905ef23 100644 --- a/editions/de-AT/tiddlers/HelloThere.tid +++ b/editions/de-AT/tiddlers/HelloThere.tid @@ -27,7 +27,7 @@ Anders, als bei herkömmlichen Online-Diensten, lässt Ihnen ~TiddlyWiki die Fre {{$:/core/images/twitter}} @~TiddlyWiki on Twitter - + {{$:/core/images/github}} ~TiddlyWiki on ~GitHub diff --git a/editions/de-AT/tiddlers/community/Fur_Entwickler.tid b/editions/de-AT/tiddlers/community/Fur_Entwickler.tid index 2dbc185d7..26f03ca2c 100644 --- a/editions/de-AT/tiddlers/community/Fur_Entwickler.tid +++ b/editions/de-AT/tiddlers/community/Fur_Entwickler.tid @@ -8,4 +8,4 @@ Es gibt mehrere Ressourcen für Entwickler, um mehr über das TiddlyWiki Projekt * [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] Offizielle Entwickler Doku. * [[TiddlyWikiDev group|https://talk.tiddlywiki.org/c/devs/]] Diskussionsforum für Entwickler. -* https://github.com/Jermolene/TiddlyWiki5 .. Github Repository. +* https://github.com/TiddlyWiki/TiddlyWiki5 .. Github Repository. diff --git a/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid b/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid index 04cd2fa1a..e4c8a3f43 100644 --- a/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid +++ b/editions/de-AT/tiddlers/community/Wie_kann_ich_helfen_.tid @@ -13,7 +13,7 @@ OpenSource-Projekte, wie ~TiddlyWiki wachsen und gedeihen ''nur'' durch das Enga ~TiddlyWiki wird umso besser, je mehr Menschen es benutzen. ''Die beste Möglichkeit um die Zukunft zu sichern, ist ~TiddlyWiki 100 mal populärer zu machen, als es heute ist!'' * Zwitschern sie über ~TiddlyWiki :) [[I love TiddlyWiki because...|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]] -* Klicken sie den [[TiddlyWiki5 Star Button auf GitHub|https://github.com/Jermolene/TiddlyWiki5]] +* Klicken sie den [[TiddlyWiki5 Star Button auf GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]] * [[Veröffentlichen Sie das TiddlyWiki Poster|https://tiddlywiki.com/poster]] [img width=232 [Tiddler Poster.png]] @@ -28,7 +28,7 @@ Es gibt unzählige Möglichkeiten dem Projekt zu helfen: * Und vor allem: ''Lassen Sie uns das auch wissen :)'' ** [[Google Diskussions Forum|https://groups.google.com/forum/#!forum/tiddlywiki]] oder -** [[GitHub Ticket|https://github.com/Jermolene/TiddlyWiki5/issues]] +** [[GitHub Ticket|https://github.com/TiddlyWiki/TiddlyWiki5/issues]] Die ~TiddlyWiki Dokumentation und die Programme werden auf GitHub verwaltet. "Pull-Requests" werden gerne entgegen genommen. diff --git a/editions/de-AT/tiddlers/lexikon/GitHub.tid b/editions/de-AT/tiddlers/lexikon/GitHub.tid index ff26a2bbe..0b4fd66bd 100644 --- a/editions/de-AT/tiddlers/lexikon/GitHub.tid +++ b/editions/de-AT/tiddlers/lexikon/GitHub.tid @@ -7,5 +7,5 @@ type: text/vnd.tiddlywiki ~GitHub ist eine, für OpenSource Projekte kostenlose, Plattform, die es erlaubt gemeinsam an einem Projekt zu arbeiten und zu kommunizieren. -* ~TiddlyWiki: https://github.com/Jermolene/TiddlyWiki5 +* ~TiddlyWiki: https://github.com/TiddlyWiki/TiddlyWiki5 * ~GitHub: http://github.com diff --git a/editions/de-AT/tiddlers/maintainer/Wer pflegt diese Edition_.tid b/editions/de-AT/tiddlers/maintainer/Wer pflegt diese Edition_.tid index 9136dd78f..e5fdd0dd9 100644 --- a/editions/de-AT/tiddlers/maintainer/Wer pflegt diese Edition_.tid +++ b/editions/de-AT/tiddlers/maintainer/Wer pflegt diese Edition_.tid @@ -24,7 +24,7 @@ type: text/vnd.tiddlywiki !! GitHub -siehe: https://github.com/Jermolene/TiddlyWiki5/tree/master/languages +siehe: https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/languages !! Feedback diff --git a/editions/de-AT/tiddlers/referenz/Lizenzen.tid b/editions/de-AT/tiddlers/referenz/Lizenzen.tid index ba2ecb0c2..73a610d9e 100644 --- a/editions/de-AT/tiddlers/referenz/Lizenzen.tid +++ b/editions/de-AT/tiddlers/referenz/Lizenzen.tid @@ -7,7 +7,7 @@ title: Lizenzen type: text/vnd.tiddlywiki * ~TiddlyWiki Kern -** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/copyright.md +** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/copyright.md * ~TiddlyWiki Editionen -** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/cla-individual.md -** https://github.com/Jermolene/TiddlyWiki5/blob/master/licenses/cla-entity.md \ No newline at end of file +** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/cla-individual.md +** https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/licenses/cla-entity.md \ No newline at end of file diff --git a/editions/dev/tiddlers/Continuous Deployment.tid b/editions/dev/tiddlers/Continuous Deployment.tid index 3ea44245f..0d71747df 100644 --- a/editions/dev/tiddlers/Continuous Deployment.tid +++ b/editions/dev/tiddlers/Continuous Deployment.tid @@ -5,4 +5,4 @@ type: text/vnd.tiddlywiki TiddlyWiki 5 uses [[GitHub Actions|https://docs.github.com/en/actions]] for continuous deployment. It is driven by the workflow file `.github/workflows/ci.yml` in the repo, along with the scripts in the `bin` folder that it invokes. -The build history can be seen at https://github.com/Jermolene/TiddlyWiki5/actions +The build history can be seen at https://github.com/TiddlyWiki/TiddlyWiki5/actions diff --git a/editions/dev/tiddlers/GitHub Branches.tid b/editions/dev/tiddlers/GitHub Branches.tid index eb4ff4e5b..82bb388d3 100644 --- a/editions/dev/tiddlers/GitHub Branches.tid +++ b/editions/dev/tiddlers/GitHub Branches.tid @@ -3,7 +3,7 @@ modified: 20190115173645658 title: GitHub Branches type: text/vnd.tiddlywiki -Development of TiddlyWiki 5 in the GitHub repo at https://github.com/Jermolene/TiddlyWiki5 uses two branches: +Development of TiddlyWiki 5 in the GitHub repo at https://github.com/TiddlyWiki/TiddlyWiki5 uses two branches: * `master` contains the latest version of the code, and is deployed to https://tiddlywiki.com/prerelease * `tiddlywiki-com` contains the latest version of the documentation, and is deployed to https://tiddlywiki.com/, built by the latest released version of TiddlyWiki diff --git a/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid index 0bbc34194..0dbe51023 100644 --- a/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid +++ b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid @@ -6,7 +6,7 @@ Nonetheless, you may find techniques that are useful for your own scripts. ! Hosting -https://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/Jermolene/jermolene.github.io +https://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages The scripts live in the repository https://github.com/Jermolene/build.jermolene.github.io @@ -15,8 +15,8 @@ The scripts live in the repository https://github.com/Jermolene/build.jermolene. These scripts require the following directories to be siblings: * `build.jermolene.github.io` - a local copy of https://github.com/Jermolene/build.jermolene.github.io -* `jermolene.github.io` - a local copy of the repo https://github.com/Jermolene/jermolene.github.io -* `TiddlyWiki5` - a local copy of the repo https://github.com/Jermolene/TiddlyWiki5 +* `jermolene.github.io` - a local copy of the repo https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages +* `TiddlyWiki5` - a local copy of the repo https://github.com/TiddlyWiki/TiddlyWiki5 The scripts are designed to be executed with the current directory being the `TiddlyWiki5` directory. diff --git a/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid b/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid index 719340794..cb1d50684 100644 --- a/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid +++ b/editions/dev/tiddlers/from tw5.com/Developing plugins using Node.js and GitHub.tid @@ -36,7 +36,7 @@ mkdir TW5 !!! 2. Make a local read-only copy of the ~TiddlyWiki5 repository ```bash -git clone https://github.com/Jermolene/TiddlyWiki5.git TW5 +git clone https://github.com/TiddlyWiki/TiddlyWiki5.git TW5 ``` diff --git a/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid b/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid index 4cab413f5..e52806415 100644 --- a/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid +++ b/editions/dev/tiddlers/from tw5.com/How to create a translation for TiddlyWiki.tid @@ -11,7 +11,7 @@ type: text/vnd.tiddlywiki ! Setting Up -# Fork the TiddlyWiki GitHub repository (https://github.com/Jermolene/TiddlyWiki5) +# Fork the TiddlyWiki GitHub repository (https://github.com/TiddlyWiki/TiddlyWiki5) #* If your GitHub username is JoeBloggs, your fork will be https://github.com/JoeBloggs/TiddlyWiki5 # Create a branch with the name of the translation you intend to create (eg "cy-GB" for "Welsh (United Kingdom)") #* IETF language codes: http://www.lingoes.net/en/translator/langcode.htm @@ -45,4 +45,4 @@ Content of `plugin.info` for Joe Bloggs' Welsh translation: Sometimes the master en-GB language tiddlers are updated with revised content or new items. The best way to keep track of language-related commits to ~TiddlyWiki5:master is to monitor this RSS/Atom feed: -https://github.com/Jermolene/TiddlyWiki5/commits/master/core/language.atom +https://github.com/TiddlyWiki/TiddlyWiki5/commits/master/core/language.atom diff --git a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid index e658fe346..d861de232 100644 --- a/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid +++ b/editions/dev/tiddlers/from tw5.com/JavaScript Macros.tid @@ -22,7 +22,7 @@ Note that if the ''params'' array is missing or blank, then all the supplied par There are several JavaScript macros built into the core which can serve as a jumping off point for your own macros: -https://github.com/Jermolene/TiddlyWiki5/tree/master/core/modules/macros +https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/core/modules/macros Note that JavaScript macros work on both the client and the server, and so do not have access to the browser DOM. diff --git a/editions/dev/tiddlers/from tw5.com/moduletypes/SyncAdaptorModules.tid b/editions/dev/tiddlers/from tw5.com/moduletypes/SyncAdaptorModules.tid index a39c0f8da..d6cf1bcdf 100644 --- a/editions/dev/tiddlers/from tw5.com/moduletypes/SyncAdaptorModules.tid +++ b/editions/dev/tiddlers/from tw5.com/moduletypes/SyncAdaptorModules.tid @@ -14,7 +14,7 @@ SyncAdaptorModules encapsulate storage mechanisms that can be used by the SyncMe SyncAdaptorModules are represented as JavaScript tiddlers with the field `module-type` set to `syncadaptor`. -See [[this pull request|https://github.com/Jermolene/TiddlyWiki5/pull/4373]] for background on the evolution of this API. +See [[this pull request|https://github.com/TiddlyWiki/TiddlyWiki5/pull/4373]] for background on the evolution of this API. ! Exports diff --git a/editions/dev/tiddlers/new/Filter Operators.tid b/editions/dev/tiddlers/new/Filter Operators.tid index 19c99a51f..c7c2e7456 100644 --- a/editions/dev/tiddlers/new/Filter Operators.tid +++ b/editions/dev/tiddlers/new/Filter Operators.tid @@ -25,7 +25,7 @@ The function should return either a new [[tiddler iterator|Tiddler Iterators]], There are several filter operators built into the core which can serve as a jumping off point for your own filter operators: -https://github.com/Jermolene/TiddlyWiki5/tree/master/core/modules/filters +https://github.com/TiddlyWiki/TiddlyWiki5/tree/master/core/modules/filters ! Example diff --git a/editions/dev/tiddlers/new/Using TiddlyWiki as a library.tid b/editions/dev/tiddlers/new/Using TiddlyWiki as a library.tid index 983b7b7fd..2a57eb7f3 100644 --- a/editions/dev/tiddlers/new/Using TiddlyWiki as a library.tid +++ b/editions/dev/tiddlers/new/Using TiddlyWiki as a library.tid @@ -2,4 +2,4 @@ title: Using TiddlyWiki as a library in another Node.js application Node.js applications can include TiddlyWiki as a library so that they can use wikitext rendering. -See the demo at https://github.com/Jermolene/TiddlyWiki5DemoApp \ No newline at end of file +See the demo at https://github.com/TiddlyWiki/TiddlyWiki5DemoApp \ No newline at end of file diff --git a/editions/dev/tiddlers/system/ContributionBanner.tid b/editions/dev/tiddlers/system/ContributionBanner.tid index 0ec32b007..be936b4b8 100644 --- a/editions/dev/tiddlers/system/ContributionBanner.tid +++ b/editions/dev/tiddlers/system/ContributionBanner.tid @@ -3,7 +3,7 @@ tags: $:/tags/EditTemplate list-after: $:/core/ui/EditTemplate/title \define base-github() -https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/dev/tiddlers/ +https://github.com/TiddlyWiki/TiddlyWiki5/edit/master/editions/dev/tiddlers/ \end <$set name="draft-of" value={{{ [get[draft.of]] }}}> diff --git a/editions/dev/tiddlers/system/Sources.tid b/editions/dev/tiddlers/system/Sources.tid index 0c5082205..d4b4cbe91 100644 --- a/editions/dev/tiddlers/system/Sources.tid +++ b/editions/dev/tiddlers/system/Sources.tid @@ -3,7 +3,7 @@ tags: $:/tags/TiddlerInfo caption: Sources \define github-link-base() -https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/dev/tiddlers/$(title)$ +https://github.com/TiddlyWiki/TiddlyWiki5/blob/master/editions/dev/tiddlers/$(title)$ \end \define make-github-link() diff --git a/editions/dev/tiddlers/system/github-fork-ribbon.tid b/editions/dev/tiddlers/system/github-fork-ribbon.tid index 01eb5c8d9..eefba8be3 100644 --- a/editions/dev/tiddlers/system/github-fork-ribbon.tid +++ b/editions/dev/tiddlers/system/github-fork-ribbon.tid @@ -3,4 +3,4 @@ tags: $:/tags/PageTemplate caption: ~GitHub ribbon description: ~GitHub ribbon for tw5.com/dev - \ No newline at end of file + \ No newline at end of file diff --git a/editions/es-ES/tiddlers/$__ContributionBanner.tid b/editions/es-ES/tiddlers/$__ContributionBanner.tid index 484917633..2ba23b5fb 100644 --- a/editions/es-ES/tiddlers/$__ContributionBanner.tid +++ b/editions/es-ES/tiddlers/$__ContributionBanner.tid @@ -6,7 +6,7 @@ title: $:/ContributionBanner type: text/vnd.tiddlywiki \define base-github() -https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/es-ES/tiddlers/ +https://github.com/TiddlyWiki/TiddlyWiki5/edit/master/editions/es-ES/tiddlers/ \end <$set name="draft-of" value={{{ [get[draft.of]] }}}> diff --git a/editions/es-ES/tiddlers/Articles.tid b/editions/es-ES/tiddlers/Articles.tid index 2f82b46a4..9c01b852a 100644 --- a/editions/es-ES/tiddlers/Articles.tid +++ b/editions/es-ES/tiddlers/Articles.tid @@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki Estos son algunos artículos recientes publicados sobre ~TiddlyWiki. -Envía nuevos artículos que encuentres via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]] +Envía nuevos artículos que encuentres via [[GitHub|https://github.com/TiddlyWiki/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]