fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-11 00:58:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1092 commits 10 branches 99 tags 14 MiB
Commit graph

1092 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonathan Wren
6d53ed1d94 add config file for changelog generator 2020-04-10 11:51:56 -07:00
Jonathan Wren
3762c008a6 Update changelog in prep for auto changelog generator (#724) 
Getting ready to implement the auto-changelog generator is easier if we
are caught up with the old changes. This was generated by running the
generator locally.

Co-authored-by: Micah Jerome Ellison <git@micahjero.me>
 2020-04-10 11:51:56 -07:00
Jonathan Wren
fde2cc83b0 skip more windows tests 2020-04-10 11:51:56 -07:00
Jonathan Wren
7f919fd071 run black 2020-04-10 11:51:56 -07:00
Jonathan Wren
6a675791a2 skip another windows test 2020-04-10 11:51:56 -07:00
Jonathan Wren
72e87c15c9 whitespace changes 2020-04-10 11:51:56 -07:00
Jonathan Wren
6428a461b8 skip another windows test 2020-04-10 11:51:56 -07:00
Jonathan Wren
5f31e1ab39 remove broken test (windows can't handle emoji) 2020-04-10 11:51:56 -07:00
Jonathan Wren
4086573f9d [#766] Skip another broken windows test 2020-04-10 11:51:56 -07:00
Jonathan Wren
da55914ec3 [#766] Skip the broken test on windows for now 2020-04-10 11:51:56 -07:00
Eshan
af6243c73d Fix usage notes 
Notes were correctly indented.
 2020-04-10 11:51:56 -07:00
Jonathan Wren
968ae6ca98 Change stage so travis doesn't get confused about allowed failures 2020-04-10 11:51:56 -07:00
Jonathan Wren
5c0a2a236a clarify build steps 2020-04-10 11:51:56 -07:00
Jonathan Wren
29af09f3c7 update lock file 2020-04-10 11:51:56 -07:00
Jonathan Wren
ca2a0e53c2 update black version 2020-04-10 11:51:56 -07:00
MinchinWeb
04f6154c93 Apply black formatter to code 
[Travis] add a linting stage (via `black`)
[Travis] update as per code review
Remove "Lint" as separate stage; have `black` check the output rather
than run the re-formmater
 2020-04-10 11:51:56 -07:00
Jonathan Wren
46c4c88231 (#770) run black formatter on codebase for standardization 2020-04-10 11:51:56 -07:00
Peter Schmidbauer
9664924096 Move all password handling to EncryptedJournal 
This commit should greatly simplify all password handling logic. No passwords are stored in the config dict anymore. Only the Encrypted Journals have any password related logic. I also had to remove some password fields from the test files, which shows how dangerous the previous approach was. A slight code change could've leaked passwords to the config file. However, I had to change the install progress a little bit to make this work. It will now not ask you for a password right away but rather if you want to encrypt or not. Only if you reply 'y' will it ask you for the password later on.
 2020-04-10 11:51:56 -07:00
Manuel Ebert
c8d59727eb Explicitly write Version to file 
Delay import of asteval
Use __version__.py instead of VERSION.txt
 2020-04-10 11:51:56 -07:00
Jims
b8d43db558 Added case-insensitive searching of entry title and body 
added search test
Renamed searching to contains. Made changes as per pull-request:
https://github.com/jrnl-org/jrnl/pull/740
 2020-04-10 11:51:56 -07:00
Jesper Kjeldgaard
657eb8fcda Fix merge conflict left-over 2020-04-10 11:51:56 -07:00
Jonathan Wren
abc6b53898 [#739] Update tests so that 3.8 is not an allowed failure 2020-04-10 11:51:56 -07:00
Jonathan Wren
f68de27b2b [#739][#747] update lock file 2020-04-10 11:51:56 -07:00
Jrnl Bot
35432f8c70 Incrementing version to v2.1.1 2020-04-10 11:51:56 -07:00
Jonathan Wren
eb16fe1130 [#757] update mac python version test to match others 2020-04-10 11:51:56 -07:00
Jonathan Wren
f86fb18d5d [#757] Add fast finish option to travis 2020-04-10 11:51:56 -07:00
Jonathan Wren
d8967ae9d3 [#757] update caching for ci 2020-04-10 11:51:56 -07:00
Jonathan Wren
3c6b8058ff [#757] Be explicit about python versio so travis doesn't get confused 2020-04-10 11:51:56 -07:00
Jonathan Wren
b349f5c477 [#757] Group tests by python version 2020-04-10 11:51:56 -07:00
Jonathan Wren
52934a78e4 [#757] Add more Mac tests for each Python version 2020-04-10 11:51:56 -07:00
Jonathan Wren
aa49dc3eb5 [#757] Add more testing for Windows across multiple Python versions 2020-04-10 11:51:56 -07:00
Jonathan Wren
1b9748e5ce [#757] Clean up travis yaml file for readability 2020-04-10 11:51:55 -07:00
Jonathan Wren
8004ef59af [#757] Take out unneeded quotes around strings in yaml 2020-04-10 11:51:55 -07:00
Jonathan Wren
63f2901bf4 [#757] update CI logic to new format 2020-04-10 11:51:55 -07:00
Jonathan Wren
a704863121 [#757] add explicit os at root per travis config linter 2020-04-10 11:51:55 -07:00
Jonathan Wren
b6bd14fb27 [#757] add stage name to test stage to be explicit 2020-04-10 11:51:55 -07:00
Jonathan Wren
eb4b3ead51 [#757] Add quotes around environment variables to be a little safer 2020-04-10 11:51:55 -07:00
Jonathan Wren
a1392d9c49 [#757] Take out old code (no longer needed) 2020-04-10 11:51:55 -07:00
Jonathan Wren
424e67e23a [#757] Move deploy to it's own stage on CI so it doesn't run multiple 
times
 2020-04-10 11:51:55 -07:00
Manuel Ebert
58ddee3b49 Display header in mobile docs 2020-04-10 11:51:55 -07:00
Jrnl Bot
fc4fd803d6 Incrementing version to v2.1.1-beta 2020-04-10 11:51:55 -07:00
Peter Schmidbauer
8eb185f8a2 Add password confirmation dialog 2020-04-10 11:51:55 -07:00
MinchinWeb
70c946bc13 [Travis] add testing on Windows and Mac 
See #739 (Python 3.8), #619 (Windows)
Appease the Travis gods
[Travis] no auto-ruby
[Travis] include a test in not UTC
see #742
[Travis] Add Python to PATH on Windows
[Travis] Windows: try Python 3.7 for cryptography wheels?
[Travis] Windows tests time out
 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
24cd1d460b [GH-738] preventing readline usage on Windows - removes autocomplete on the install step for Windows users 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
ece057faa5 [GH-741] adding test for bug that displays all entries -on today 2020-04-10 11:51:55 -07:00
Jonathan Wren
10d8a32b64 Squashed commit of the following: 
commit 75113187432939a51486422c3f70b3a9e2bcf0aa
Merge: 74d1854 47e10fb
Author: Jonathan Wren <9453067+wren@users.noreply.github.com>
Date:   Thu Oct 24 17:02:10 2019 -0700

    Merge pull request #665 from notbalanced/issue_662

    Fixes Issue #662 - Day names not treated consistently for new entry

commit 74d1854a4bba468221b4eee254bdee2bb40f5d5a
Merge: 97e4d6a 6a5726a
Author: Jonathan Wren <9453067+wren@users.noreply.github.com>
Date:   Sat Oct 5 15:30:57 2019 -0700

    Merge pull request #418 from philipsd6/2.0-fancy_exporter

    Add exporter to output entries inside unicode box character boxes

commit 47e10fbee7
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 19:06:53 2019 -0400

    Fix issue #662 to properly handle day names as new entry dates and
    command line (-on, -from, -to).

commit 9588913100
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 08:27:27 2019 -0400

    Syncing with jrnl-org/master

commit 4c68eb193d
Merge: 81dfebb 97e4d6a
Author: Craig Moyer <craig.moyer@gmail.com>
Date:   Sun Sep 29 07:52:02 2019 -0400

    Merge remote-tracking branch 'upstream/master' into 2.0-rc1-maebert

commit 81dfebb2c0
Author: Manuel Ebert <manuel@1450.me>
Date:   Mon Apr 29 20:34:18 2019 +0200

    export changes

commit 6a5726acd2
Author: Philip Douglass <philip@philipdouglass.com>
Date:   Fri Dec 22 20:56:36 2017 -0500

    Enable FancyExporter plugin

commit 3d1b226871
Author: Philip Douglass <philip@philipdouglass.com>
Date:   Fri Jan 29 11:17:41 2016 -0500

    Add exporter to output entries inside unicode box character boxes
 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
b95193d05a [GH-693] cleaning up "Developing" section and adding a note about behave 2020-04-10 11:51:55 -07:00
Micah Jerome Ellison
f8fc5f4786 [GH-693] work so far on updating developer documentation 2020-04-10 11:51:55 -07:00
Aaron Lichtman
1fd1fcc00d Exit jrnl if no text entered into editor 
Add test for aborting jrnl entry from editor
Use native mocking
Add comment explaining discrepancy between expected and asserted output
Fix check_empty_output method
Check message on stderr and patch subprocess.call
Add _mock_editor_function
Update features/steps/core.py
Add return from mock function
Add debug statements
Debug
Update features/steps/core.py
Move sys.exit() down
Fix test?
Fix test?
Fix test?
Clean up debug statements
Clean up debug statements
Remove extraneous code
Remove extra space
Add test for empty stdin input
Remove extra debug line
Fix test?
Fix test?
Update features/core.feature
Fix test?
Fix no stdin input test

Co-Authored-By: pspeter <peter.schmidb@gmail.com>
 2020-04-10 11:51:55 -07:00
MinchinWeb
f9692b1f8d [Dayone] re-add tests 
c.f. commit 7cbca9f60f
c.f. commit 398283a8db3177b1ae122e5b9d6a9d623cf9106f
[Dayone] Skip failing tests on Travis
Travis sets the timezone to UTC, which causes many tests to fail
 2020-04-10 11:51:55 -07:00