1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-30 05:19:57 +00:00

Merge branch 'master' into multi-wiki-support

This commit is contained in:
Jeremy Ruston 2024-11-18 09:53:48 +00:00
commit b198270cb5
19 changed files with 111 additions and 83 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

@ -0,0 +1,3 @@
title: $:/_tw_shared/favicons/mws.tiddlywiki.com
type: image/png
tags: TiddlyWikiSitesMenu

View File

@ -0,0 +1,6 @@
title: $:/_tw_shared/sites/mws.tiddlywiki.com
tags: $:/tags/TiddlyWikiSites TiddlyWikiSitesMenu
caption: mws.tiddlywiki.com
description: ~MultiWikiServer Home
url: https://mws.tiddlywiki.com/
icon: $:/_tw_shared/favicons/mws.tiddlywiki.com

View File

@ -1,3 +1,3 @@
title: $:/tags/TiddlyWikiSites
list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/classic.tiddlywiki.com $:/_tw_shared/sites/marketplace
list: $:/_tw_shared/sites/tiddlywiki.com $:/_tw_shared/sites/tiddlywiki.org $:/_tw_shared/sites/talk.tiddlywiki.org $:/_tw_shared/sites/links.tiddlywiki.org $:/_tw_shared/sites/tiddlywiki.com.upgrade $:/_tw_shared/sites/tiddlywiki.com.dev $:/_tw_shared/sites/tiddlywiki.com.prerelease $:/_tw_shared/sites/mws.tiddlywiki.com $:/_tw_shared/sites/classic.tiddlywiki.com $:/_tw_shared/sites/marketplace
tags: TiddlyWikiSitesMenu

View File

@ -1,5 +1,5 @@
created: 20231005205623086
modified: 20240723172222378
modified: 20241115193649399
tags: About
title: TiddlyWiki Archive
@ -8,7 +8,7 @@ title: TiddlyWiki Archive
5.1.10 5.1.11 5.1.12 5.1.13 5.1.14 5.1.15 5.1.16 5.1.17 5.1.18 5.1.19
5.1.20 5.1.21 5.1.22 5.1.23
5.2.0 5.2.1 5.2.2 5.2.3 5.2.4 5.2.5 5.2.6 5.2.7
5.3.0 5.3.1 5.3.2 5.3.3 5.3.4 5.3.5
5.3.0 5.3.1 5.3.2 5.3.3 5.3.4 5.3.5 5.3.6
\end
Older versions of TiddlyWiki are available in the [[archive|https://github.com/TiddlyWiki/tiddlywiki.com-gh-pages/tree/master/archive]]:

View File

@ -2,7 +2,7 @@ title: HelloThumbnail - MultiWikiServer
tags: HelloThumbnail
color: purple
background-color: #fff
caption: Coming Soon
caption: ~MultiWikiServer
link: MultiWikiServer
image: MWS Banner.png
ribbon-text: SOON

View File

@ -1,11 +1,11 @@
caption: 5.3.6
created: 20241115170824144
modified: 20241115170824144
description: Improved Geospatial Plugin, Markdown Plugin, TestCaseWidget, Usability and Bug fixes
modified: 20241115194033978
released: 20241115170824144
tags: ReleaseNotes
title: Release 5.3.6
type: text/vnd.tiddlywiki
description: Under development
//[[See GitHub for detailed change history of this release|https://github.com/TiddlyWiki/TiddlyWiki5/compare/v5.3.5...v5.3.6]]//

View File

@ -1,17 +0,0 @@
title: MWS: Installation using Git
tags: MultiWikiServer
modified: 20241105133737778
created: 20241105133737778
These instructions require basic knowledge both of the terminal and of Git. There are also [[alternative instructions without using Git|MWS: Installation]].
# Clone the code from GitHub with: <<.copy-code-to-clipboard "git clone -b multi-wiki-support --single-branch https://github.com/TiddlyWiki/TiddlyWiki5">>
# Open a terminal window in the root of the downloaded folder
# Install the dependencies with the command: <<.copy-code-to-clipboard "npm install">>
# Start the server with the command: <<.copy-code-to-clipboard "npm start">>
# To use MWS, visit http://localhost:8080 in a browser on the same computer
# When you have finished using MWS, stop the server with <kbd>ctrl-C</kbd>
To update your copy of MWS with newer changes from ~GitHub, run the following command:
<<.copy-code-to-clipboard "git pull">>

View File

@ -1,15 +0,0 @@
title: MWS: Installation
tags: MultiWikiServer
modified: 20241105133737778
created: 20241105133737778
These instructions require minimal knowledge of the terminal. There are also [[alternative instructions for those using Git|MWS: Installation using Git]].
# Download the code [[direct from GitHub|https://github.com/TiddlyWiki/TiddlyWiki5/archive/refs/pull/7915/head.zip]]
# Open a terminal window in the root of the downloaded folder
# Install the dependencies with the command: <<.copy-code-to-clipboard "npm install">>
# Start the server with the command: <<.copy-code-to-clipboard "npm start">>
# To use MWS, visit http://localhost:8080 in a browser on the same computer
# When you have finished using MWS, stop the server with <kbd>ctrl-C</kbd>
To update your copy of MWS with newer changes will require re-downloading the code, taking care not to lose any changes you might have made.

View File

@ -1,13 +0,0 @@
title: MWS: Usage
tags: MultiWikiServer
modified: 20241105133737778
created: 20241105133737778
Once MWS is successfully [[installed|MWS: Installation]], you can access it by visiting http://localhost:8080 in a browser on the same computer.
By default, MWS is installed with full anonymous access enabled, meaning that anyone with access to the server has full access to read and modify anything. However, also by default, the server is only accessible to browsers on the same machine.
If you intend to put an MWS installation on a public network like the Internet, the server will need to be secured with the following steps:
* Create and login with a new administrator account
* Disable anonymouse access

View File

@ -3,9 +3,8 @@ tags: Definitions
modified: 20241105133737778
created: 20241105133737778
! Introduction
~MultiWikiServer is a new development that drastically improves ~TiddlyWiki's capabilities when running as server under Node.js. It brings ~TiddlyWiki up to par with common web-based tools like ~WordPress or ~MediaWiki by supporting multiple wikis and multiple users at the same time.
<span class="tc-float-right tc-bordered-image">[img width=200 [MWS Banner.png]]</span>
~MultiWikiServer is a new development that drastically improves ~TiddlyWiki's capabilities when running as a server under Node.js. It brings ~TiddlyWiki up to par with common web-based tools like ~WordPress or ~MediaWiki by supporting multiple wikis and multiple users at the same time.
Planned features include:
@ -15,12 +14,13 @@ Planned features include:
* Instantaneous synchronisation of changes between the server and all connected clients
* Workflow processing on the server, for example to automatically compress images, or to archive webpages
MWS is currently [[under development at GitHub|https://github.com/TiddlyWiki/TiddlyWiki5/pull/7915]] but it is already functional and usable.
MWS does require basic knowledge of the command line and Node.js but is designed to be as simple as possible to setup and use. Once downloaded, just two commands are needed to complete the installation and start the server:
! Installing MWS
```
npm install
npm start
```
{{MWS: Installation}}
MWS is currently [[under development at GitHub|https://github.com/TiddlyWiki/TiddlyWiki5/pull/7915]] but it is already functional and usable. Visit the MWS website for more information:
! Using MWS
{{MWS: Usage}}
! https://mws.tiddlywiki.com/

View File

@ -130,6 +130,25 @@ type: text/vnd.tiddlywiki
}
}
.tc-grid-columns {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(25em, 1fr));
gap: 1em;
width: 100%; /* Ensures container stretches fully */
}
.tc-grid-columns.tc-grid-columns-2 > div {
border-radius: 1em;
padding: 1em;
background-color: <<colour alert-background>>;
}
.tc-grid-columns.tc-grid-columns-2 > div:nth-child(odd) {
color: <<colour diff-delete-foreground>>;
background-color: <<colour diff-delete-background>>;
}
.tc-saving-sidebar-category { margin-bottom:10px; }
.tc-saving-sidebar-category-title { margin-bottom:5px; font-weight:bold; }
.tc-saving-sidebar-category-item { margin-left:10px; white-space:nowrap; }

View File

@ -0,0 +1,11 @@
title: TiddlyWiki Node.js Privacy and Security
tags: [[TiddlyWiki Privacy and Security]]
!!! Node.js Configuration
Using ~TiddlyWiki in the Node.js configuration requires more technical knowledge than the single file configuration. There are several important areas with respect to security and privacy.
* Most obviously, there is the matter of how user data is stored on disc as individual `.tid` files. Just as with the single file configuration, these are just ordinary files, and so can be used with third party tools that provide encryption.
* Consideration must also be given to how data is transmitted across the network. By default, the Node.js configuration does not use SSL and so network traffic can be observed by others.
** The impact of this is mitigated by the fact that, by default, only users on the same machine can connect to the server.
** ~TiddlyWiki itself does offer the option of setting up an SSL connection. However, it is generally advised to use an external proxy server to provide SSL services. nginx is popular for this purpose.

View File

@ -1,48 +1,55 @@
title: TiddlyWiki Privacy and Security
created: 20241106165307259
modified: 20241106165307259
modified: 20241117170845666
title: TiddlyWiki Privacy and Security
<span class="tc-float-right">[img width=200 [TiddlyWiki Privacy Badge.png]]</span>
TiddlyWiki is unique in that ordinary people without special training can use it securely and privately. It is easy to apply the advice from the EFF to ~TiddlyWiki. The key is that ~TiddlyWiki is just a file, and so everything that users may have already learned about how to keep documents and images private can be applied to ~TiddlyWiki.
<span class="tc-float-right tc-bordered-image">[img width=200 [TiddlyWiki Privacy Badge.png]]</span>
''TiddlyWiki is unique in that ordinary people can use it securely and privately without any special training.'' The key is that ~TiddlyWiki is just a text file, or a folder of files, so everything that you may already know about how to keep your documents and images private can be applied to ~TiddlyWiki. Also, because your ~TiddlyWiki data is stored in simple text files, you can be confident that it will still be securely accessible in the decades to come.
Because data is stored in simple text files, people choosing to use ~TiddlyWiki today can be confident that their data will still be accessible in the decades to come.
!! ~TiddlyWiki Configurations
! Verifiable Trust
~TiddlyWiki can be used in two main configurations:
An important aspect of ~TiddlyWiki's claims in the area of security and privacy is that these claims can be readily verified by anyone with basic technical skills. For example, the network monitoring tools built into browsers allow users to verify that ~TiddlyWiki doesn't send any data to other servers. Similarly anyone can open a ~TiddlyWiki HTML file in an editor and verify that their data is readily accessible.
* As a single HTML file that contains all the data and code. This is the easiest setup, and the most widely supported.
** Popular services like [[Tiddlyhost]] are based on the single file configuration
** See [[Saving]] for a listing of all the different ways to save a single file ~TiddlyWiki
* As a Node.js application that runs a web server. This configuration is more powerful, but requires more technical knowledge to set up and maintain. See:
** [[Installing TiddlyWiki on Node.js]]
** [[Using TiddlyWiki on Node.js]]
! Single File Configuration
The security and privacy implications of the two configurations are different:
As a practical matter, using ~TiddlyWiki securely and privately in the single file configuration depends upon keeping that single file securely and privately.
<div class="tc-flex-columns tc-flex-columns-2">
Users can employ the same tools that they use to keep any document and photograph secure. So, for many users, the simplest solution will be to use an existing file storage service such as Google Drive, Apple's iCloud, or Dropbox. Many users will already be relying on the privacy and security of these services.
<div>
There are also open source alternatives such as [[Syncthing|https://syncthing.net/]] that allow users to synchronise files between their devices without using a third party service.
{{TiddlyWiki Single File Privacy and Security}}
Users may wish to use additional layers of security. ~TiddlyWiki in the single file configuration itself offers built-in encryption. It uses an industry standard encryption library to offer AES 128 bit encryption in CCM mode. All the data within the file is encrypted, and cannot be accessed without entering the correct password. The password is never stored in the file, and so if it is lost, the data is lost. Instructions can be found in [[Encryption]].
</div>
It is important to understand that ~TiddlyWiki's built in encryption is our best endeavour to offer privacy and usability. However, the encryption feature has not been subject to the kind of rigorous third party testing that characterises secure services like Signal or Syncthing.
<div>
So, cautious users may wish to use ~TiddlyWiki's built in encryption as an extra layer of security, but should take care not to rely on it as one would rely on industry standard encryption solutions that have been rigorously tested in a variety of situations.
{{TiddlyWiki Node.js Privacy and Security}}
! Node.js Configuration
</div>
Using ~TiddlyWiki in the Node.js configuration requires more technical knowledge than the single file edition. There are several important areas with respect to security and privacy.
</div>
Firstly, and most obviously, there is the matter of how user data is stored on disc as individual `.tid` files. Just as with the single file configuration, these are just ordinary files, and so can be used with third party tools that provide encryption.
!! Verifiable Trust
Secondly, consideration must be given to how data is transmitted across the network. By default, the Node.js configuration does not use SSL and so traffic can be observed by others (the impact is mitigated by the fact that by default only users on the same machine can connect to the server). While ~TiddlyWiki itself does offer the option of setting up an SSL connection it is generally advised to use an external proxy server to provide SSL services. nginx is popular for this purpose.
An important aspect of ~TiddlyWiki's security and privacy claims is that they can be readily confirmed by anyone with basic technical skills. For example, the network monitoring tools built into most browsers allow you to verify that ~TiddlyWiki doesn't send any data to other servers. Similarly, you can open a ~TiddlyWiki HTML file in an editor and verify that your data is readily accessible.
! Community Tools
!! Community Tools
There are also third party tools from the community that extend ~TiddlyWiki's built in encryption:
* [["Encrypt single tiddler plugin" by Danielo Rodriguez]] allows individual tiddlers to be encrypted
* [[TW5-CSEncryption|https://wiki.fspark.me/TW5-CSEncryption/]] offers client-side encryption for ~TiddlyWiki on Node.js
! Further Information
!! Further Information
If security and privacy are important to you then you need to take the best available advice, and the best place for that is specialist organisations that focus on this area. The Electronic Frontier Foundation in the US is well respected, and their advice would be a good place to start. It emphasises basics such as dealing with passwords and two factor authentication, but also explains more advanced topics such as making a security plan, and how to set up a device securely.
If security and privacy are important to you then you need to take the best available advice, and the best place for that is specialist organisations that focus on this area.
https://ssd.eff.org/module-categories/basics
The [[Electronic Frontier Foundation (EFF)|https://eff.org]] in the US is well respected, and their advice would be a good place to start. It emphasises basics such as dealing with passwords and two factor authentication, but also explains more advanced topics such as making a security plan, and how to set up a device securely.
* https://ssd.eff.org/module-categories/basics
* //Please suggest other useful privacy and security resources//

View File

@ -0,0 +1,10 @@
title: TiddlyWiki Single File Privacy and Security
tags: [[TiddlyWiki Privacy and Security]]
!!! Single File Configuration
As a practical matter, using ~TiddlyWiki in the single file configuration depends upon keeping that file secure and private. You can employ the same tools that you use to keep your other documents and images secure. In most cases, the simplest solution will be to use an existing file storage service such as [[Google Drive|https://drive.google.com]], [[Apple's iCloud|https://www.icloud.com]], or [[Dropbox|https://www.dropbox.com]]. Many people already rely on the privacy and security of these services. There are also open source alternatives such as [[Syncthing|https://syncthing.net/]] that can allow you to synchronise files between your devices without using a third party service.
You may also wish to use additional layers of security. ~TiddlyWiki in the single file configuration offers built-in encryption using an industry standard encryption library to offer AES 128-bit encryption in CCM mode. All the data within the file is encrypted and cannot be accessed without entering the correct password. Your password is never stored in the file: if it is lost or forgotten, your data cannot be decrypted. Instructions can be found in [[Encryption]].
It is important to understand that ~TiddlyWiki's built in encryption is our best endeavour to offer privacy and usability. However, the encryption feature has not been subject to the kind of rigorous third party testing that characterises secure services like Signal or Syncthing. Cautious users may wish to use ~TiddlyWiki's built in encryption as an extra layer of security, but should take care not to rely on it as one would rely on industry standard encryption solutions that have been rigorously tested in a variety of situations.

View File

@ -133,6 +133,7 @@ Excise/Caption/Replace/Transclusion: Transklusion
Excise/Caption/Tag: Tagge den neuen Tiddler mit dem Titel des aktuellen Tiddlers
Excise/Caption/TiddlerExists: Warnung: Tiddler existiert bereits!
Excise/Hint: Verschiebe den ausgewählten Text in einen neuen Tiddler
Excise/DefaultTitle: Neuen "Text Verschieben"
Heading1/Caption: Überschrift 1
Heading1/Hint: Überschrift 1 auf die Zeilen anwenden, die eine Auswahl enthalten
Heading2/Caption: Überschrift 2

View File

@ -98,6 +98,10 @@ Plugins/Plugins/Hint: Erweiterungen
Plugins/Reinstall/Caption: erneut installieren
Plugins/Themes/Caption: Themes
Plugins/Themes/Hint: Theme Erweiterungen
Plugins/Stability/Deprecated: ABGEKÜNDIGT
Plugins/Stability/Experimental: EXPERIMENTELL
Plugins/Stability/Legacy: VERALTET
Plugins/Stability/Stable: STABIL
Plugins/Update/Caption: aktualisieren
Plugins/Updates/Caption: Aktualisieren
Plugins/Updates/Hint: Verfügbare Erweiterungen zu bereits installierten "Plugins"
@ -171,6 +175,8 @@ Settings/NavigationPermalinkviewMode/UpdateAddressBar/Description: Adressleiste
Settings/PerformanceInstrumentation/Caption: Performance Messung
Settings/PerformanceInstrumentation/Hint: Anzeige der Performance Statistik in der Browser Entwickler Konsole. ''Wichtig:'' Seite neu laden um die Einstellung zu aktivieren!
Settings/PerformanceInstrumentation/Description: Aktiviere Performance Messung
Settings/RecentLimit/Caption: Zuletzt Limit
Settings/RecentLimit/Hint: Maximale Anzahl von angezeigten "Tiddlern" im "Zuletzt" Reiter
Settings/ToolbarButtonStyle/Caption: Toolbar Button Stil
Settings/ToolbarButtonStyle/Hint: Wählen Sie einen Stil:
Settings/ToolbarButtonStyle/Styles/Borderless: Ohne Rand
@ -198,6 +204,12 @@ Settings/TitleLinks/Yes/Description: Tiddler Titel als Link anzeigen.
Settings/MissingLinks/Caption: Wiki-Links
Settings/MissingLinks/Hint: Aktiviere Links zu fehlenden Tiddlern. zB: FehlenderTiddler [[Einführung]]
Settings/MissingLinks/Description: Aktiviere Links zu fehlenden Tiddlern.
SocialCard/Caption: Social Media Karte
SocialCard/Domain/Prompt: Domain Name für Link Anzeige. Zb: ''tiddlywiki.com''
SocialCard/Hint: Diese Information wird verwendet, wenn eine "Voransicht" eines Links angezeigt werden soll
SocialCard/PreviewUrl/Prompt: Vollständige URL für die Media-Vorschau für dieses ~TiddlyWiki
SocialCard/PreviewUrl/Preview: Vorschau Bild:
SocialCard/Url/Prompt: Vollständige URL für dieses ~TiddlyWiki
StoryTiddler/Caption: Story Tiddler
StoryTiddler/Hint: Diese Filter-Kaskade wird verwendet, um die Vorlage für den Tiddler im "Story River" auszuwählen.
StoryView/Caption: Anzeige

View File

@ -26,6 +26,8 @@ Tags/ClearInput/Caption: lösche Eingabefeld
Tags/ClearInput/Hint: Lösche Tag Eingabefeld
Tags/Dropdown/Caption: Tag Liste
Tags/Dropdown/Hint: Tag Liste anzeigen
Tags/EmptyMessage: Kein Tag gefunden
Tags/EmptyMessage/System: Kein System Tag gefunden
Title/BadCharacterWarning: Warnung: Folgende Zeichen im Titel können zu Problemen führen: <<bad-chars>>
Title/Exists/Prompt: Tiddler Name existiert bereits
Title/Relink/Prompt: Ändere ''<$text text=<<fromTitle>>/>'' -> ''<$text text=<<toTitle>>/>'' in //tags// und //list// Feld aller anderen Tiddler

View File

@ -6,6 +6,8 @@ Filter/Hint: Suche mit [["filter expression"|https://tiddlywiki.com/static/Filte
Filter/Matches: //<small><<resultCount>> Treffer</small>//
Matches: //<small><<resultCount>> Treffer</small>//
Matches/All: Alle Treffer:
Matches/NoMatch: //Kein Treffer//
Matches/NoResult: //Kein Suchergebnis//
Matches/Title: Titel Treffer:
Search: Suchen
Search/TooShort: Suchtext ist zu kurz
@ -14,7 +16,7 @@ Shadows/Hint: Suche in Schatten-Tiddlern.
Shadows/Matches: //<small><<resultCount>> Treffer</small>//
Standard/Caption: Standard
Standard/Hint: Suche in Standard-Tiddlern.
Standard/Matches: //<small><<resultCount>> matches</small>//
Standard/Matches: //<small><<resultCount>> Treffer</small>//
System/Caption: System
System/Hint: Suche in System-Tiddlern.
System/Matches: //<small><<resultCount>> Treffer</small>//