diff --git a/contributing.md b/contributing.md index 832b9432f..58e64e879 100644 --- a/contributing.md +++ b/contributing.md @@ -1,3 +1,3 @@ -

Contributing to TiddlyWiki5

We welcome contributions to the code and documentation of TiddlyWiki in several ways:

There are other ways to help TiddlyWiki too.

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).

eg: Jeremy Ruston, @Jermolene, 2011/11/22


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

We welcome contributions to the code and documentation of TiddlyWiki in several ways:

There are other ways to help TiddlyWiki too.

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. click licenses/CLA-individual or licenses/CLA-entity
  2. in cla-individual.md or cla-entity.md click icon on the top-right corner (clicking this button will fork the project so you can edit the file)
  3. add your name at the bottom

eg: Jeremy Ruston, @Jermolene, 2011/11/22


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/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid new file mode 100644 index 000000000..5d98ef3e4 --- /dev/null +++ b/editions/dev/tiddlers/build/Releasing a new version of TiddlyWiki.tid @@ -0,0 +1,20 @@ +title: Releasing a new version of TiddlyWiki + +# Adjust the release date of the latest release tiddler (eg, [[Release 5.1.3]]) +# Ensure [[Releases]] has the new version as the default tab +# Adjust the modified time of HelloThere +# Make sure ''Jermolene/TiddlyWiki5'' is fully committed +# Edit `package.json` to the new version number +# Run `bin/makereadmes.sh` to build the readme files +# Restore `package.json` to the previous version number +# Run `bin/verbump "5.1.3"` (substituting the correct version number) to update the version number and assign it a tag +# Run `npm publish` to publish to npm +# Verify that the new release of TiddlyWiki is available at https://www.npmjs.org/package/tiddlywiki +# Check the version number of TiddlyWiki specified in `package.json` +# Change current directory to the `build.jermolene.github.io` directory +# Run `npm install` to install the correct version of TiddlyWiki +# Change current directory to the `TiddlyWiki5` directory +# Run `../build.jermolene.github.io/bld.sh` to build the content files +# Verify that the files in the `jermolene.github.io` directory are correct +# Run `../build.jermolene.github.io/deploy.sh` to push the new files to GitHub +# Run `bin/wbld.sh ` diff --git a/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid b/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid new file mode 100644 index 000000000..54db985f6 --- /dev/null +++ b/editions/dev/tiddlers/build/Releasing new content for TiddlyWiki.tid @@ -0,0 +1,6 @@ +title: Releasing new content for TiddlyWiki + +# Change current directory to the `TiddlyWiki5` directory +# Run `../build.jermolene.github.io/bld.sh` to build the content files +# Verify that the files in the `jermolene.github.io` directory are correct +# Run `../build.jermolene.github.io/deploy.sh` to push the new files to GitHub diff --git a/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid new file mode 100644 index 000000000..64814c503 --- /dev/null +++ b/editions/dev/tiddlers/build/Scripts for building tiddlywiki.com.tid @@ -0,0 +1,68 @@ +title: Scripts for building tiddlywiki.com + +These scripts are used to build and release the content for tiddlywiki.com. They are not designed for general purpose use, but you may find techniques that are useful for your own scripts. + +! Hosting + +http://tiddlywiki.com is served by [[GitHub Pages|https://pages.github.com]] from the repository https://github.com/Jermolene/jermolene.github.io + +The scripts live in the repository https://github.com/Jermolene/build.jermolene.github.io + +! Directory structure + +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/jermolene.github.io + +The scripts are designed to be executed with the current directory being the `TiddlyWiki5` directory. + +! Configuration + +!! package.json + +The `package.json` in the root of the `build.jermolene.github.io` repository contains a dependency declaration that specifies the latest official released version of TiddlyWiki to be used when building the release targets: + +``` + + "dependencies": { + "tiddlywiki": "5.1.2" + } +``` + +!! Environment variables + +Some of the scripts use the following environment variables: + +* ''TW5_BUILD_MAIN_EDITION'' - the path to the wiki folder to be used as the main edition, generating `index.html` and `encrypted.html` +* ''TW5_BUILD_OUTPUT'' - the path to the output folder (defaults to `../jermolene.github.io`) +* ''TW5_BUILD_TIDDLYWIKI'' - the pathname of the `tiddlywiki.js` to be used (defaults to `../build.jermolene.github.io/node_modules/tiddlywiki/tiddlywiki.js`) + +! Scripts + +!! `bld.sh` + +Builds the `tiddlywiki.com` target files. By default, it uses the version of tiddlywiki specified in the `package.json` file. This can be overridden with the ''TW5_BUILD_TIDDLYWIKI'' environment variable. The following command would select the latest prerelease version of tiddlywiki from the `TiddlyWiki5` directory: + +``` + TW5_BUILD_TIDDLYWIKI=./tiddlywiki.js +``` + +!! `prerelease-bld.sh` + +Builds the `tiddlywiki.com/prerelease` target files using the latest TiddlyWiki prerelease code and special ''prerelease'' edition for the content. + +!! `deploy.sh` + +Pushes the latest changes to the `jermolene.github.io` directory to GitHub. + +! Procedures + +!! Releasing a new version of TiddlyWiki + +{{Releasing a new version of TiddlyWiki}} + +!! Releasing new content for TiddlyWiki + +{{Releasing new content for TiddlyWiki}} diff --git a/editions/dev/tiddlers/from tw5.com/Procedure for releasing a new version of TiddlyWiki5.tid b/editions/dev/tiddlers/from tw5.com/Procedure for releasing a new version of TiddlyWiki5.tid deleted file mode 100644 index 39d711b9c..000000000 --- a/editions/dev/tiddlers/from tw5.com/Procedure for releasing a new version of TiddlyWiki5.tid +++ /dev/null @@ -1,16 +0,0 @@ -created: 20131130132123707 -modified: 20140908153054348 -tags: dev -title: Releasing a new version of TiddlyWiki5 -type: text/vnd.tiddlywiki - -# Adjust the release date of the latest release tiddler (eg, [[Release 5.0.7-beta]]) -# Ensure [[Releases]] has the new version as the default tab -# Adjust the modified time of HelloThere -# Make sure ''Jermolene/TiddlyWiki5'' is fully committed -# Edit `package.json` to the new version number -# Run `bin/bld.sh` to build the deployment files -# Restore `package.json` to the previous version number -# Run `bin/verbump "5.0.8-beta"`, substituting the new version number -# Run `bin/deploy.sh` -# Run `bin/wbld.sh ` diff --git a/readme.md b/readme.md index be28003ce..7cceed996 100644 --- a/readme.md +++ b/readme.md @@ -1,189 +1,167 @@

Welcome to TiddlyWiki, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.

TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.

Learn more and see it in action at http://tiddlywiki.com/

Developer documentation is in progress at http://tiddlywiki.com/dev/

Installing TiddlyWiki on Node.js

  1. Install Node.js from http://nodejs.org
  2. Open a command line terminal and type:

    npm install -g tiddlywiki

    If it fails with an error you may need to re-run the command as an administrator:

    npm install -g tiddlywiki (Windows)

    sudo npm install -g tiddlywiki (Mac/Linux)

  3. Check TiddlyWiki is installed by typing:

    tiddlywiki --version

  4. In response, you should see TiddlyWiki report its current version (eg 5.0.8-beta; you may also see other debugging information reported)
  5. Try it out:
    1. tiddlywiki mynewwiki --init server to create a folder for a new wiki that includes server-related components
    2. tiddlywiki mynewwiki --server to start TiddlyWiki
    3. Visit http://127.0.0.1:8080/ in your browser
    4. Try editing and creating tiddlers

The -g flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it. -

Using TiddlyWiki on Node.js

TiddlyWiki5 can be used on the command line to perform an extensive set of operations based on TiddlyWikiFolders, TiddlerFiles and TiddlyWikiFiles.

For example, the following command loads the tiddlers from a TiddlyWiki HTML file and then saves one of them in static HTML:

tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html

Running tiddlywiki from the command line boots the TiddlyWiki kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.

The first argument is the optional path to the TiddlyWikiFolder to be loaded. If not present, then the current directory is used.

The commands and their individual arguments follow, each command being identified by the prefix --.

tiddlywiki [<wikipath>] [--<command> [<arg>[,<arg>]]]

The available commands are: