1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-25 01:20:30 +00:00
Commit Graph

2830 Commits

Author SHA1 Message Date
Jermolene
e631e59f00 Missing links in 5.1.14 release note 2017-04-26 18:24:32 +01:00
Jermolene
17110169a9 Update prerelease 2017-04-26 18:24:02 +01:00
Jermolene
39e8a83c4c Prepare for release of 5.1.14 2017-04-26 17:02:06 +01:00
Jermolene
7890440569 Improve organization for the 5.1.14 release notes 2017-04-26 16:26:33 +01:00
Jermolene
48fe208f0c Update release note 2017-04-26 14:35:16 +01:00
Jermolene
a613ffb6a3 Update contributor list in 5.1.14 release note 2017-04-26 14:35:03 +01:00
Jermolene
e18b6bf5c4 Docs typo 2017-04-24 16:27:10 +01:00
Jermolene
31523a1e7b Add empty link to prerelease tiddler
Thanks @twMat
2017-04-24 16:26:56 +01:00
twMat
d99e0c9f97 Edit getindex Operator.tid op-purpose (#2837)
Other `op-` fields should probably also be added.
2017-04-20 16:20:40 +01:00
Jermolene
2a1fb964d5 Reformatting "wikilabs" resource link title 2017-04-19 15:56:41 +01:00
Mario Pietsch
5050829e63 add wikilabs resource link tiddler (#2834) 2017-04-19 15:54:37 +01:00
Jermolene
53181d2ab8 Missed parenthesis
Thanks @twMat
2017-04-19 13:25:31 +01:00
Jermolene
0aaebe9757 Revert #2814
As per the discussion on the ticket, we’ll revisit this after 5.1.14
2017-04-18 08:15:25 +01:00
Jermolene
379e780e80 Release note update 2017-04-17 18:46:02 +01:00
Jermolene
0a2c3d0c3c Add quote to HelloThere 2017-04-17 17:54:17 +01:00
Jermolene
202ffd9c51 Add big block quote style 2017-04-17 17:53:19 +01:00
Jermolene
40a61ff2e7 The last batch of drag and drop docs 2017-04-06 10:15:22 +01:00
Jermolene
773ef6adfb Docs update 2017-04-02 17:51:45 +01:00
Jermolene
b1e0fa4a34 More drag and drop docs 2017-04-02 17:51:24 +01:00
Jermolene
8802015f1a Docs updates
Starting to document the new drag and drop stuff
2017-03-29 10:19:42 +01:00
Jermolene
f3cab3753e Don't set draggable property for links 2017-03-28 13:05:00 +01:00
Jermolene
1f860bd04e Fix problem with dragging links 2017-03-23 17:52:15 +00:00
Jermolene
8744d77f88 Add mobiledragdrop shim plugin
This seems to work quite well for me - cc @xcazin
2017-03-23 17:03:35 +00:00
Jermolene
5b3bb1974c Move coding docs to the /dev wiki 2017-03-19 13:53:21 +00:00
Jermolene
d778bc9a21 Add link to Tinka 2017-03-17 14:20:44 +00:00
Jermolene
fe5670663d Add plugins to TOC 2017-03-17 14:20:36 +00:00
Jermolene
779e62a30f Add support for JSON files containing a single tiddler
At the moment, we support JSON files containing an array of tiddlers.
With this change the core will import files containing a single
tiddler. Also adding templates for saving individual tiddlers in JSON
format
2017-03-17 14:19:43 +00:00
gernert
d65fd771e7 Update ColourPalettes.tid (#2806) 2017-03-17 13:54:32 +00:00
Jermolene
595072b2bc Update browser support for importing via paste 2017-03-17 13:36:28 +00:00
twMat
5dbc1b7163 Doc typo correction (#2791) 2017-03-05 20:25:24 +00:00
Jermolene
e30330d4be Introduce Twitter plugin for embedding tweets etc. 2017-02-28 10:23:02 +00:00
Tobias Beer
6343c39bd6 Docs: improve description of remove operator (#2735)
see https://github.com/Jermolene/TiddlyWiki5/issues/2731#issuecomment-275200159
2017-02-27 16:40:48 +00:00
jrgetsin
63b3d88604 Typo: Update TiddlyWiki.tid (#2566)
for "bought" put "brought"
looked like a typo to me
2017-02-27 16:38:57 +00:00
gernert
a71e27386f Update SystemTags.tid (#2508)
* Update SystemTags.tid

* Update SystemTags.tid

@Jermolene
Hope I did it correct now ;-)
2017-02-27 16:38:13 +00:00
gernert
9a67a90a30 Update Using Stylesheets.tid (#2786) 2017-02-27 15:54:15 +00:00
Roma
d53d6e7921 Added community tiddler for ViM syntax file. (#2544) 2017-02-26 16:48:07 +00:00
twMat
b5360db375 Clarified intro statment for TiddlerWidget (#2770)
Ref [discussion](https://groups.google.com/d/msg/tiddlywiki/S-DliskYksE/55c6_CssCgAJ).
2017-02-23 17:02:49 +00:00
Sylvain Comte
da0c244a51 created a "resource" card for leaflet maps plugin (#2734) 2017-02-23 17:01:41 +00:00
Marxsal
617ec82a22 Update documentation to reflect actual way timeline macro currently works. (#2781) 2017-02-23 10:59:40 +00:00
Jermolene
7c2d519d4f Update release note 2017-02-23 08:20:43 +00:00
Jermolene
31a803626f Add GettingStarted "online" tab
Fixes #2780
2017-02-22 15:34:50 +00:00
Tobias Beer
6085936475 Introduce "field" suffix for "has" filter operator (#2066)
* has:field — tested & documented

allows to test whether a field exists

* fixed inverted condition

* added from version to docs
2017-02-22 12:13:59 +00:00
Jermolene
cd2bc88658 Add "enlist" operator
Fixes #2767
2017-02-21 15:17:47 +00:00
Jermolene
eee18aab40 Docs: Fix typo 2017-02-21 08:47:00 +00:00
Thomas Elmiger
8307f7c3ca Tiny optimisation for Naming of System Tiddlers.tid (#2773)
* Replacement icon stopwatch on

As discussed in issue #2690

* Replacement icon stopwatch off

As discussed in issue #2690

* Added missing tag "Resources" (Community Resource)

* Tried to make a sentence clearer

CamelCase words are NOT joined with hyphens (copy-paste error?). 
Copied "directly" from the line below to make the meaning even clearer.
2017-02-21 08:28:53 +00:00
Jermolene
b26e138503 Tweaks for #2774 2017-02-19 20:50:52 +00:00
twMat
16da00fe3e Clarify EditTextWidget behaviour and tag attribute (#2774) 2017-02-19 20:48:32 +00:00
Jermolene
daf703b67f Add support for th-navigating event 2017-02-19 15:47:37 +00:00
Jermolene
0d0ece6377 Add new "fetch" command
Like the load command except retrieves the file over HTTP/HTTPS.

Allows experimentation with server-side twederation

This is a cleaned up version of code that I wrote last year at TWEUM
2016 @inmysocks @pmario @twMat @xcazin
2017-02-18 13:33:41 +00:00
twMat
a6b538b308 Clarify use of RawMarkup tag (#2768)
Anyone attempting to use this tag will need information about required reload of TW for activation.
2017-02-15 08:56:49 +00:00
Jermolene
a51f62bc40 Docs: Move beaker browser file 2017-02-12 11:14:21 +00:00
Jermolene
6397ce8997 Docs: move a couple of files to the correct dir 2017-02-12 11:14:05 +00:00
Jermolene
de9bb2fa40 Feature TiddlyMap in the HelloThere thumbnails 2017-02-12 11:13:43 +00:00
Jermolene
3708f6c8e4 Major refactoring of filesystemadaptor
The code here had got a bit broken by some PRs that I should have
checked more carefully. I’ve done a major refactoring which will
hopefully make it easier to understand, and fixes a number of problems:

* Problem with eg .md tiddlers not being deleted correctly
* Problem with Windows path separators not being usable within
$:/config/FileSystemPaths on Windows
* Problem with filename clashes not being detected correctly when
saving to a different directory via $:/config/FileSystemPaths
* Enables slashes within tiddler titles to be mapped into folders
* Enables plain text files like .md and .css to be saved with .meta
files instead of as .tid files (see #2558)
* No longer replaces spaces with underscores

As this is such a major update, I’d be grateful if Node.js users could
give it a careful run through — in particular, you’ll need to try
creating new tiddlers of various types and ensure that the expected
files are created.
2017-02-11 12:56:42 +00:00
Jermolene
36c0af0fd4 Docs: Fix typo in example filter 2017-02-11 12:47:56 +00:00
Jermolene
9e08aed8ad Update release note 2017-02-10 12:45:26 +00:00
Jermolene
2397f0aa6f Add several new hooks for UI actions 2017-02-09 15:42:55 +00:00
Jermolene
73ded6a82a Add new "count" filter operator
See discussion here:
https://groups.google.com/d/msgid/tiddlywiki/fe51b7f5-5369-493b-82e5-94c
18e863fe0%40googlegroups.com?utm_medium=email&utm_source=footer
2017-02-08 20:11:44 +00:00
Jermolene
112a8d95c5 Docs: Switch "Mailing List" to "Forum"
Fixes #2761
2017-02-07 11:03:39 +00:00
Jermolene
6282fe43af Docs capitalisation consistency
Thanks @twMat
2017-02-05 13:34:37 +00:00
twMat
e20682dcfd Update title to "How to Add a New Tab to the Sidebar" (#2754)
Only title modified, from lowercase to uppercase letters.
2017-02-04 18:06:17 +00:00
Jermolene
bc61f7eebf Introduce savetrail plugin
See the readme:

“This plugin causes TiddlyWiki to continuously save the contents of
each tiddler that is changed as a JSON file. Configured correctly, the
browser will download the files silently in the background, and they
can be used as a backup in case of accidental data loss.”

Inspired by @telmiger’s comment (3) here:
https://github.com/Jermolene/TiddlyWiki5/issues/2741#issuecomment-276128
871
2017-02-04 17:37:31 +00:00
Jermolene
1563f207b3 Tweaks to #2753
@twMat I felt that the “see below” part was a bit clumsy, as it jumps
quite a long way down, past three embedded videos.
2017-02-04 16:22:25 +00:00
twMat
9a01e9ab71 Update doc on how to submit PR's. (#2753)
Added note to clarify difference between submitting doc improvements and code improvements.
2017-02-04 16:18:48 +00:00
Jermolene
56b6781715 Fixes to license visibility
Credits to @cdent - is 2012 right, or did your work there carry on into
2013?

Addresses part of #2378
2017-01-29 21:11:30 +00:00
Jermolene
4bf626d741 As noted by @twMat over on the [mailing
list](https://groups.google.com/d/msgid/tiddlywikidev/8571ba0d-da8e-449a
-bad2-a21e3f2587aa%40googlegroups.com), GitHub has stopped recognising
TiddlyWiki’s license file — see
https://help.github.com/articles/adding-a-license-to-a-repository/.
This commit is intended to fix that
2017-01-27 22:10:18 +00:00
twMat
3e40403d11 VarsWidget doc - erroneous example (#2714) 2017-01-17 08:20:06 -07:00
Tobias Beer
1b339e17bc Add "tag" attribute to keyboard widget (#2593)
* allows to define the tag for keyboard widget

* added from 5.1.14 to docs
2017-01-13 11:17:19 -07:00
Marxsal
2b90d0ab96 Doc: Community Resources: TiddlyServer (#2708) 2017-01-13 11:00:06 -07:00
Thomas Elmiger
d632e47ffe Added missing tag "Resources" (Community Resource) (#2707)
* Replacement icon stopwatch on

As discussed in issue #2690

* Replacement icon stopwatch off

As discussed in issue #2690

* Added missing tag "Resources" (Community Resource)
2017-01-13 10:59:38 -07:00
Jermolene
0e37e0cd78 Fix typo 2017-01-13 08:17:31 -07:00
Jeremy Ruston
190d4881bf Remove accented character from filename
@Marxsal just a fyi there are a lot of problems on some platform combinations with accented characters in filenames.
2017-01-13 08:17:03 -07:00
Jermolene
dbcda815fa Add tight-heavier theme that combines "tight" and "heavier" 2017-01-09 12:46:20 +00:00
Jermolene
74bdbb9be8 Readme updates 2017-01-09 12:46:20 +00:00
Marxsal
b152d0a727 Doc: How to concatenate text and variables (#2676)
* How to concatenate text and variables

* Adding warnings around anti-example code
2017-01-09 12:39:50 +00:00
Marxsal
00669e87da Docs: Community Resources: Noteself,Slides and Stories, TKN (#2685)
* Docs: Community Resources: Noteself,Slides and Stories, TKN

* Doc: Community Resource: Cardo

* Tweaks to community resources

* removing unnecessary new lines

* Removed spacing around question marks.

* Noteself. Removing one more space. Picked a bad day not to wear glasses.
2017-01-09 12:32:56 +00:00
Daniel Rodríguez Rivero
2f21cbc971 Updated tabs macro documentation (#2697)
Adding how to deal with transclusions inside the tabs itself. It is not weird that you want use tabs on a set of tiddlers that transclude other tiddlers using their own title. If you don't understand well the consequences of of what the sentence `currentTiddler variable is not affected...` this can be quite frustrating.
2017-01-04 21:40:11 +00:00
Marxsal
18280249f4 Doc: How to turn off camel case (#2687)
* Doc: How to turn off camel case

* Changed title. Added tag.
2017-01-03 18:07:48 +00:00
Jermolene
da6149cdde Include word "unique" in description of "each Operator"
Fixes #2689
2017-01-03 18:01:56 +00:00
Marxsal
a37137d426 DOC: How to embed PDFs and other documents (#2678)
* How to embed PDFs and other documents

* Adding notes about external linking and other details
2016-12-31 13:21:32 +00:00
Jermolene
a2b465ee75 Docs: Tweaks for title conventions for resources 2016-12-31 13:20:54 +00:00
Marxsal
241f901d85 New references for Community resources. (#2677)
* New references for Community resources.

This batch includes Filter Examples by Tobias Beerand and
Gospel Bubbles by David Gifford

* Four more community resources added --
How Does Twederation Work
Ghostwriter Theme
Moments Theme
Lucky Sushi Online SHop

* Two more: Hacks by Thomas Elmiger. Forum on Reddit by Riz
2016-12-31 13:18:48 +00:00
Jermolene
7a6cbb1629 Tweaks to checkbox widget docs 2016-12-30 17:49:35 +00:00
Marxsal
94d460ef20 CheckboxWidget actions documentation (#2673)
* Add example of how to use action parameter in Checkbox Widget

* Doc: CheckboxWidget actions
2016-12-30 17:46:48 +00:00
Marxsal
5b5b25dd16 Docs: Add how-tos on putting list into table format (#2672)
* Document method(s) to format the output of a list in tabular format.

* Added  2nd CSS method for formatting as Table

* Three methods of putting lists into table form.

* Removed "probably" comment
2016-12-30 17:45:44 +00:00
Jermolene
60c6f039e4 Update link to tobibeer's tips 2016-12-30 17:42:34 +00:00
Jermolene
0e83fad837 Remove link to TW5Mall
The site has been retired by the author.
2016-12-30 17:42:34 +00:00
Jermolene
eac449e8ff Release note updates 2016-12-29 12:44:42 +00:00
Jermolene
f495df6386 Tone down the colours of the "from-version" macro 2016-12-29 12:44:36 +00:00
Jermolene
2945c9abc1 Add information about Beaker Browser support 2016-12-29 12:44:12 +00:00
Jermolene
bbcc367e5a Add link to google groups search at mail-archive.com 2016-12-29 09:13:28 +00:00
Jermolene
cec5522b72 Fix up the version number of the plugin library 2016-12-21 15:07:48 +00:00
Marxsal
ed1a7e73cd Update instructions on using a PHP server, directing to a live website. (#2669)
Adding note about increasing maximum upload size.
2016-12-19 22:54:24 +00:00
Bram Chen
352d7d664c Chinese translation updates (#2666)
Typo
2016-12-19 12:22:39 +00:00
Jermolene
74107b9b8a New thumbnail for 5.1.14 2016-12-19 12:21:47 +00:00
Marxsal
7d1e3f4c35 Add docs for making a custom New Journal button (#2664)
Includes change to 'Creating journal tiddlers' to link up to new Instructional tiddler.
2016-12-19 11:27:50 +00:00
Tobias Beer
15c7d24eaa Allows adding a new tag name by typing enter (#2592)
* allows to add a new tagname hitting enter

see: https://groups.google.com/forum/#!topic/tiddlywiki/wqQ8jPYG-X4

* revert changes to vanilla/base

* added "Special Keys" to KeyboardShortcuts

* added info to Creating and editing tiddlers

did not add current version of <<.from-version "5.1.14">>  because it
would interrupt the flow. When changed from a noisy "New in 5.1.14" to
"(new in 5.1.14)" we might add the version info here

* revert setText & added inline styles to vanilla base

* remove fieldmangler

* commit initial edittemplate tags to merge master

* ok, now really revert to initial edittemplate tags

* move add tag via enter into tag-picker macro(s)
2016-12-18 20:43:26 +00:00
Jermolene
a2fe101848 Updated text reference docs 2016-12-17 12:25:43 +00:00
Tobias Beer
e5b432a86b Allows checkbox widget to worth with indexes within data tiddlers (#2103) 2016-12-17 11:59:59 +00:00
Tobias Beer
d6d3aab36a Allow radio widget to work with indexes in a data tiddler (#2104)
* allow radio widget to set an index in a data tiddler

* updated RadioWidget docs, with same demo macro as for CheckboxWidget
in #2103
* removed docs in widget code (seems the wrong place)

* added from version to docs

* revert doc maros to master

* using wikitext-example-without-html and .tip macro now

* fix quotes
2016-12-17 11:51:24 +00:00
Marxsal
52d32fe3fd Howto1 (#2659)
* Create One weird trick to change the sort order of sub-branches in a TOC macro

* Update and rename One weird trick to change the sort order of sub-branches in a TOC macro to How to change the sort order of sub-branches in a TOC macro

* Added .tid to file name

* Delete How to change the sort order of ...

The correct version is the one with the .tid file extension
2016-12-16 17:47:08 +00:00
Marxsal
2319c9269e Create How to widen tiddlers (aka story river) (#2651) 2016-12-16 17:40:05 +00:00
Marxsal
a393705cef Clarifying Tiddlywiki node.js launch instructions. (#2662) 2016-12-16 17:39:20 +00:00
Marxsal
4d3d7de3b5 Add example of using a text reference with a field in RevealWidget (#2660)
* Adding example of how to use a field's text references to control the RevealWidget.

* Attempting to add field "jeremy".
2016-12-16 17:38:29 +00:00
Jermolene
4a45e9d2dc Improve text reference documentation 2016-12-16 17:36:11 +00:00
Jermolene
ad9769451d Add filename-uri-decoded support for tiddlywiki.files 2016-12-15 17:13:32 +00:00
Jeremy Ruston
fbd689368e Merge pull request #2643 from pmario/de-DE
add new tag manager texts
2016-12-01 10:51:19 +00:00
Mario Pietsch
db00c699f4 fix some typos, pointed out by Helmut. thx 2016-12-01 11:35:54 +01:00
Jeremy Ruston
487dab57e6 Merge pull request #2201 from tobibeer/filter-operators-overview
updates to overall operators docs
2016-11-29 17:24:23 +00:00
Mario Pietsch
b43b89f44a fix for 2634 problems with week calculation 2016-11-29 17:31:54 +01:00
Jermolene
0c6b2311ae Update release note 2016-11-29 10:29:39 +00:00
Jermolene
2f2ddf6c0e Update docs for tag macros 2016-11-28 21:31:09 +00:00
Jermolene
f07e0f981a Refactor tag template into an underlying macro
By refactoring the innards of the tag template into global macros, we
make it easier to re-use elements of the tag template
2016-11-28 19:17:25 +00:00
Jermolene
9a38642141 Add new "order" filter operator 2016-11-28 19:16:08 +00:00
Jermolene
a3dc3b4b98 Add new [all[tags]] filter operator 2016-11-28 19:04:04 +00:00
Jermolene
b759d82f4c @pmario's fix for #2635
This got reverted due to my git inabilities
2016-11-28 13:43:43 +00:00
Jermolene
c65d08240b Add strict mode to tag operator 2016-11-28 13:42:30 +00:00
Jermolene
c460cc03a4 Change "is" filter with blank operand to pass through arguments 2016-11-28 13:42:06 +00:00
Jeremy Ruston
a9b54d6fce Revert "Add provisional version of new tagger manager" 2016-11-28 10:40:55 +00:00
Jeremy Ruston
a85d034015 Merge pull request #2637: Introduce tiddler manager
Introduce tiddler manager
2016-11-28 10:28:12 +00:00
Mario Pietsch
766bc7acee Fix for #2634 problem with week calculations (#2635) 2016-11-27 17:33:19 +00:00
Jermolene
0b4669621a Return all tiddlers when "is" filter operand is missing 2016-11-27 14:51:51 +00:00
Jermolene
e98d324e66 Add provisional version of new tagger manager
For discussion
2016-11-26 12:48:47 +00:00
Jermolene
3bceb98119 Add support for actions attribute to CheckboxWidget 2016-11-26 08:21:58 +00:00
Jermolene
b86d142408 Revert accidental default to the "Heavier" theme 2016-11-23 18:15:17 +00:00
Jermolene
0f85ca3478 Add icon to "New in version" docs macro 2016-11-21 12:50:16 +00:00
Jermolene
b8cbc07c54 Add support for uri decoded components in tiddlywiki.files files 2016-11-14 15:14:25 +00:00
Jermolene
0d0764b6ce Tweaks to "Heavier" theme 2016-11-03 22:27:14 +00:00
Jermolene
975d5346fb Introduce "Heavier" theme, with thicker fonts
Partly prompted by this piece:

https://backchannel.com/how-the-web-became-unreadable-a781ddc711b6
2016-11-03 19:11:24 +00:00
Jermolene
8de4583d6c Add first pass at XLSX Utilities plugin
Thanks to @stevesunypoly for help with preparing the demo spreadsheet
2016-10-23 22:49:59 +01:00
Jermolene
e9470169d8 Update full edition with recent plugins 2016-10-23 21:22:16 +01:00
Tobias Beer
9c50a223b8 Merge remote-tracking branch 'Jermolene/master' into filter-operators-overview 2016-10-22 10:17:44 +02:00
Jermolene
7108e0d861 Add support for filtered attributes to HTML elements and widgets
Fixes #2624
2016-10-21 11:27:07 +01:00
Jermolene
c72a0b7a67 Add action-createtiddler widget
Basically the same as sending a tm-new-tiddler message except that the
newly created tiddler is not added to the story.
2016-10-21 11:26:26 +01:00
Jermolene
6dc90718f0 Update tw5.com Tiddler Info/Sources to use links
Prompted by @sukima
2016-10-19 22:06:15 +01:00
Jermolene
c415af13f1 bibtex plugin updates 2016-10-19 10:21:50 +01:00
Jermolene
7f11c151f0 First pass at bibtex importer 2016-10-18 18:00:01 +01:00
Jermolene
5aba7292e7 Fix typo 2016-10-18 16:02:17 +01:00
Jermolene
7b535b8f31 Release note update for 5.1.14 2016-10-18 13:26:24 +01:00
Jermolene
22c1b04ee7 Added first version of QR code generator plugin 2016-10-18 09:23:47 +01:00
Jermolene
b4b77d1681 Add new filter operators for various string encoding/decodings 2016-10-18 09:18:32 +01:00
Jermolene
b35544bf49 Extend set widget to support returning a single result from a filter
This solves the problem with extraneous double square brackets when
using the filtered set widget.
2016-10-18 09:16:47 +01:00
Jermolene
d9f301f755 Add 'formattedtext' output type to Wikify widget 2016-10-18 09:13:52 +01:00
Jermolene
2f590a365e Expose document location via $:/info/url/* info tiddlers 2016-10-18 09:12:55 +01:00
Jermolene
537cfcbf79 Addendum to #2610
* Ensure we don’t try to read tiddlers from `.meta` files
* Improve docs
2016-10-15 18:06:17 +01:00
Jermolene
1b41b44684 Improve support for bulk loading tiddlers under Node.js
Fixes #2610
2016-10-15 16:23:17 +01:00
FND
d7b6917638 Clarify WebDAV documentation (#2613) 2016-10-15 14:19:19 +01:00
Jermolene
989cee5059 Suppress search results if search string is too short
Fixes #2603
2016-10-11 09:27:26 +01:00
Jermolene
e724bc6120 Extend docs template for operators to allow for "from-version" field 2016-10-11 09:26:50 +01:00
Jermolene
ffcbcbfa82 Add new 'minlength' operator
Fixes #1493
2016-10-11 09:26:20 +01:00