fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-21 13:38:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1022 commits 12 branches 99 tags 13 MiB
Commit graph

1022 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jrnl Bot
6e9f95623a Updating changelog [ci skip] 2020-02-22 19:50:50 +00:00
micahellison
5e3f3e165f
Merge pull request #846 from aureooms/develop 
docs: Fix fish history instructions.
 2020-02-22 11:32:26 -08:00
Jrnl Bot
6ea974f82a Updating changelog [ci skip] 2020-02-22 19:22:51 +00:00
micahellison
7fc13417d1
Merge pull request #854 from lrvl/patch-1 
Docs: Fix broken links in recipes page
 2020-02-22 11:12:18 -08:00
Leroy van Logchem
fb97bd19f5
Update recipes.md 
Fixed links to various documentation files
 2020-02-17 23:24:24 +01:00
Aurélien Ooms
d605f4d011 docs: Fix fish history instructions. 
Use `--add` flag in fish `abbr` command.
 2020-02-09 15:23:53 +01:00
Jrnl Bot
95aa3bc1ae Updating changelog [ci skip] 2020-02-09 03:31:51 +00:00
Jonathan Wren
22994efde2 Merge pull request #837 from micahellison/windows-unicode-tests 
* Fix crashing unicode Travis tests on Windows and fail build if Windows tests fail
* Restore emoji test now that it works in Windows Travis builds
 2020-02-08 18:34:32 -08:00
Jonathan Wren
74a11cebdd
Put back build lines in poetry config (#838) 
Taking out these lines earlier fixed the homebrew release, but broke
other things. So, I'm putting them back for now until we can find a
better solution.
 2020-02-08 18:33:54 -08:00
Jonathan Wren
7f1f878a08
Don't re-run tests on deployment (#839) 
By the time we get to the deployment step, we've already run these tests
dozens of times. We don't need to run them yet again at deploy time.
 2020-02-08 18:33:28 -08:00
Jonathan Wren
b2eab4bad3
Get rid of dumb sex joke (#840) 
These kinds of jokes make us look bad, and have gotten this project bad
PR on social media. It's best to get rid of them. We can still be super
glib and funny without crass jokes.
 2020-02-08 18:32:58 -08:00
Jonathan Wren
2be0436ef1
Update site description (#841) 
Don't know why this was what it was. Maybe an old joke I don't get?
Either way, new description makes more sense.
 2020-02-08 18:32:30 -08:00
Jonathan Wren
b76cd3dc49 Update old links (#844) 
Since we moved the core repo to jrnl-org, the old links no longer work.
 2020-02-08 18:31:47 -08:00
Jonathan Wren
b26b25cb8f
Merge pull request #845 from wren/stop-changelog-pile-up 
Stop multipe changelog generators from crashing into each other
 2020-02-08 18:30:41 -08:00
Jonathan Wren
28c0d84845
get rid of debug code 2020-02-08 18:20:06 -08:00
Jonathan Wren
686b111e82
Stop multipe changelog generators from crashing into each other 2020-02-08 18:18:41 -08:00
Jrnl Bot
d495f6feaa Updating changelog [ci skip] 2020-02-08 22:03:03 +00:00
Micah Ellison
aaa2efddec Restore emoji test now that it works in Windows Travis builds 2020-02-08 13:54:39 -08:00
micahellison
40b330e5ee Fix crashing unicode Travis tests on Windows and fail build if Windows tests fail (#836) 2020-02-08 13:51:14 -08:00
Micah Ellison
89e0bbc3fb Fix crashing unicode Travis tests on Windows and fail build if Windows tests fail 2020-02-08 13:26:44 -08:00
Jrnl Bot
4ab9fa573c Updating changelog [ci skip] 2020-02-08 21:26:08 +00:00
MinchinWeb
e5d7845f18 Listing all entries in DayOne Classic journal throws IndexError (#786) 
* Reproduce bug in #780
🎵 I have no body, no body to love me... 🎵
The bug is cause by a DayOne entry that has to entry body.

* Deal with empty bodies
Close #780.

* [Travis-CI] add "tree" command to debug missing files
* Fix file location
I have no idea why, but it ran locally fine without issue. Travis is more particular...
 2020-02-08 13:14:33 -08:00
Jrnl Bot
7ac3e3160d Updating changelog [ci skip] 2020-02-08 21:06:40 +00:00
Aurélien Ooms
0cb6f5ec92
Fix typo in encryption docs (#812) 
* Explain how fish can be configured to exclude jrnl commands from history by default
* Fix typo in encryption docs
 2020-02-08 12:53:01 -08:00
MinchinWeb
550347eab1
Add UTC support for failing DayOne tests (#785) 
* [Dayone] don't break if the system timezone is UTC
* [DayOne] re-enable tests that were failing on Travis
* [DayOne] change as per code review to avoid `except: pass`
 2020-02-08 12:34:52 -08:00
Stav Shamir
630a8fcaec
Add test scenarios for the export feature (#824) 
* Fix behave keyword "and" to correct case "And"
* Extract export_steps module
* Add scenario for XML export
* Add scenario for tags export
* Add scenario for fancy export
* Add scenario for yaml export
* Remove unused module export.py
* Run `make format`
* Fix `create_directory` step
 2020-02-08 12:18:01 -08:00
Jonathan Wren
539eafd0bb
Small fixes to changelog 2020-02-08 12:15:31 -08:00
Jrnl Bot
2e7da23528 Updating changelog [ci skip] 2020-02-08 20:12:49 +00:00
Jonathan Wren
dc4ce6a3bb
Merge pull request #833 from jrnl-org/master 
Merge master back into Develop
 2020-02-08 12:01:45 -08:00
Jonathan Wren
fa971b0f2f
Merge branch 'develop' into master 2020-02-08 11:33:09 -08:00
Jrnl Bot
b747de42f6 Incrementing version to v2.2.1-beta2 [ci skip] 2020-02-06 06:28:47 +00:00
Jrnl Bot
f40e0de4b9 Updating changelog [ci skip] 2020-02-06 06:27:18 +00:00
Jrnl Bot
6bf0ccfb2b Updating changelog [ci skip] 2020-02-05 20:34:10 +00:00
micahellison
961581c5b1
Merge pull request #829 from heymajor/patch-1 
Update/clarify template explanation
 2020-02-05 12:07:24 -08:00
micahellison
989870cb0f
Merge pull request #830 from wren/homebrew-fix-781 
Remove poetry from build system in pyproject config to fix `brew install`
 2020-02-05 12:06:46 -08:00
heymajor
436370b538
Smoothing out formatting issues 2020-02-01 17:52:33 -05:00
Jonathan Wren
57e39b592f
Take out build system from pyproject config #781 
We don't use it, and it breaks the homebrew install.
 2020-02-01 14:51:19 -08:00
Jrnl Bot
c4f7d481bd Incrementing version to v2.2 [ci skip] 2020-02-01 21:24:21 +00:00
Jrnl Bot
0efd78cf3c Updating changelog [ci skip] 2020-02-01 21:22:57 +00:00
heymajor
ba3f688e8f
Updating/expanding template explanation 2020-02-01 16:12:30 -05:00
Jrnl Bot
9383c6cda3
Incrementing version to v2.2-beta2 2020-02-01 12:34:29 -08:00
Jrnl Bot
5033bb3e30 Updating changelog [ci skip] 2020-01-26 01:35:23 +00:00
Jonathan Wren
0c9b2831e4
Merge pull request #823 from micahellison/travis-windows-tests 
Fix all skipped tests on Travis Windows builds by preserving newlines
 2020-01-25 17:25:08 -08:00
Jrnl Bot
ace4f576b2 Updating changelog [ci skip] 2020-01-26 01:13:04 +00:00
MinchinWeb
e54da41000 [DayOne] YAML export improvements (#773) 
* [YAML Export] code style improvements

* [Dayone] Brings back extended Dayone attributes to YAML export
c.f. 7d3afd811b
reverse fd46ffea23

* [YAML Exporter] switch to f-strings

* [Black] apply black formatter to YAML Exporter

* Code fixes as per review
 2020-01-25 17:01:55 -08:00
Micah Ellison
9cc8539ff9 Keep skip_win directive for empty entry test that still stalls on Travis 2020-01-25 15:57:58 -08:00
Micah Ellison
25a7577f0b Remove all skip_win directives now that Travis is not mangling newlines on Windows 2020-01-25 15:40:05 -08:00
Micah Ellison
9f615191b4 Prevent Travis from turning LF to CRLF in Windows 2020-01-25 15:39:05 -08:00
Jrnl Bot
932a5b6cc3 Updating changelog [ci skip] 2020-01-25 22:12:27 +00:00
Jonathan Wren
b71f8fc430
Merge pull request #820 from wren/version-fix 
Fix issue where jrnl would always out 'source' for version, fix Poetry config to build and publish properly
 2020-01-25 13:44:13 -08:00