1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 18:17:20 +00:00
Commit Graph

3458 Commits

Author SHA1 Message Date
Jermolene
260080164f Update setTiddlerData() to preserve tiddler dictionaries
Previously, data tiddlers were always being saved in JSON format,
regardless of the original format.
2014-02-23 12:33:00 +00:00
Mario Pietsch
3f7ff22280 Merge branch 'master' of https://github.com/Jermolene/TiddlyWiki5 into de-DE 2014-02-22 19:16:25 +01:00
Mario Pietsch
51c1a863f8 translations for Misc.multids and ControlPanel. Fields moved to outer dir 2014-02-22 19:16:16 +01:00
Jermolene
823b4fa61b Docs updates 2014-02-22 17:06:02 +00:00
Jermolene
c3f9cf41d5 Tweaks to @giffmex's palettes 2014-02-22 17:05:56 +00:00
Jermolene
ecb845f1cd Require that wiki folders have a tiddlywiki.info file
Previously, we were just using default content if the tiddlywiki.info
file was missing. This allowed us to do things like `tiddlywiki
—server` without actually being in a valid wiki folder.

Fixes #361
2014-02-22 16:38:34 +00:00
Jeremy Ruston
0737e62161 Merge pull request #430 from xcazin/fr-FR
Corrections on fr-FR translation per Julie Strzelecki remarks.
2014-02-22 16:13:49 +00:00
Jermolene
39ee69910e More docs updates 2014-02-22 16:13:32 +00:00
Jermolene
2ab0facf3a Extend button widget to allow navigating to a tiddler
Fixes #327
2014-02-22 16:13:16 +00:00
Xavier Cazin
6bff3e3163 Corrections on fr-FR translation per Julie Strzelecki remarks. 2014-02-22 17:10:14 +01:00
Jermolene
ec606c89d2 Docs updates 2014-02-22 13:31:24 +00:00
Jermolene
9e0f1240c5 Change SiteTitle/SiteSubtitle into $:/SiteTitle and $:/SiteSubtitle
To make things more consistent
2014-02-22 11:39:18 +00:00
Jermolene
199fdb090d Convert @giffmex themes into colour palettes
Although there are some style changes in the existing themes they’re
mostly a matter of a changed palette.

@giffmex - I’ll send you a prerelease of 5.0.8 so that you can tweak
the palettes if you’ve got time.
2014-02-22 11:00:51 +00:00
Jermolene
d6a44b67a3 Fix control panel modules tab 2014-02-22 08:57:39 +00:00
Jeremy Ruston
2e7efe2dc0 Merge pull request #428 from xcazin/fr-FR
Change suffix tids to multids for 2 fr-translated multi tiddler files
2014-02-22 08:54:10 +00:00
Jermolene
639fd4be20 Docs updates 2014-02-22 08:53:58 +00:00
Jermolene
75ff9fb6c0 Allow the end of text to be treated as a linebreak for parsing HTML tags 2014-02-22 08:43:03 +00:00
Xavier Cazin
57c956716e Overlooked formatting consequences for 2 translation decisions 2014-02-21 23:02:17 +01:00
Xavier Cazin
cfa6f0a8a6 Change suffix of two MultiTiddlerFiles from tids to multids 2014-02-21 22:34:07 +01:00
Jermolene
0961b0426b Use import report tiddler only if more than one tiddler is imported
If there’s only one, just display the tiddler itself.
2014-02-21 20:17:34 +00:00
Jeremy Ruston
cf5fa875aa Merge pull request #426 from xcazin/fr-FR
Translation of recently added translateable strings.
2014-02-21 18:31:23 +00:00
Xavier Cazin
a812c6e386 Translation of recently added translateable strings. 2014-02-21 19:26:49 +01:00
Jermolene
dfbb6e1fba Ensure that $:/isEncrypted is reset if modified 2014-02-21 18:21:10 +00:00
Jermolene
31975e0042 Update importing so we don't open every imported tiddler
Instead we just display a report with links to each imported tiddler.
Should make importing much faster.
2014-02-21 18:21:10 +00:00
Jeremy Ruston
38ef4fa609 Merge pull request #425 from BramChen/master
Add "Misc.multids" to chinese language packs
2014-02-21 16:13:52 +00:00
Jermolene
7f66df78ff Cleaning up from mangled merge of @xcazin's fr-FR translation 2014-02-21 16:13:10 +00:00
Jermolene
96dc489ba8 Merge branch 'fr-FR' of https://github.com/xcazin/TiddlyWiki5 into xcazin-fr-FR
Conflicts:
	languages/fr-FR/ControlPanel.tids
	licenses/cla-individual.md
2014-02-21 16:05:11 +00:00
Bram Chen
34a7fc6084 Merge remote-tracking branch 'upstream/master' 2014-02-22 00:01:41 +08:00
Bram Chen
41575b8012 Add Misc.multids to chinese language packs and more words and phrases are improved 2014-02-22 00:01:06 +08:00
Jermolene
cb5b95add2 Extend fakedom to support .value property
So that 88ffb2ad12 will work on the server
2014-02-21 15:43:25 +00:00
Bram Chen
372553d9da Merge remote-tracking branch 'upstream/master' 2014-02-21 23:01:59 +08:00
Bram Chen
747ec243ff Merge remote-tracking branch 'upstream/master' 2014-02-21 22:41:08 +08:00
Jeremy Ruston
1bc2700137 Merge pull request #424 from BramChen/master
Improve more Simplified Chinese words and phrases used in chinese langua...
2014-02-21 14:38:38 +00:00
Jermolene
4ee277f41b Fix some missing translateables 2014-02-21 14:27:49 +00:00
Bram Chen
894588db54 Improve more Simplified Chinese words and phrases used in chinese language pack. 2014-02-21 22:12:41 +08:00
Jermolene
68bcbff753 Rough and ready control over bitmap editor line width and colour
Fixes #414
2014-02-21 14:06:04 +00:00
Jeremy Ruston
d4baf515ed Merge pull request #423 from Skeeve/patch-3
Update navigator.js
2014-02-21 09:40:16 +00:00
Skeeve
d5c31ed07f Update navigator.js
As described here: https://groups.google.com/d/msg/tiddlywikidev/AWvXz7RMIC4/gFF5crN2UJoJ

Providing a name for the new tiddler message only works if a skeleton tiddler already exists. If not, "New Tiddler" is taken. This change fixes that in that the provided name is taken even if there is no skeleton.
2014-02-21 10:37:20 +01:00
Jermolene
9b6c59e9a6 Allow .multids files to contain blank lines and ": " sequences
Also added a warning for multiple definitions of the same tiddler in a
multids file.

Fixes #415
2014-02-21 09:24:36 +00:00
Jermolene
ec0769d7ca Fix typo
Fixes #417, thanks @pmario
2014-02-21 09:11:27 +00:00
Xavier Cazin
93f5e736e7 Update cla-individual.md 2014-02-21 10:07:56 +01:00
Jermolene
c4058c4662 Another block mode vs inline mode fix 2014-02-21 09:07:46 +00:00
Jermolene
f59b84e63b Add DanieloRodriguez's BrainTest to Community tiddler
And remove Bram’s translation, because it will be built into 5.0.8
2014-02-20 22:47:40 +00:00
Jermolene
c17844b815 Another fix for the block vs inline handline 2014-02-20 22:43:04 +00:00
Jermolene
c761bbe2ed Restore stub French translation 2014-02-20 22:27:43 +00:00
Jermolene
279f32080d Start to make the core templates more readable
Yay for line breaks.
2014-02-20 22:22:45 +00:00
Jermolene
06a0d21734 Use double linebreaks to indicate content of a widget or html element should be parsed in block mode
Fixes #82.

The old behaviour was to parse the content of a widget or html element
in block mode if the opening tag was followed by a line break. The new
behaviour requires two line breaks.

This makes it possible to include linebreaks more liberally within
wikitext, although care must still be taken to only use double line
breaks when the block mode behaviour is desired.

The code change here is very simple, just a single line change in
html.js. Most of the other changes are to convert various single line
breaks into double line breaks.
2014-02-20 21:42:31 +00:00
Xavier Cazin
d8513b23c2 Removed .gitignore by mistake 2014-02-20 22:00:11 +01:00
Xavier Cazin
49b4e86091 Two last minute corrections that deserve being integrated. 2014-02-20 21:55:54 +01:00
Xavier Cazin
f522a96064 Last tweaks before pull request 2014-02-20 21:13:46 +01:00