mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-24 02:27:19 +00:00
Code Issues Releases Wiki Activity
11,490 Commits 101 Branches 68 Tags 90 MiB
b61c01d8b0
Commit Graph

856 Commits

Author SHA1 Message Date
Jermolene
8488a13761 Introduce text-slicer plugin and edition 
A first pass at a plugin that splits formatted text into individual
tiddlers according to lists and headings.
 2015-08-01 13:15:24 +01:00
Jermolene
72cf85f0d4 Restore error trapping for KaTeX rendering 2015-07-17 08:58:58 +01:00
Jermolene
f8027a3708 Fixed problem with static generation of KaTeX in the browser 2015-07-14 08:45:14 +01:00
Jeremy Ruston
c2ca1d3ed4 Merge pull request #1850 from nameanyone/master 
Add publishFilter to tiddlyweb save-offline
 2015-06-30 17:53:34 +01:00
nameanyone
8ce3f9983f Update save-offline.tid 2015-06-29 14:31:33 -07:00
Jermolene
5f3587c38c Update to KaTeX 0.4.3 2015-06-29 21:07:26 +01:00
Jermolene
2d7a05de98 Coding style tweaks 2015-06-13 18:06:34 +01:00
Andreas Hahn
d8366cc45f CodeMirror plugin now refreshes the tiddler type 2015-05-28 14:24:04 +02:00
Jermolene
c11e1bb929 Add simple "powered by TiddlyWiki" plugin 2015-05-14 17:04:20 +01:00
Jermolene
dc980a19c8 Make the stacked view play well with the new fluid-fixed mode 2015-05-05 07:24:14 +01:00
Jermolene
b08a2080ee Revert to a pale default theme for highlight plugin 
Fixes #1656
 2015-04-17 16:05:54 +01:00
Jermolene
b34530e86a Make upgrade wizard download link be relative 
Ensures that the prerelease upgrade wizard download link doesn’t point
to the non-prerelease version
 2015-03-31 19:14:49 +01:00
Jermolene
ef729487c3 Tweak size of help panel 
Now that we don’t have the cheatsheet, reducing the height makes the
panel more useful for watching tutorial videos.
 2015-03-22 15:52:17 +00:00
Jermolene
a60ea1d89b Remove cheatsheet from help panel 
We’d rather present this information as a panel within the tiddler
editor so that we can (for example), allow clicks on a snippet to
insert it automatically into the editor at the current cursor position.

For the moment, we’ll just remove the cheatsheet. Post-5.1.8 we’ll add
it back to the editor
 2015-03-21 15:52:28 +00:00
Jermolene
743c325b0d Fix problem with tiddler titles overlaying help panel 2015-03-20 16:18:24 +00:00
Jermolene
17c1213635 Expand help panel label to "Help Panel" 2015-03-20 15:16:40 +00:00
Jermolene
b46ce419a7 Left off last commit 2015-03-19 10:53:51 +00:00
Jermolene
f2a7f00870 Improve plugin readmes 
Now every plugin has a short, introductory readme tiddler that is shown
in the online plugin library.
 2015-03-19 10:53:45 +00:00
Jermolene
24435a46be Lots of improvements to the plugin library 
* Moved “add new plugin” into a modal wizard
* Adopt big friendly buttons
* Add plugin icons and readmes to “add new plugin” modal
* Use tabs for splitting plugins/themes/languages
* Consistent styling between the “add new plugin” modal and the
“installed plugins” control panel tab
* Behind the scenes, moved from addressing the library as
`recipes/defaults/tiddlers/<etc>` to `recipes/library/tiddlers<etc>`
 2015-03-18 11:46:28 +00:00
Jermolene
ae001a19e5 Upgrade to KaTeX v0.2.0 2015-03-14 08:34:16 +00:00
Jeremy Ruston
d1a4855bfc Merge pull request #1546 from aelocson/upgrade-typo 
Correct WikiText in the upgrade wizard
 2015-03-11 21:45:13 +00:00
Jeremy Ruston
0f5cebc6b0 Merge pull request #1567 from sukima/fix-codemirror-readme 
Fix CodeMirror README formatting
 2015-03-10 20:24:07 +00:00
Jermolene
e46d3d74be Rename node-webkit to NW.js 2015-03-10 16:54:53 +00:00
Devin Weaver
dcb9e161de Fix CodeMirror README formatting 
There was a rendering mess in the CodeMirror readme file. This was cause
by attempting to bold the `$:/tags/Stylesheet` text. Also the context of
the sentence implies this should be backticked not bold (it refers to a
tag not a tiddler).
 2015-03-08 16:38:16 -04:00
Astrid Elocson
320664a0c7 Correct WikiText in the upgrade wizard 2015-02-28 15:43:48 +00:00
Jermolene
e884192baf Alternative fix for #1542 
As suggested by @aelocson, adjusting the viewport has less impact on
the icon size.
 2015-02-28 11:28:58 +00:00
Jermolene
6a497eff6c Add prototype stacked storyview 2015-02-23 11:28:50 +01:00
Jermolene
73a188d411 Improve description for help plugin 2015-02-21 08:53:04 +00:00
Jermolene
70e419824f Add first pass of help panel 
This is just an idea really.

The help plugin is only included in the tw5.com wiki; the idea is to
also include it in the empty.html wiki, either as a plugin or as part
of the core.

If it stays as a plugin, the idea would be to have different help
plugins for different languages.
 2015-02-20 22:44:55 +00:00
Astrid Elocson
28f78730ba Consistent plugin descriptions 2015-02-17 10:28:54 +00:00
Astrid Elocson
435267080f Improve description of railroad plugin 2015-02-12 09:35:57 +00:00
Jermolene
ddac13317e Disable plugin reload warnings in the upgrade edition 2015-02-11 13:01:43 +00:00
Jermolene
8643278a45 Add support for an integrated plugin library 
Fixes #1450

Provides support for an integrated plugin library that can be used to
install plugins from tiddlywiki.com directly to wikis hosted online or
offline. See the Plugins tab of Control Panel.

Todo:

* Error checking(eg libraryserver.js HTTP GET)
* Translatability
* Documentation
** $:/tags/ServerConnection
** savelibrarytiddlers command
 2015-02-09 19:04:11 +00:00
Jim Lehmer
8cd0c2afcd Make sure all "get" access to $tw.config.fileExtensionInfo goes through a $tw.utils.getFileExtensionInfo helper function that ensures the parameter is cast to lowercase. Fixes #1418. 2015-02-01 12:33:40 -06:00
Astrid Elocson
0d406966b3 Improve railroad example tiddler 2015-01-20 09:08:29 +00:00
Astrid Elocson
a848c105a8 Refresh railroad diagrams when config tiddler changes 2015-01-20 08:38:00 +00:00
Astrid Elocson
9e5eaed4a8 Support a global railroad config tiddler 2015-01-19 23:11:25 +00:00
Astrid Elocson
998361de59 Introduce text/vnd.tiddlywiki.railroad 2015-01-19 22:24:15 +00:00
Astrid Elocson
1591b43066 Introduce text/vnd.tiddlywiki.railroad 2015-01-19 22:21:22 +00:00
Astrid Elocson
e5676d058a Introduce text/vnd.tiddlywiki.railroad 2015-01-19 19:59:38 +00:00
Astrid Elocson
6842a354ea Improve appearance of railroad arrows 2015-01-18 18:50:51 +00:00
Astrid Elocson
af7bbc0d06 Improve CSS of railroad diagrams 2015-01-13 19:58:30 +00:00
Astrid Elocson
34983dd874 Reduce size of railroad arrows 2015-01-12 23:07:11 +00:00
Astrid Elocson
2d86d8e47d Introduce arrow option on railroad widget 2015-01-12 20:03:37 +00:00
Astrid Elocson
6a75c4623a Fix #1357: Railroad plugin under Node.js 2015-01-11 18:31:53 +00:00
Jeremy Ruston
9a89fd1753 Merge pull request #1347 from welford/hljsnodejs 
highlightjs in nodejs
 2015-01-10 13:46:11 +00:00
James Welford Anderson
f6c8a334e5 tabs/spaces fix 2015-01-10 08:07:32 +09:00
James Welford Anderson
903f7db0b2 update highlight plugin to latest ver. 
split the latter half of highlight.pack.js into a separate file which
registers all the languages and exports hljs. this is for nodejs
compatibility and mimics the way the highlightjs module works in nodejs.
 2015-01-10 08:02:54 +09:00
Astrid Elocson
2f42c9fb8d Links and transclusions in railroad diagrams 2015-01-06 01:39:24 +00:00
Jeremy Ruston
548c99a984 Merge pull request #1314 from aelocson/railroad 
Introduce railroad plugin
 2015-01-04 16:00:03 +00:00
Astrid Elocson
4f3cb8b9ae Introduce railroad plugin 2015-01-03 20:02:27 +00:00
Jim Lehmer
c296f14210 Handle case-insensitive file systems. 2015-01-03 09:33:22 -06:00
Jim Lehmer
809a59920a Fix bug where a .tid extension was being added twice if tiddler name longer than 200 characters. 2015-01-02 11:25:54 -06:00
James Welford Anderson
cc85368fd4 highlightjs in nodejs 2015-01-03 02:00:08 +09:00
Evgeniy Gryaznov
25bcc13fa8 Transliterating russian filenames 2014-12-23 11:48:43 +06:00
Jermolene
d2c4920ba4 Refine node vs. browser behaviour 
Now we’re using TiddlyWiki as the core of TiddlyDesktop we need more
granular control of the platform specific code.
 2014-12-18 19:52:15 +00:00
Jermolene
8765d4e31b Get rid of GettingStarted tabs in empty 
I feel that we should keep empty.html’s GettingStarted very simple, and
link to other places for tutorial material
 2014-12-12 10:18:49 +00:00
Jermolene
2698f08851 Tentative reworking of GettingStarted 
See this thread for background:
https://groups.google.com/d/topic/tiddlywiki/sDWP4NPe8XE/discussion

Translators: please don’t translate this material until it’s settled
down
 2014-12-10 21:46:29 +00:00
Jermolene
241e021654 House style tweaks for codemirror docs 2014-11-25 15:40:28 +00:00
Jermolene
dcac3b27b7 More icon tweaks 2014-11-13 21:39:38 +00:00
Jermolene
73491f14dd Update highlight plugin configuration to support tabs 
The technique we were using to configure the library was incorrect.
 2014-11-06 13:27:24 +00:00
Jermolene
7062bb9293 Fix links in readme for googleanalytics plugin 
Thanks @gernert
 2014-11-02 17:22:16 +00:00
Jermolene
9e85782407 Extend Cecily 
Two new features: you can set the tiddler width via an attribute on the
list widget, and specify a rotation factor in the map.
 2014-11-01 14:12:32 +00:00
Jermolene
2e5c01f630 Remove extraneous console.log 2014-10-31 11:33:24 +00:00
Jermolene
90096cbd36 Fix problem with codemirror editor and missing tiddlers 2014-10-30 12:28:26 +00:00
Jermolene
f0df09c027 Stop translated strings moving in the list 
Without sorting the list, we had ordinary tiddlers listed before shadow
tiddlers. That meant that as soon as you started to type in a shadow
tiddler it moved up in the list.
 2014-10-29 11:04:58 +00:00
Jermolene
7fe8c4c4a1 Fixes for translators edition/plugin 
* Added support for translating the core readme
* Fixed problem with `Misc.multids` rendering shadow tiddlers
* Fixed problem with single tiddler files rendering shadow tiddlers
 2014-10-29 10:57:50 +00:00
Jermolene
73a3077365 Add support for splitting standalone translations 2014-10-29 08:36:48 +00:00
Jermolene
91ec164361 Typo 2014-10-26 11:51:50 +00:00
Jermolene
cf1fb650d5 Tighten up multiline translators editors 2014-10-25 10:26:11 +01:00
Jermolene
29a8b2e718 Translator edition tweaks 2014-10-24 13:52:51 +01:00
Jermolene
a2672482c9 Add dropdown for filtering translatable strings 
The user can now choose between showing all strings, just those that
haven’t been translated, or just those that have been translated.
 2014-10-24 12:50:23 +01:00
Jermolene
39e37d5776 Improvements to translators edition 
More improvements for #984
 2014-10-24 11:18:37 +01:00
Jermolene
5bb74319e1 First pass at an edition for translators working in the browser 
The user interface needs some refinements but it shows the basic
principles.

The idea is that the translator would email their modified file, which
would then be merged into the core repo (some additional tools will be
helpful for this).

Fixes #984
 2014-10-22 14:14:24 +01:00
Jermolene
564457de1c Update to KaTeX v0.1.1 2014-10-17 20:10:38 +01:00
Jermolene
63c174d7ed Update KaTeX wrapper to support operation under Node.js 
Now we can generate static HTML containing mathematical typesetting
 2014-10-06 21:20:19 +01:00
Jermolene
459133cc57 Remove unused file watching code from filesystemadaptor 
This code was contributed by @natecain and added in #176. It was almost
immediately disabled because of problems in the field.

I’m removing the code now to simplify the adaptor in advance of some
planned refactoring.
 2014-09-28 23:46:55 +01:00
Jermolene
b3df07ae3e Error handling for KaTeX plugin 2014-09-24 11:50:49 +02:00
Jermolene
96b7d0eeba First pass at KaTeX plugin 
Finally fixes #458 thanks to the KaTeX plugin from Khan Academy
 2014-09-21 23:03:07 +01:00
Jermolene
9e6dab06cc Fix problem with Maruku Markdown metadata 
Fixes #855 - albeit it’s a bit of a kluge. The internal format returned
by `markdown.toHTMLTree()` isn’t sufficiently well documented for me to
be confident that the new code is resilient to all the things that
might be returned.
 2014-09-19 15:03:52 +01:00
gernert
401d18e0d7 Update UpgradeWizard.tid 
Just added a note.
 2014-09-19 12:55:35 +02:00
buggyj
57693efce7 corrected class name 2014-09-16 16:03:00 +02:00
Jermolene
f6ff0a7f71 Deprecate $:/tags/stylesheet in favour of $:/tags/Stylesheet 
A warning message appears at the top of the story river if any
`$:/tags/stylesheet` tags are found.

Fixing the first half of #824
 2014-09-10 09:13:21 +01:00
Jermolene
7e93c93785 Start to empty out the control panel tools tab 
The control panel isn’t the right place for tools; it’s a place for
settings and internal configuration.

Once again apologies to the translators for wiping out your hard work!
 2014-09-05 09:28:49 +01:00
Jeremy Ruston
f461b1ab91 Merge pull request #775 from buggyj/tw2typeerror 
remove code causing conversion of text/x-tiddlywiki type tiddlers to tex...
 2014-09-04 18:24:02 +01:00
Jermolene
e5aac3d6f2 Corrections of classes for tw2parser 
@buggyj I assume these classes should be converted to the new format?
 2014-09-02 11:16:59 +01:00
Jeremy Ruston
42181f9b45 Merge pull request #673 from buggyj/tw2parser2 
Tw2parser2
 2014-09-02 10:49:56 +01:00
buggyj
e8b85a450d restricted classic transclusion to type text/x-tiddlywiki 2014-09-02 08:02:21 +02:00
buggyj
c956d9c1dc update to head 2014-09-01 13:00:54 +02:00
buggyj
5b7dbfc5fb remove code causing conversion of text/x-tiddlywiki type tiddlers to text/vnd.tiddlywiki 2014-09-01 11:48:40 +02:00
buggyj
053929db3f remove upgrade nagging 2014-08-31 17:51:03 +02:00
buggyj
59244fba91 remove newlines around macros 2014-08-31 17:48:14 +02:00
Jermolene
9c74afdd1a JSHint obeisance for plugins folder 
Also add a jshintignore file to skip the various imported modules
 2014-08-30 21:32:55 +01:00
buggyj
322c04da53 remove incorrect version info 2014-08-30 16:46:47 +02:00
Jermolene
89fd5379dd Change "tw-*" variables to "tv-*" 2014-08-28 22:28:02 +01:00
Jermolene
2f69ea362c Rename "tw-*" messages to "tm-*" 2014-08-28 21:43:44 +01:00
Jermolene
f223310d34 Yet more "tw-*" -> "tc-*" 
Part of #764
 2014-08-28 19:41:29 +01:00
Jermolene
4a1c530da7 Rename "tw-tiddlylink-*" classes to "tc-tiddlylink-*" 
Part of #764
 2014-08-28 18:13:46 +01:00
buggyj
c8d9ceaf2d added image handling to tw2parser 2014-08-28 18:49:40 +02:00
Jermolene
a7dfa954d1 Rename "tw-image-*" classes to "tc-image-*" 
Part of #764
 2014-08-28 17:47:43 +01:00
Jermolene
9173e944df Rename class "btn-big-green" to "tc-btn-big-green" 
Part of #764
 2014-08-28 17:30:12 +01:00
Jermolene
d8c3691bd1 Removed unneeded CSS classes 
Part of #764
 2014-08-28 17:17:50 +01:00
Jermolene
32b795452f Allow Markdown dialect to be configured 2014-08-27 11:09:59 +01:00
buggyj
36a7b1149f merge to latest tw5 2014-08-25 13:01:30 +02:00
Jermolene
a105b52399 Refactor saver handler 
Fixing problems caused by c4b76ceb0b:

* We still need to initialise the saver-handler even when syncing to a
server, otherwise offline snapshots can’t be saved
* We need to override the default save template a bit further up the
stack, to avoid the server side serving the offline version of the wiki
at `/`
 2014-08-20 10:02:44 +01:00
Jermolene
c4b76ceb0b Improve offline saving with TiddlyWeb 
Now the usual “save changes” button in the sidebar will save an offline
copy of the wiki that excludes the TiddlyWeb plugin. Previously, this
functionality was only available in the control panel, leading to
several problems such as that discussed here:

https://groups.google.com/d/topic/tiddlywikidev/U61pO-TR854/discussion
 2014-08-19 12:20:26 +01:00
Jermolene
27f1f82a70 Rejigging syncer structuring 
The goal is to separate out the saver handling from the syncadaptor
handling; it will take a few steps to get there
 2014-08-14 11:12:25 +01:00
Jermolene
34461cb2fe Fix unclickable download link in upgrade wizard 2014-08-13 19:59:48 +01:00
Jermolene
cc4552f544 Readme update 2014-08-08 16:35:28 +01:00
Jermolene
3d7e43fa7a Move the Cecily icon 2014-08-08 07:50:00 +01:00
Jermolene
7cd13f7163 Give Cecily a readme 2014-08-08 07:49:48 +01:00
Jermolene
3842657392 Add/update plugin readmes 
Notice that translators need to translate the core plugin readme
 2014-08-07 15:49:52 +01:00
Jermolene
799a5b059a Move fullscreen button into core from plugin 2014-08-01 16:52:12 +01:00
Jermolene
2a887a5bac Add version number to one-shot upgrading UI 2014-07-23 21:01:19 +01:00
Jermolene
99eb556645 Remove broken info tiddlers 
We can’t currently detect TiddlyFox or TiddlyDesktop so we’’ll remove
the corresponding info tiddlers and documentation
 2014-07-23 09:14:21 +01:00
Jermolene
fd82112700 Sort out info mechanism docs 
Some of it belongs in the browser-sniff plugin

Also add a `$:/info/node` info tiddler.
 2014-07-22 15:16:18 +01:00
Jermolene
4f3ee7e7ca Update github ribbon plugin readme 2014-07-21 13:17:43 +01:00
Jermolene
3d8626dafa Move browser sniffing into a plugin 2014-07-21 13:17:16 +01:00
Jermolene
8612bc4006 Rename $:/tags/AboveStory and $:/tags/BelowStory 2014-07-18 11:29:09 +01:00
Jermolene
0a716ca0ef Fix problem with file picker overflow 
On Chrome the invisible file picker was extending below its container.
 2014-07-17 11:26:11 +01:00
Jermolene
7a034560d1 Refactor ImportListing 
Better to avoid relying on the storyTiddler variable, which is a pain
for people trying to reuse the import listing.
 2014-07-16 20:31:10 +01:00
Jermolene
cfc326a827 Styling for upgrade wizard 2014-07-16 11:09:30 +01:00
Jermolene
e40a0c07b8 Fix support for upgrading encrypted wikis 
Importing an encrypted wiki ordinarily doesn’t place the password in
the password vault on the basis that one ought to be able to import
from a file without automatically inheriting its password.

Now there’s a configuration option that can be used by the upgrade
plugin to cause the password vault to be updated with any password
entered by the user. The end result is that the user only needs to
enter their password once.
 2014-07-16 10:06:24 +01:00
Jermolene
85f37a7d35 More upgrade wizard styling 2014-07-15 14:04:12 +01:00
Jermolene
a58e1d01ca Remove the fill transition 
It looked terrible, presumably because it requires repaints.
 2014-07-15 13:17:28 +01:00
Jermolene
7e7c9592be Tweak upgrade wizard layout 2014-07-15 13:11:40 +01:00
Jermolene
98bf08d155 Tweak drop button colours 2014-07-15 13:11:13 +01:00
Jermolene
cf273129ef Add a privacy note to the upgrade wizard 2014-07-15 09:16:32 +01:00
Jermolene
4a810f209f Favicon for the upgrade wizard 2014-07-14 22:38:12 +01:00
Jermolene
ac21faed3e CSS fixes and improvements for upgrade wizard 2014-07-14 22:26:01 +01:00
Jermolene
3233a10c34 Upgrade wizard refinements 2014-07-14 22:11:40 +01:00
Jermolene
85d9f38ed8 Correct copy/paste error 2014-07-14 22:06:23 +01:00
Jermolene
4d948c575f Improvements to one-shot upgrade UI 2014-07-14 21:52:32 +01:00
Jermolene
c0edca78c8 Beginning of one-shot UI for upgrade.html 2014-07-14 14:53:21 +01:00
Jermolene
5891a61bfc Add instructions for the Google Analytics plugin 2014-07-14 14:50:23 +01:00
Jermolene
b9bf1ff574 Add plugin.info to tw2parser 
Every plugin must have a plugin.info file to be valid
 2014-07-12 09:08:38 +01:00
Jermolene
3ff7462afd Avoid saving $:/HistoryList 
Otherwise it just keeps growing on each navigation.
 2014-07-03 14:33:20 +01:00
buggyj
9a49c2a99e removed version info 2014-06-26 15:46:45 +02:00
Jermolene
f12d7bb6c0 Update to version 8.0 of highlight.js 2014-06-21 10:11:04 +01:00
buggyj
9992b542a3 added update for triple double-quotes macro params 2014-06-20 09:52:37 +02:00
Jermolene
b8aedf2ca3 Fixed problem with Markdown image handling 2014-06-18 14:56:32 +01:00
Jermolene
1717c93d00 Refactor codemirror plugin 
It no longer overrides the edit-text widget. Instead we use the editor
type mappings to select which content types should be handled by which
editor.
 2014-06-18 13:54:19 +01:00
buggyj
d13de81c7a checkin of updates to latest version of widget tree format, includes tiddler, slider and tabs macros 2014-06-17 18:56:31 +02:00
Jermolene
457764077b Recommitting the old tw2parser plugin 2014-06-14 08:17:16 +01:00
danielo515
8dd30e97ac Update instructions.tid to use one of the included addons 
This addon is already included into the plugin, but is not used, neither mentioned how to use it. It is a very useful but lightweight addon. I consider it is better to include the full functionality of the current configuration in the config example.
 2014-06-07 17:04:43 +02:00
Jermolene
6ab68e0fca Remove erroneous global wiki references 
$tw.wiki is used as a global reference in the outer initialisation
modules. It shouldn’t be used in widgets etc.
 2014-05-07 14:49:14 +01:00
Jermolene
8b20143b1b Pass content-type to codemirror mode option for syntax highlight 
Fixes #605
 2014-05-07 14:09:46 +01:00
natecain
c592e658e7 Fix up codemirror instructions to match new paths in config example 2014-05-06 23:57:10 +02:00
natecain
51f54b06f9 Upgrade codemirror to current master 2014-05-06 23:30:40 +02:00
Jeremy Ruston
3e49dd65a0 Merge pull request #594 from xcazin/fr-FR 
fr-FR translations for warnings about shadow tiddlers and binary content
 2014-05-05 20:57:28 +01:00
Jermolene
a0022a1cd6 Refactoring more of startup.js into modules 2014-05-05 10:17:50 +01:00
Jermolene
5b5621a600 Fix googleanalytics plugin to be platform-specific 2014-05-03 18:07:20 +01:00
Jermolene
78ba57d55d Remove support for browser-startup modules 
Instead support startup modules that stipulate which platform they
require.

Also include docs updates and fixes to fullscreen plugin
 2014-05-03 17:49:20 +01:00
Jermolene
b96aade28a WIP: Add support for dependencies between startup modules 
See StartupMechanism for details.
 2014-05-03 16:32:18 +01:00
Xavier Cazin
f81df69395 Change references to editions/clientserver into editions/server 2014-05-03 13:10:36 +02:00
Jermolene
d6054f1039 Fix problem with offline copy of server edition 
We were accidentally including all the shadow tiddlers as well as
ordinary ones.
 2014-04-18 15:23:00 +01:00
Jermolene
9fbe72a877 Rearrange system tag configuration 
By rearranging the `[all[]]` operator we are able to ensure that shadow
tiddlers get processed before ordinary tiddlers. This makes it easier
to create custom stylesheets that override the core.
 2014-04-18 09:28:14 +01:00
Jermolene
45b0966013 Support the image widget in markdown 2014-04-17 16:50:54 +01:00
Jermolene
46969fbd3e Adjust Cecily tiddler width 2014-04-13 09:24:06 +01:00
Jermolene
4f4b743d9c Fix Cecily tiddler width for when sidebar hidden 2014-04-12 18:24:39 +01:00
Jermolene
b7f674c51a First pass at refactoring filter execution 
This is the beginning of addressing #523.
 2014-04-03 20:49:16 +01:00
Jermolene
e397e4d159 Disable the tiddlyweb adaptor unless loaded over http(s) 2014-04-03 16:33:42 +01:00
Jermolene
93c29bd388 Fix missing require in filesystem adator 2014-04-03 15:40:30 +01:00
Jermolene
6307293469 Fix some Node.js cross-platform compatibility issues 
Thanks to http://shapeshed.com/writing-cross-platform-node/

Surprising that file path format is pretty much the only issue.
 2014-03-31 17:17:36 +01:00
Jermolene
945ad6792f Add first pass at Cecily plugin 2014-03-25 14:29:32 +00:00
Jermolene
aec618793f Fix problem with refreshing D3 plugin 
Fixes #217
 2014-03-11 11:12:56 +00:00
Jermolene
0200bc1b4e Force the highlight language to lower case 2014-03-02 19:42:40 +00:00
Jermolene
3307604130 Make type information translateable 2014-02-16 19:58:53 +00:00
Jermolene
bea8730a47 Fix problem with tiddlers of the type text/css 
Fixes #395
 2014-02-14 19:25:38 +00:00
Jermolene
70a120d4a6 Expand the logging mechanism to support alerts overlaid on the main screen 
Now we get decent visual indication of sync errors, for instance. Still
work to do to coalesce alerts so that the screen doesn’t fill up with
them after an interval. And probably we should add a button to clear
all alerts.
 2014-02-14 07:53:41 +00:00
Jermolene
1086c51019 Fixed problem with field mauling when reading skinny tiddlers 
The problem was showing up as tiddlers with the field “fields” and the
value “[Object object]”.
 2014-02-11 15:47:56 +00:00
Jermolene
ecba4f71ea Clean up the highlight plugin 
Fixing various issues that were preventing language specifiers from
working.
 2014-02-10 13:51:38 +00:00
Jermolene
a01bbd4b9c Add automatic saving and warning on exit with unsaved changes 
We re-use some of the existing syncer mechanism. It was already keeping
track of changes to tiddlers in the store when working with a tiddler
syncadaptor. Now it also tracks changes when there is no syncadaptor,
allowing us to provide a warning if there are unsaved changes.
 2014-02-06 21:36:30 +00:00
Jermolene
5d3dda1a17 Fix problem with highlighting only working in the DOM 
The current implementation of the highlight plugin only works properly
in the browser, and doesn’t work under Node.js. It also doesn’t work
when rendering to the fakedom in the browser (as happens when rendering
stylesheets, for example).
 2014-01-27 17:10:02 +00:00
Jermolene
dfc57ffa49 More logging 2014-01-26 20:59:30 +00:00
Jermolene
3f9561dd95 Better logging 2014-01-26 18:53:31 +00:00
Jeremy Ruston
5c9a5f5cba Merge pull request #360 from pmario/docs-cm 
docs: CodeMirror config tiddler
 2014-01-26 02:01:57 -08:00
Mario Pietsch
66254b436c fix #215 cm gutter adjust .CodeMirror-linenumber min-width, font-size. It should work up to 999 lines now. There should be a ControlPanel tab for codemirror 2014-01-25 23:33:24 +01:00
Mario Pietsch
d42981f201 docs: CodeMirror config tiddler needs to be type:application/json 2014-01-25 22:53:52 +01:00
Jermolene
762940adbc No longer save system modules separately in the main HTML template 
These tiddlers were being handled as `<script>` tags to make it easier
to debug them. But in fact modern dev tools are quite happy to debug
code that has been eval’d, and this arrangement was causing problems
for importing.

Fixes #335
 2014-01-25 21:22:43 +00:00
Jermolene
b5629ccc82 Update codemirror plugin docs 
@pmario and @jbolila - could you kindly check whether the docs cover
everything?
 2014-01-25 19:34:32 +00:00
Jermolene
b1b9c7d6cd Fix typo in codemirror editor 2014-01-25 14:07:10 +00:00
Jermolene
951147d502 Style tweaks 2014-01-24 21:45:37 +00:00
Jermolene
9539664e46 Merge branch 'codemirror_keymap' of https://github.com/jbolila/TiddlyWiki5 into jbolila-codemirror_keymap 2014-01-24 21:39:55 +00:00
Jermolene
3414f1ca8e Move node-webkit saver into a plugin 
We don’t need it for TiddlyDesktop now that it reuses the TiddlyFox
saver. But it is still useful for embedding a TW directly into a
node-webkit app
 2014-01-18 14:57:42 +00:00
João Bolila
d7d5165847 all configuration and required libs in the config tiddler 2014-01-13 23:34:11 +00:00
João Bolila
c74bf6a655 in resp to https://github.com/Jermolene/TiddlyWiki5/pull/328#issuecomment-32131402 2014-01-12 21:48:03 +00:00
João Bolila
17b542980f if a function 2014-01-12 20:03:34 +00:00
João Bolila
8f4e1587a2 rename from mode to keymap bindings (Vim and Emacs bindings) 2014-01-12 19:38:27 +00:00
João Bolila
426f2978cf fixes of a newbie, me 2014-01-12 17:09:24 +00:00
João Bolila
a704498155 added suport for vim and emacs keymaps (codemirror updated to 3.20) 2014-01-11 15:23:49 +00:00
João Bolila
c5035fc0b0 highlight.js updated to version 8.0 (http://highlightjs.org/) 2014-01-09 14:32:31 +00:00
João Bolila
82a48cf85c codeblock as a widget and plugin for highlight code blocks 2014-01-07 22:57:46 +00:00
João Bolila
a1d2e70307 Plugin for syntax highlighting with highlight.js from Ivan Sagalaev 2014-01-05 09:58:01 +00:00
Jermolene
44568dc6ef Hide encryption status when running on the server 
A partial fix for #303
 2013-12-30 15:05:07 +00:00
Jermolene
ef59a3743f Fix crashes when attempting full screen mode on browsers that don't support it 
Fixes #311
 2013-12-29 12:54:00 +00:00
Jermolene
b659c65959 Add offline download to TiddlyWeb control panel 
Add button to download an offline-compatible snapshot to the TiddlyWeb
control panel
 2013-12-19 16:28:42 +00:00
Jermolene
e8f16c1c97 Correct description of github-fork-ribbon plugin 2013-12-19 16:26:00 +00:00
Jermolene
638c8b2070 Fixes to fullscreen support 
Prompted by this article:

http://generatedcontent.org/post/70347573294/is-your-fullscreen-api-code
-up-to-date-find-out-how-to
 2013-12-18 21:39:59 +00:00
Jermolene
cc39686693 Create tiddlers subfolder in wiki folder if it is not present 2013-12-18 21:11:52 +00:00
Jermolene
5ac5b2c76d Move markdown.js 
Leaving it in node_modules meant that it wasn’t getting installed by npm

Fixes #281
 2013-12-15 16:44:49 +00:00
Jermolene
8496337d30 Remove "coreversion" metadata from plugins 
There’s no support for it yet, so it’s confusing.
 2013-12-14 09:49:39 +00:00
Jermolene
67072371a0 Get rid of extraneous logging on filesystemadaptor 2013-12-11 13:13:48 +00:00
Jermolene
062822d45c Fix file system behaviour for loading new tiddlers 
We don’t need to load tiddlers because they will all have been loaded
during bootup, or been created through the file system adaptor.
 2013-12-11 11:45:15 +00:00
Jermolene
9d60cb50ed Make sure the github ribbon is behind any notifications 2013-11-26 22:46:36 +00:00
Jermolene
8cf2b06e53 Move Google Analytics integration into a proper plugin 2013-11-25 23:14:12 +00:00
Jermolene
f9fbbc12a6 Ensure github-fork-ribbon styles tiddlylinks 
Otherwise CSS specificity means that the TW core styles win
 2013-11-19 19:44:40 +00:00
Jermolene
dc9ec22156 A plugin for adding github ribbons 2013-11-19 14:23:30 +00:00
Jermolene
90a0eca2f5 Add dropdown interface for setting the type of a tiddler 2013-11-18 09:00:25 +00:00
Jermolene
ecca7a3ea9 TiddlyWeb control panel update 2013-11-15 22:09:06 +00:00
Jermolene
95b7a5d4fe Add host configuration to TiddlyWeb control panel tab 2013-11-10 23:28:03 +00:00
Jermolene
a668f09522 More refinements to the control panel 
Including adding a TiddlyWeb-specific control panel tab
 2013-11-10 21:53:39 +00:00
Jermolene
6f1c9d88cc Improve the Widget.prototype.removeChildDomNodes() method so that most subclasses won't need to override it 2013-11-09 16:55:14 +00:00
Jermolene
06e0bdbfbb Improve readability of CodeMirror editor 2013-11-09 15:56:17 +00:00
Jeremy Ruston
ec481415f9 Fixes for TiddlyWeb 2013-11-08 20:18:26 +00:00
Jeremy Ruston
cc0011abd3 Get rid of the "new_" prefix we had on some methods 
There's still the "old_" prefix to get rid of too.
 2013-11-08 08:51:14 +00:00
Jeremy Ruston
b7cb1d3391 Change new_widget to widget 
I was avoiding doing this until after the merge.
 2013-11-08 08:47:00 +00:00
Jeremy Ruston
35adf4269a Merge backlog of changes from master branch 
This is too easy. I'm worried.
 2013-11-08 08:33:27 +00:00
Jeremy Ruston
36fa41e19a First pass at integrating a Markdown parser 
Internal links don't work yet.

@natecain - have I included the node module in the right way?
 2013-11-01 16:06:08 +00:00
Jeremy Ruston
693d1803bf Fix problem with codemirror plugin and handling of ordinary input fields 2013-10-30 14:28:20 +00:00
Jeremy Ruston
d2b2ae5262 Fix filesystem adaptor to use new widget mechanism 2013-10-29 14:53:23 +00:00
Jeremy Ruston
c4d5b803ef Temporarily disable the filewatcher functionality 
It's currently broken, awaiting a fix from @natecain
 2013-10-29 14:47:18 +00:00
Jeremy Ruston
c46748b82f Fix the template for serving tiddlers 2013-10-25 22:30:36 +01:00
Jeremy Ruston
eb5a8253ba Make the full screen plugin work again 2013-10-25 12:53:58 +01:00
Jeremy Ruston
11a07e71dc Move stripcomments from the classictools plugin into the core 
It's a bit of a hack for the moment. The plan is to implement
stripcomments via the macro mechanism, at which point it can move back
into the plugin.
 2013-10-25 12:32:57 +01:00
Jeremy Ruston
cfa68dade5 Update CodeMirror plugin to latest version and the new widget framework 
Now the CodeMirror plugin modifies the behaviour of the core edit-text
widget.
 2013-10-25 09:48:57 +01:00
Jeremy Ruston
a5f5f1bd9c Fixed up the D3 demo plugin 2013-10-24 20:45:53 +01:00
natecain
539915d300 Provide an exports object in the evalSandboxed context of jasmine-plugin 2013-10-12 13:42:02 -04:00
natecain
2c02b6d6bc Remove watcher while saving, and use AddTiddler instead of modifying tiddlers directly 2013-10-11 18:43:51 -04:00
natecain
4849bd43c8 More graceful handling of tiddler delete in filesystemadaptor watch code 2013-10-11 17:54:47 -04:00
natecain
ee236060c7 Rudimentary fs.watch usage in filesystemadaptor 
Will only watch for changes on wiki files loaded during startup or created by runtime
    (Does not yet track renames/deletes)
    (Will not notice new files)
  May become confused by directory structure changes on some platforms
    (see node docs on fs.watch for caveats!)
 2013-10-11 17:10:10 -04:00
Jeremy Ruston
20f06e8eec Ensure that the core plugins inherit their version number from the main package.info 2013-08-26 13:28:23 +01:00
Jeremy Ruston
c54faeecd8 Merge tw2 related plugins and templates 
Now all the plugins and templates needed are in the plugin
`tiddlywiki/classictools`
 2013-08-04 22:06:36 +01:00
Jeremy Ruston
892b24d6e1 Allow templating of URLs for TiddlyWebAdaptor 
Templates for TiddlyWeb URLs are defined in the tiddler
`$:/config/tiddlyweb/host` as a string that can include `$protocol$`
and `$host$`. The default is `$protocol$//$host$/`
 2013-08-03 16:25:47 +01:00
Jeremy Ruston
1fed9e7eee Add "spiral" attribute to wordcloud widget 2013-08-02 22:04:50 +01:00
Jeremy Ruston
c817690ab9 First pass at WordCloud plugin 2013-07-30 12:36:36 +01:00
Jeremy Ruston
ea8556bb1f Ensure the bar chart widget updates its view when it refreshes 2013-07-21 21:08:46 +01:00
Jeremy Ruston
5445a8b782 Add first pass of D3.js plugin, and a new demo wiki for it 2013-07-16 15:03:40 +01:00
Jeremy Ruston
28b0b58a11 Make a distinction between templates and UI 
Templates are the low-level bits and pieces that allow TW5 to generate
HTML and CSS renderings of tiddlers. The UI folder contains the
user-visible UI of TW5
 2013-05-31 15:38:27 +01:00
Jeremy Ruston
00a06f744c Remove the obsolete Dropbox plugins 2013-05-29 18:32:07 +01:00
Jeremy Ruston
eebf3dae95 CodeMirror updates 2013-05-15 17:32:28 +01:00
Jeremy Ruston
8564602256 Refactor rendertree to simplify context handling 
Get rid of the separate renderContext stack and instead have a parent
pointer on renderer nodes. This lets us walk back up the render tree to
resolve context references
 2013-05-15 17:32:17 +01:00
Jeremy Ruston
6864251962 Cleaning up content types 
Dealt with some inconsistencies
 2013-05-13 17:42:07 +01:00
Jeremy Ruston
dd8c8567fd Add experimental CodeMirror plugin 
The plugin is incomplete, and currently abandoned. It loads up an
instance of CodeMirror as an editor, and loads the right tiddler into
it, but the work hasn't been done to allow changes to be saved. The
startup time is ridiculously long, which is why I abandoned it.
 2013-05-07 14:42:47 +01:00
Jeremy Ruston
debf29d391 Fix Jasmine stylesheet 2013-04-30 23:01:08 +01:00
Jeremy Ruston
17cfd57390 Start making themes switchable 
Separately switch in ordinary plugins and themes. Change the convention
for plugin information to use dashes rather than camel case.
 2013-04-28 22:52:26 +01:00
Jeremy Ruston
8e582e002b Experimental plugin for Tahoe-LAFS 2013-04-26 22:18:46 +01:00
Jeremy Ruston
297a924d05 Cleaning up the jasmine plugin adaptor 2013-04-25 17:09:26 +01:00
Jeremy Ruston
709e3eec14 First version of testing plugin based on Jasmine 
It will need some cleaning up here and there, but at this point works
cross-platform
 2013-04-25 09:06:13 +01:00
Jeremy Ruston
ba7b886067 Move tiddlyweb stuff into a separate ServerControlPanel 
Eventually we'll need a more general purpose mechanism for plugins to
add UI to the control panel
 2013-04-16 11:17:27 +01:00
Jeremy Ruston
7b45c0bec8 Move the required template overrides into the tiddlyweb plugin 2013-04-03 13:23:07 +01:00
Jeremy Ruston
e449c0bb7d Added support for deleting tiddlers during file synchronisation 2013-03-25 20:16:12 +00:00
Jeremy Ruston
1b4f292351 Grammar 2013-03-25 20:04:52 +00:00
Jeremy Ruston
631dd1cc5f Added ability to disable file saving for specific tiddlers 2013-03-25 19:50:33 +00:00
Jeremy Ruston
d75db05ea6 Cleaning up the previous commit 2013-03-25 12:12:53 +00:00
Jeremy Ruston
10b192e743 Add support for saving binary files 2013-03-25 12:11:34 +00:00
Jeremy Ruston
19b62c30d8 Parameterise the template for saving tiddlers 2013-03-25 11:09:34 +00:00
Jeremy Ruston
77a6b72245 Enable server side file synchronisation in the clientserver edition 
Use with great caution for the moment
 2013-03-25 10:43:46 +00:00
Jeremy Ruston
70def07d63 Clearer logging preparatory to implementing file synchronisation 2013-03-24 12:53:09 +00:00
Jeremy Ruston
7df3d48451 Add a file system sync adaptor for the server 
It's going to save tiddler changes to the file system
 2013-03-24 12:27:46 +00:00
Jeremy Ruston
25e56c2ade Stop using the term "bundle" to describe plugins 2013-03-23 16:34:12 +00:00
Jeremy Ruston
5e12868e76 Fixes to ensure revision field is always a string 
TiddlyWeb returns it as a number, which seems like it might be an
accident.
 2013-03-18 10:13:36 +00:00
Jeremy Ruston
09a0b2a336 Use the newly refactored syncer in favour of the old tiddlyweb code 2013-03-17 18:21:24 +00:00
Jeremy Ruston
dbde2bf23b Started refactoring TiddlyWeb syncer into generic syncer + TiddlyWeb adaptor 
The refactored plugin is `tiddlyweb2` for the moment. The idea is to be
able to use the same syncer with a different adaptor for syncing
changes to the local file system.
 2013-03-17 15:28:49 +00:00
Jeremy Ruston
e78c161c63 Correct comment 2013-03-17 15:06:26 +00:00
Jeremy Ruston
71aa79013d Remove invokeSyncers() method from wiki.js 2013-03-16 10:58:47 +00:00
Jeremy Ruston
854e8d7083 Use the wiki event mechanism to dispatch lazyLoad notifications to syncers 
We're trying to get to the point where wiki.js doesn't know about
syncers
 2013-03-16 10:50:36 +00:00
Jeremy Ruston
c3b57507b0 Refactored wiki event mechanism to support multiple event types 2013-03-16 10:42:46 +00:00
Jeremy Ruston
623a3ec8f8 Rename "shadow" tiddlers to "system" tiddlers 
What we have at the moment isn't really the same as TiddlyWiki
classic's shadow tiddlers, it's a much simpler system for excluding
tiddlers. We'll use the term "shadow" instead to refer to the way that
tiddlers in plugins behave, which is exactly like TiddlyWiki classic's
shadow tiddlers.
 2013-03-15 22:00:19 +00:00
Jeremy Ruston
71ecb022ef Update TiddlyWeb support 
Lots of changes:
* Make the built-in server support recipes and bags, albeit there's
just one of each, called "default"
* Correctly parse returned Etag to get bag of freshly PUT tiddlers
* URI encoding for tiddler titles, so that tiddlers with slashes and so
on work OK
 2013-03-12 19:18:56 +00:00
Jeremy Ruston
daf3d35180 Fix TiddlyWeb adaptor to make deleting work 2013-03-11 10:05:01 +00:00
Jeremy Ruston
672fa4b38c Update TiddlyWeb syncer 
Includes the beginnings of support for deleting tiddlers. It also
allows the recipe to be optional.
 2013-03-10 19:27:37 +00:00
Jeremy Ruston
83a141752c Further simplifications to syncer interface 
Dropped the idea of exposing separate server connections
 2013-03-09 09:54:01 +00:00
Jeremy Ruston
3da508b7c4 Simplify syncer interface 2013-03-08 20:29:13 +00:00
Jeremy Ruston
a13d30e85a Fix recipe loading to handle comments 2013-03-08 16:10:20 +00:00
Jeremy Ruston
f6faa156a5 Cleaning up recipe file access code 2013-03-01 09:13:44 +00:00
Jeremy Ruston
91002165af Update TW2 edition 
Move the plugins into the core, add a template for the externaljs
distribution of TW
 2013-02-09 17:10:18 +00:00
Jeremy Ruston
9a71117853 Prettify JSON 2013-01-28 19:27:22 +00:00
Jeremy Ruston
b006cf163f Remove the old parser code 
Thus introducing a few functional regressions, but it's going to be
easier to fix things up without the old code knocking around and
getting in the way.
 2012-12-28 22:08:32 +00:00
Jeremy Ruston
580bd6438e Fixed issues with blank tiddler text 
The empty string is falsy in JavaScript, to keep us on our toes.
 2012-11-23 13:08:10 +00:00
Jeremy Ruston
3087c2001c If host and recipe are missing from connection then infer them from the page environment 2012-11-20 16:31:25 +00:00
Jeremy Ruston
147fde31b2 More TiddlyWeb sync tweaks 2012-11-19 22:14:25 +00:00
Jeremy Ruston
49ca83e17d Fix content type for TiddlyWeb 2012-11-19 17:35:12 +00:00
Jeremy Ruston
3d38d4add3 Use text/x-tiddlywiki for old format TiddlyWiki text for compatibility 2012-11-19 16:58:16 +00:00
Jeremy Ruston
d663368b9c Logging and fixes for TiddlyWeb sync 2012-11-19 16:55:57 +00:00
Jeremy Ruston
e2d6c16f50 Minor refactorings and reorderings 2012-11-19 14:18:21 +00:00
Jeremy Ruston
b8fcc9f0c0 Fixed problem with polling 2012-11-19 13:59:32 +00:00
Jeremy Ruston
6463f972e0 Added polling for changes from the server 2012-11-19 13:54:25 +00:00
Jeremy Ruston
d42e5e1319 Got the basic two way sync working 
Quite pleased with how relatively simple the logic becomes once one
thinks in terms of queues of tasks
 2012-11-19 12:56:54 +00:00
Jeremy Ruston
4e9dd3123b More TiddlyWeb sync 2012-11-19 09:04:35 +00:00
Jeremy Ruston
baba32e548 More TiddlyWeb sync 2012-11-18 21:07:14 +00:00
Jeremy Ruston
84650b9a54 Swap over to the new mime type conventions 
Discussed in
https://groups.google.com/forum/#!topic/tiddlywikidev/re8xfLqZNCE
 2012-11-18 15:22:13 +00:00
Jeremy Ruston
951c53c982 Do some content type jiggling with TiddlyWeb 
To be fixed up later
 2012-11-18 14:57:54 +00:00
Jeremy Ruston
b962739f04 Fix TW2 parser crashing on skinny tiddlers 2012-11-18 14:57:28 +00:00
Jeremy Ruston
5c87b437ee Support for lazy loaded tiddlers 2012-11-18 13:14:28 +00:00
Jeremy Ruston
a5d2a3a4e8 Start bringing tiddlers back from TiddlyWeb 2012-11-18 10:24:20 +00:00
Jeremy Ruston
4742ab14fc Start using the server connection tiddler to store host details 2012-11-17 21:15:19 +00:00
Jeremy Ruston
ecd45e2732 Improve error handling 2012-11-17 20:31:30 +00:00
Jeremy Ruston
e194aed449 Introduce syncer mechanism 2012-11-17 20:18:36 +00:00
Jeremy Ruston
fc61b9aca7 Added login and logout macros for TiddlyWeb 2012-11-17 12:32:51 +00:00
Jeremy Ruston
6c1eb7500d Proper TiddlyWeb login 2012-11-16 22:59:33 +00:00
Jeremy Ruston
e55db48bd5 Added preliminary TiddlyWeb/TiddlySpace plugin 
Visit http://tw5tiddlyweb.tiddlyspace.com/tw5tiddlyweb to try it out
 2012-11-16 17:01:04 +00:00
Jeremy Ruston
5f9b2e9d84 Turn the TiddlyWiki 2.x.x parser into a plugin 2012-11-15 12:47:09 +00:00
Jeremy Ruston
539b64b626 Refactoring module mechanism 
Changed the data structure $tw.modules.types to make it possible to
detect repeated registrations
 2012-11-14 11:23:43 +00:00
Jeremy Ruston
ce47f5e1d4 Started to move dropbox bits and pieces into a plugin 
Currently tw5dropbox is broken, pending some further changes around
module handling
 2012-11-13 18:42:50 +00:00
Jeremy Ruston
3b11713e88 Refactoring plugin implementation 
Including introducing the terminology "tiddler bundles"
 2012-11-12 22:16:49 +00:00