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

5849 Commits

Author SHA1 Message Date
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
James Welford Anderson
cc85368fd4 highlightjs in nodejs 2015-01-03 02:00:08 +09:00
Jermolene
bb51e399ff Resolve merge conflict 2014-12-30 18:45:21 +00:00
Jermolene
a2ac4ddd6c Merge branch 'signCLA' of https://github.com/Arlen22/TiddlyWiki5 into Arlen22-signCLA
Conflicts:
	licenses/cla-individual.md
2014-12-30 18:43:47 +00:00
Jeremy Ruston
ef6a6fea87 Merge pull request #1294 from aelocson/patch-4
Improvements to filter grammar presentation
2014-12-30 18:42:51 +00:00
Jeremy Ruston
8707d51b7d Merge pull request #1293 from aelocson/patch-3
Improvements to wording
2014-12-30 18:42:03 +00:00
Jeremy Ruston
43250e028a Merge pull request #1292 from Infurnoape/patch-1
Update cla-individual.md
2014-12-30 18:38:38 +00:00
Jermolene
a8854662e4 Keep documentation style guide in the TOC 2014-12-30 18:38:22 +00:00
Jermolene
b8f090e0c6 Clean up from merging @roma0104's changes 2014-12-30 18:37:12 +00:00
Jeremy Ruston
6672af7c62 Merge pull request #1289 from aelocson/patch-2
Expand the Document Style Guide
2014-12-30 18:37:05 +00:00
Jeremy Ruston
051bafaf41 Merge pull request #1287 from BramChen/master
Update chinese translations for tiddler toolbar button wording
2014-12-30 18:35:21 +00:00
Jeremy Ruston
399a80643a Merge pull request #1283 from aelocson/patch-1
Improvements to wording
2014-12-30 18:34:55 +00:00
Jermolene
afda1c5344 Merge branch 'roma0104-master' 2014-12-30 18:24:43 +00:00
Jermolene
6d87b505b1 Merge branch 'master' of https://github.com/roma0104/TiddlyWiki5 into roma0104-master
Conflicts:
	editions/tw5.com/tiddlers/community/resources/Briefcase mGSD.tid
	licenses/cla-individual.md
2014-12-30 18:22:07 +00:00
Arlen22
b83d311951 Sign the CLA 2014-12-30 09:28:27 -05:00
Jermolene
21df296c2f Docs: Clarify widgets generated by wikitext transclusion 2014-12-30 09:09:40 +00:00
Astrid Elocson
e6ede67282 Further improvements suggested by felixhayashi 2014-12-28 16:16:24 +00:00
Jermolene
cb8caf6a01 Fix accidental commit of Czech translation as Polish
I inadvertently committed the new Czech translation as Polish.
2014-12-28 15:51:19 +00:00
Astrid Elocson
597a5fb2f2 Update and make easier to understand 2014-12-28 10:07:30 +00:00
Astrid Elocson
79a3beeaa6 Add concept of Tag Tiddlers 2014-12-28 09:55:36 +00:00
Astrid Elocson
4f1d6f71fc Add concept of JSON Tiddlers 2014-12-28 09:54:44 +00:00
Astrid Elocson
9aafed511b Add concept of Dictionary Tiddlers 2014-12-28 09:53:58 +00:00
Astrid Elocson
117d10275f Improvements to wording 2014-12-28 09:51:53 +00:00
Astrid Elocson
e9c6610d74 Improvements to wording 2014-12-28 09:51:13 +00:00
Astrid Elocson
7290be9e47 Improvements to wording 2014-12-28 09:50:19 +00:00
Andrew J Harrison
bbcca4c784 Update cla-individual.md
Please correct my previous pull request. I guess my twitter name was already taken.
2014-12-27 12:49:32 -07:00
Jermolene
bae00fcbf6 Add Polish translation 2014-12-27 12:37:06 +00:00
Jermolene
5d947ed582 Add Spanish translation 2014-12-27 12:24:17 +00:00
Jermolene
fa9fc38be8 Fix "Hide Furniture" theme
To account for integrating “sticky titles” theme with “Vanilla”
2014-12-27 12:00:52 +00:00
Astrid Elocson
42050e1b03 Remove duplicate field line 2014-12-26 19:33:37 +00:00
Astrid Elocson
c5650708a7 Create Technical Prose Style.tid 2014-12-26 19:32:01 +00:00
Astrid Elocson
bcee212195 Create Typography.tid 2014-12-26 19:31:18 +00:00
Astrid Elocson
439154c0ea Create Spelling.tid 2014-12-26 19:30:11 +00:00
Astrid Elocson
e415edb440 Create Tiddler Structure.tid 2014-12-26 19:29:41 +00:00
Astrid Elocson
1366ef3e1c Create Tiddler Titles.tid 2014-12-26 19:29:03 +00:00
Astrid Elocson
dfd4c480d2 Create Reference Tiddlers.tid 2014-12-26 19:28:24 +00:00
Astrid Elocson
f952b8f1df Create Instruction Tiddlers.tid 2014-12-26 19:27:38 +00:00
Astrid Elocson
421d75a207 Initial expansion of the Documentation Style Guide 2014-12-26 19:24:47 +00:00
Bram Chen
4f34f24111 Update chinese translations for tiddler toolbar button wording 2014-12-25 11:27:02 +08:00
Jeremy Ruston
7abe9aa53d Merge pull request #1249 from felixhayashi/patch-1
make checkVersions consider build version
2014-12-24 12:43:30 +00:00
Jermolene
9f087e7667 Ensure creation fields set for data tiddlers 2014-12-24 10:29:00 +00:00
Jermolene
7481b6c49c Adjust tiddler toolbar button wording
As discussed in #1247
2014-12-24 10:28:47 +00:00
Astrid Elocson
1905093411 Change TiddlerChain to TitleList 2014-12-23 21:57:18 +00:00
Astrid Elocson
5f3de6ec17 Change TiddlerChain to TitleList 2014-12-23 21:56:00 +00:00
Astrid Elocson
cc2688bf44 Update and rename TiddlerChain.tid to TitleList.tid 2014-12-23 21:55:04 +00:00
Astrid Elocson
25e447f69e Rephrase route through tabs
Provisionally, rather than using any sort of arrow symbol. We need to standardise a notation for referring to hierarchical UI, but that will come with the documentation style guide.
2014-12-23 21:46:20 +00:00
Felix Küppers
70cbb5efc5 Update boot.js
if major, minor and patch are equal, the incoming wins.
2014-12-23 19:21:54 +01:00
Astrid Elocson
7ca37739aa Simplify style of arrow in tab hierarchy
This is something that
2014-12-23 17:32:45 +00:00
Felix Küppers
d33b525067 Update boot.js 2014-12-23 18:13:59 +01:00