fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-06 16:26:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #869 from jrnl-org/develop

Browse source 
Merge develop into master for v2.3 beta
This commit is contained in:
Jonathan Wren 2020-03-07 14:50:54 -08:00 • committed by GitHub
commit b3793fbb7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 1258 additions and 319 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/advanced.md
View file

@ -35,8 +35,9 @@ and can be edited with a plain text editor.
- `highlight`
if `true`, tags will be highlighted in cyan.
- `linewrap`
controls the width of the output. Set to `false` if you don't
want to wrap long lines.
controls the width of the output. Set to `false` if you don't want to wrap long lines.
- `colors`
dictionary that controls the colors used to display journal entries. It has two subkeys, which are: `date` and `title`. Current valid values are: `BLACK`, `RED`, `GREEN`, `YELLOW`, `BLUE`, `MAGENTA`, `CYAN`, and `WHITE`. `colorama.Fore` is used for colorization, and you can find the [docs here](https://github.com/tartley/colorama#colored-output). To disable colored output, set the value to `NONE`. If you set the value of any color subkey to an invalid color, no color will be used.
!!! note
Although it seems intuitive to use the `#`

2
docs/encryption.md
View file

@ -60,7 +60,7 @@ If you are using `fish` instead of `bash` or `zsh`, you can get the same behavio
adding this to your `fish` configuration:
``` sh
abbr jrnl=" jrnl"
abbr --add jrnl " jrnl"
```
To delete existing `jrnl` commands from `fish`’s history, run

6
docs/recipes.md
View file

@ -71,7 +71,7 @@ jrnlimport () {
### Using templates
!!! note
Templates require an [external editor](../advanced) be configured.
Templates require an [external editor](./advanced.md) be configured.
A template is a code snippet that makes it easier to enter use repeated text
each time a new journal entry is started. There are two ways you can utilize
@ -113,7 +113,7 @@ logged as a new entry in the journal you specified in the original argument.
!!! tip
To read your journal entry or to verify the entry saved, you can use this
command: `jrnl -n 1` (Check out [Import and Export](../export/#export-to-files) for more export options).
command: `jrnl -n 1` (Check out [Import and Export](./export.md) for more export options).
```sh
jrnl -n 1
@ -155,7 +155,7 @@ jrnl -on "$(jrnl --short | shuf -n 1 | cut -d' ' -f1,2)"
## External editors
Configure your preferred external editor by updating the `editor` option
in your `jrnl.yaml` file. (See [advanced usage](../advanced) for details).
in your `jrnl.yaml` file. (See [advanced usage](./advanced.md) for details).
!!! note
To save and log any entry edits, save and close the file.

6
docs/theme/index.html vendored
View file

@ -34,7 +34,7 @@
"operatingSystem": ["macOS", "Windows", "Linux"],
"thumbnailUrl": "https://jrnl.sh/img/banner_og.png",
"installUrl": "https://jrnl.sh/installation",
"softwareVersion": "2.0.0rc2"
"softwareVersion": "2.2"
}
</script>
</head>
@ -42,7 +42,7 @@
<body>
<header>
<aside>
<a id="twitter" href="https://twitter.com/intent/tweet?text=Write+your+memoirs+on+the+command+line.+Like+a+boss.+%23jrnl&url=http%3A%2F%2Fjrnl.sh&via=maebert"><i class="icon twitter"></i>Tell your friends</a>
<a id="twitter" href="https://twitter.com/intent/tweet?text=Write+your+memoirs+on+the+command+line.+Like+a+boss.+%23jrnl&url=http%3A%2F%2Fjrnl.sh"><i class="icon twitter"></i>Tell your friends</a>
</aside>
<div id="title">
<img id="logo" src="img/jrnl_white.svg" width="90px" height="98px" title="jrnl" />
@ -58,7 +58,7 @@
<nav>
<a href="overview">Documentation</a>
<a href="http://github.com/jrnl-org/jrnl" title="View on Github">Fork me on GitHub</a>
<a id="twitter-nav" href="https://twitter.com/intent/tweet?text=Write+your+memoirs+on+the+command+line.+Like+a+boss.+%23jrnl&url=http%3A%2F%2Fjrnl.sh&via=maebert">Tell your friends on twitter</a>
<a id="twitter-nav" href="https://twitter.com/intent/tweet?text=Write+your+memoirs+on+the+command+line.+Like+a+boss.+%23jrnl&url=http%3A%2F%2Fjrnl.sh">Tell your friends on twitter</a>
<a href="installation" class="cta">Download</a>
</nav>
<div class="flex">

6
docs/usage.md
View file

@ -119,10 +119,10 @@ Will print all entries in which either `@pinkie` or `@WorldDomination`
occurred.
```sh
jrnl -n 5 -and @pineapple @lubricant
jrnl -n 5 -and @pinkie @WorldDomination
```
the last five entries containing both `@pineapple` **and** `@lubricant`.
the last five entries containing both `@pinkie` **and** `@worldDomination`.
You can change which symbols you'd like to use for tagging in the
configuration.
@ -154,7 +154,7 @@ encrypt) your edited journal after you save and exit the editor.
You can also use this feature for deleting entries from your journal
```sh
jrnl @girlfriend -until 'june 2012' --edit
jrnl @texas -until 'june 2012' --edit
```
Just select all text, press delete, and everything is gone...