mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2024-06-24 22:33:16 +00:00
Merge branch 'master' of https://github.com/Jermolene/TiddlyWiki5
This commit is contained in:
Jermolene
commit
7f5a2f96ef
|
|
@ -139,6 +139,8 @@ Settings/ToolbarButtons/Icons/Description: Include icon
|
|||
Settings/ToolbarButtons/Text/Description: Include text
|
||||
Settings/DefaultSidebarTab/Caption: Default Sidebar Tab
|
||||
Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default
|
||||
Settings/DefaultMoreSidebarTab/Caption: Default More Sidebar Tab
|
||||
Settings/DefaultMoreSidebarTab/Hint: Specify which More sidebar tab is displayed by default
|
||||
Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour
|
||||
Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river
|
||||
Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river
|
||||
|
|
|
|||
13
core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
Normal file
13
core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
caption: {{$:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption}}
|
||||
tags: $:/tags/ControlPanel/Settings
|
||||
title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab
|
||||
|
||||
\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
|
||||
|
||||
<$link to="$:/config/DefaultMoreSidebarTab"><<lingo Hint>></$link>
|
||||
|
||||
<$select tiddler="$:/config/DefaultMoreSidebarTab">
|
||||
<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
|
||||
<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
|
||||
</$list>
|
||||
</$select>
|
||||
|
|
@ -3,5 +3,5 @@ tags: $:/tags/SideBar
|
|||
caption: {{$:/language/SideBar/More/Caption}}
|
||||
|
||||
<div class="tc-more-sidebar">
|
||||
<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" "$:/core/ui/MoreSideBar/Tags" "$:/state/tab/moresidebar" "tc-vertical">>
|
||||
</div>
|
||||
<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class="tc-vertical" />
|
||||
</div>
|
||||
3
core/wiki/config/DefaultMoreSidebarTab.tid
Normal file
3
core/wiki/config/DefaultMoreSidebarTab.tid
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
title: $:/config/DefaultMoreSidebarTab
|
||||
|
||||
$:/core/ui/MoreSideBar/Tags
|
||||
|
|
@ -139,6 +139,8 @@ Settings/ToolbarButtons/Icons/Description: Icon anzeigen
|
|||
Settings/ToolbarButtons/Text/Description: Text anzeigen
|
||||
Settings/DefaultSidebarTab/Caption: Standard Sidebar Tab
|
||||
Settings/DefaultSidebarTab/Hint: Definition, welcher Sidebar Tab standardmäßig aktiv ist.
|
||||
Settings/DefaultMoreSidebarTab/Caption: Standard More Sidebar Tab
|
||||
Settings/DefaultMoreSidebarTab/Hint: Definition, welcher More Sidebar Tab standardmäßig aktiv ist.
|
||||
Settings/LinkToBehaviour/Caption: Tiddler Öffnen
|
||||
Settings/LinkToBehaviour/InsideRiver/Hint: Navigation bei Klicks //innerhalb// der Story
|
||||
Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation bei Klicks //außerhalb// der Story
|
||||
|
|
@ -158,7 +160,7 @@ StoryView/Prompt: Ausgewählte Anzeige:
|
|||
Theme/Caption: Theme
|
||||
Theme/Prompt: Ausgewähltes Theme:
|
||||
TiddlerFields/Caption: Tiddler Felder
|
||||
TiddlerFields/Hint: Hier finden Sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exklusive Schatten-Tiddler.
|
||||
TiddlerFields/Hint: Hier finden Sie alle [[Felder|TiddlerFields]], die in diesem Wiki verwendet werden. Inklusive der Felder aus System-, exklusive Schatten-Tiddler.
|
||||
Toolbars/Caption: Toolbar
|
||||
Toolbars/EditToolbar/Caption: Edit Toolbar
|
||||
Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt werden. Verwenden Sie "Drag and Drop", um die Reihenfolge zu ändern
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@ Thank you for your interest in contributing to TiddlyWiki5. TiddlyWiki is owned
|
|||
|
||||
This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by electronic submission, following the instructions in `contributing.md`, which is in the root directory of the project repository. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.
|
||||
|
||||
1. Definitions
|
||||
--------------
|
||||
## 1. Definitions
|
||||
|
||||
"You" means any Legal Entity on behalf of whom a Contribution has been received by Us.
|
||||
|
||||
|
|
@ -31,8 +30,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib
|
|||
"Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity.
|
||||
|
||||
|
||||
2. Grant of Rights
|
||||
-------------------
|
||||
## 2. Grant of Rights
|
||||
|
||||
### 2.1 Copyright License
|
||||
|
||||
|
|
@ -67,8 +65,7 @@ Any rights not expressly assigned or licensed under this section are expressly r
|
|||
We may use 3rd party libraries to create TiddlyWiki5 plugins. These libraries may have their own licenses. 3rd party software and licenses are not subject in this CLA, while TiddlyWiki5 plugins that use these libraries are. 3rd party libraries may be included everywhere, especially in the following directories and their subdirectories: `plugins/` and `editions/`.
|
||||
|
||||
|
||||
3. Agreement
|
||||
------------
|
||||
## 3. Agreement
|
||||
|
||||
You confirm that:
|
||||
|
||||
|
|
@ -80,18 +77,15 @@ You confirm that:
|
|||
|
||||
(d) You have followed the instructions in `contributing.md`, if You do not own the Copyright in the entire work of authorship Submitted. The file can be found in the root directory of the project repository.
|
||||
|
||||
4. Disclaimer
|
||||
--------------
|
||||
## 4. Disclaimer
|
||||
|
||||
EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW.
|
||||
|
||||
5. Consequential Damage Waiver
|
||||
-------------------------------
|
||||
## 5. Consequential Damage Waiver
|
||||
|
||||
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR US BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
|
||||
|
||||
6. Miscellaneous
|
||||
----------------
|
||||
## 6. Miscellaneous
|
||||
|
||||
6.1 This Agreement will be governed by and construed in accordance with the laws of the State of California and the United States excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
|
||||
|
||||
|
|
@ -110,8 +104,8 @@ The below-signed are contributors to a code repository that is part of the proje
|
|||
|
||||
eg: Jeremy Ruston, @Jermolene for Federatial Limited, 2011/11/22
|
||||
|
||||
Contributors
|
||||
------------
|
||||
## Contributors
|
||||
|
||||
Jeremy Ruston, @Jermolene for Federatial Limited, 2011/11/22
|
||||
|
||||
Google Inc, 2015/12/21
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@ Thank you for your interest in contributing to TiddlyWiki5. TiddlyWiki is owned
|
|||
|
||||
This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by electronic submission, following the instructions in `contributing.md`, which is in the root directory of the project repository. This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.
|
||||
|
||||
1. Definitions
|
||||
---------------
|
||||
## 1. Definitions
|
||||
|
||||
"You" means the individual who Submits a Contribution to Us.
|
||||
|
||||
|
|
@ -26,8 +25,7 @@ This contributor agreement ("Agreement") documents the rights granted by contrib
|
|||
|
||||
"Media" means any portion of a Contribution which is not software.
|
||||
|
||||
2. Grant of Rights
|
||||
------------------
|
||||
## 2. Grant of Rights
|
||||
|
||||
### 2.1 Copyright License
|
||||
|
||||
|
|
@ -61,8 +59,7 @@ Any rights not expressly licensed under this section are expressly reserved by Y
|
|||
|
||||
We may use 3rd party libraries to create TiddlyWiki5 plugins. These libraries may have their own licenses. 3rd party software and licenses are not subject in this CLA, while TiddlyWiki5 plugins that use these libraries are. 3rd party libraries may be included everywhere, especially in the following directories and their subdirectories: `plugins/` and `editions/`.
|
||||
|
||||
3. Agreement
|
||||
------------
|
||||
## 3. Agreement
|
||||
|
||||
You confirm that:
|
||||
|
||||
|
|
@ -74,18 +71,15 @@ You confirm that:
|
|||
|
||||
(d) You have followed the instructions in `contributing.md`, if You do not own the Copyright in the entire work of authorship Submitted. The file can be found in the root directory of the project repository.
|
||||
|
||||
4. Disclaimer
|
||||
-------------
|
||||
## 4. Disclaimer
|
||||
|
||||
EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW.
|
||||
|
||||
5. Consequential Damage Waiver
|
||||
------------------------------
|
||||
## 5. Consequential Damage Waiver
|
||||
|
||||
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.
|
||||
|
||||
6. Miscellaneous
|
||||
----------------
|
||||
## 6. Miscellaneous
|
||||
|
||||
6.1 This Agreement will be governed by and construed in accordance with the laws of the State of California and the United States excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.
|
||||
|
||||
|
|
@ -104,8 +98,7 @@ The below-signed are contributors to a code repository that is part of the proje
|
|||
|
||||
eg: Jeremy Ruston, @Jermolene, 2011/11/22
|
||||
|
||||
Contributors
|
||||
------------
|
||||
## Contributors
|
||||
|
||||
Mario Pietsch, @pmario, 2013/09/21
|
||||
|
||||
|
|
@ -325,4 +318,4 @@ Simon Huber, @BurningTreeC, 2017/12/22
|
|||
|
||||
Brian McKee, @furicle, 2018/01/08
|
||||
|
||||
Diego Mesa, @diego898, 2018/01/11
|
||||
Diego Mesa, @diego898, 2018/01/11
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user