1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-28 19:10:28 +00:00
Commit Graph

3284 Commits

Author SHA1 Message Date
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
Jermolene
8f9d88f25b Fix static stylesheets 2014-02-20 19:28:17 +00:00
Jermolene
e88f8ad4e9 Fix typo with <<color>> macro 2014-02-20 19:12:05 +00:00
Jermolene
0480bf023d Fix static CSS generation 2014-02-20 18:33:01 +00:00
Jermolene
e3c1906eaf Make the show/hide editor button be translateable
Missed by accident from earlier commit
2014-02-20 17:53:23 +00:00
Jeremy Ruston
45f29f6425 Merge pull request #421 from BramChen/master
Add palette editor translation for zh-Hant and zh-Hans
2014-02-20 17:35:43 +00:00
Jermolene
f4c7a269bd Allow "<<color>>" as a synonym for the "<<colour>>" macro
Entente cordiale!
2014-02-20 17:14:27 +00:00
Bram Chen
46b2c9e24c Merge remote-tracking branch 'upstream/master' 2014-02-21 00:44:34 +08:00
Bram Chen
f46864fff5 Add palette editor translation for zh-Hant and zh-Hans 2014-02-21 00:41:45 +08:00
Jermolene
5bc408fa75 Remove the old placeholder translations for French and US English 2014-02-20 16:20:14 +00:00
Jermolene
921ff6ae39 Make palette editor translateable 2014-02-20 16:07:03 +00:00
Jermolene
b9e72fb676 Move starlight themes macros into the core 2014-02-20 15:59:44 +00:00
Jermolene
1258c16e2b Add Simplified Chinese to tw5.com
We’ll have to stop adding every available translation to tiddlywiki.com.
2014-02-20 15:55:31 +00:00
Jeremy Ruston
35eb3aee35 Merge pull request #420 from BramChen/master
Add initial translation for Simplified Chinese (zh-Hans).
2014-02-20 15:14:26 +00:00
Bram Chen
12016bd0f8 Add initial translation for Simplified Chinese (zh-Hans). 2014-02-20 23:03:06 +08:00
Xavier Cazin
3817ba642d Consistency tweaks 2014-02-20 15:00:01 +01:00
Jeremy Ruston
d6ef67e817 Merge pull request #419 from BramChen/master
remove extraneous files in editions/zh-Hant
2014-02-20 13:10:54 +00:00
Bram Chen
a51a5e969f remove extraneous files in editions/zh-Hant 2014-02-20 21:03:26 +08:00
Jeremy Ruston
ae9d0f8288 Merge pull request #418 from BramChen/master
Add initial translation for Traditional Chinese (zh-Hant).
2014-02-20 12:22:30 +00:00
Bram Chen
b26b620548 Add initial translation for Traditional Chinese (zh-Hant). 2014-02-20 20:14:27 +08:00
Jermolene
d21fb85d94 Change .tids file extension to .multids
Hopefully less confusing
2014-02-20 10:27:02 +00:00
Jermolene
bcd86d5861 Add palette editor 2014-02-20 10:00:38 +00:00
Jermolene
5417b8c4d7 Add 'indexes' filter operator
Returns the indexes within a data tiddler.

We’re about to use this to enumerate the colours within a palette.
2014-02-20 10:00:13 +00:00
Jermolene
2744671211 Fix generateTitle to avoid clashing with shadow tiddlers 2014-02-20 09:58:01 +00:00
Jermolene
88ffb2ad12 Fix problem that was causing Chrome to display black in colour picker swatches
Hurrah!
2014-02-20 09:57:44 +00:00