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

933 commits

This branch
This branch
All branches
Author SHA1 Message Date
micahellison
0f53329592
Merge pull request #774 from eshrh/fix-usage-notes 
Fix usage notes
 2020-01-04 12:44:47 -08:00
Jonathan Wren
a5d2e1625c
Merge pull request #782 from markphelps/patch-1 
Remove merge marker in recipes.md
 2020-01-04 12:42:13 -08:00
Jonathan Wren
82c69d0053
Merge pull request #784 from wren/build-fix-black 
Update Black version and lock file to fix builds on develop branch
 2020-01-04 12:38:21 -08:00
Jonathan Wren
676cac7e80
Change stage so travis doesn't get confused about allowed failures 2020-01-04 12:30:50 -08:00
Jonathan Wren
06970f3911
run black to get codebase into good base state 2020-01-04 12:12:00 -08:00
Jonathan Wren
e2ce40424e
clarify build steps 2020-01-04 12:08:38 -08:00
Jonathan Wren
8384b799a1
update lock file 2020-01-04 12:01:51 -08:00
Jonathan Wren
31138c0463
update black version 2020-01-04 12:01:21 -08:00
Mark Phelps
6d8b5a59b3
Remove merge marker in recipes.md 
Remove <<<<<<< HEAD marker in recipes.md
 2020-01-04 11:58:49 -05:00
Jonathan Wren
2e920a7e8f
Merge pull request #769 from MinchinWeb/black 
Black Formatter
 2019-12-21 12:57:32 -08:00
Jonathan Wren
e984a9a015
Merge branch 'develop' into black 2019-12-21 12:11:05 -08:00
micahellison
717078bcfc
Merge pull request #778 from wren/black-format-770 
[#770] run black formatter on codebase for standardization
 2019-12-21 12:00:36 -08:00
Jonathan Wren
07a633ae51
(#770) run black formatter on codebase for standardization 2019-12-21 11:47:02 -08:00
Eshan
411a790f29
Fix usage notes 
Notes were correctly indented.
 2019-12-15 00:04:42 -05:00
MinchinWeb
c8172efdcc [Travis] black -- show a diff on things that need to be reformatted 2019-12-14 14:00:28 -07:00
MinchinWeb
e7cbbecaef [Black] sync to develop branch and apply black 
# Conflicts:
#	jrnl/EncryptedJournal.py
#	jrnl/Journal.py
#	jrnl/__init__.py
#	jrnl/cli.py
#	jrnl/install.py
 2019-12-14 13:48:17 -07:00
MinchinWeb
9d183229df [Travis] update as per code review 
Remove "Lint" as separate stage; have `black` check the output rather than run the re-formmater
 2019-12-12 10:41:08 -07:00
Jonathan Wren
a9e4e09547
Merge pull request #708 from pspeter/simplify-password-logic 
Refactor password logic to prevent accidental password leakage
 2019-12-10 21:04:59 -08:00
Jonathan Wren
f5e47f6484
Merge pull request #719 from maebert/maebert-fast-import 
Reduce startup time by 55%
 2019-12-10 20:58:56 -08:00
Jonathan Wren
6a8f3edec1
Merge branch 'develop' into maebert-fast-import 2019-12-10 20:47:39 -08:00
Jonathan Wren
cb9d546141
Merge pull request #740 from empireshades/master 
Full text search (case insensitive) with "-contains"
 2019-12-10 20:25:36 -08:00
MinchinWeb
c1defc7db1 [Travis] add a linting stage (via black) 2019-12-07 12:45:28 -07:00
MinchinWeb
d8f422151d Apply black formatter to code 2019-12-07 12:32:55 -07:00
Jonathan Wren
a1d3577e3f
Merge pull request #767 from thejspr/patch-1 
Fix merge conflict left-over
 2019-12-03 08:11:29 -08:00
Jesper Kjeldgaard
8407ec5fb0
Fix merge conflict left-over 2019-12-03 11:59:05 +01:00
Jims
9b6b788af4 Renamed searching to contains. Made changes as per pull-request: https://github.com/jrnl-org/jrnl/pull/740 2019-12-01 23:03:38 -05:00
Manuel Ebert
45384f3c8f Use __version__.py instead of VERSION.txt 2019-12-01 19:41:16 -08:00
micahellison
34b07d3686
Merge pull request #765 from wren/python-38-739 
Update lock file and testing suite for Python 3.8
 2019-11-30 13:55:17 -08:00
Jonathan Wren
3717c26559 [#739] Update tests so that 3.8 is not an allowed failure 2019-11-30 13:36:50 -08:00
Jonathan Wren
7200b1fa77 [#739][#747] update lock file 2019-11-30 13:35:59 -08:00
Jonathan Wren
af228fd163 Merge branch 'master' into develop 2019-11-30 13:15:07 -08:00
micahellison
864df05cc1
Merge pull request #761 from wren/travis-double-deploy-757 
Fix CI config to only deploy once
 2019-11-30 12:41:42 -08:00
Jrnl Bot
562454427e Incrementing version to v2.1.1 2019-11-30 20:32:11 +00:00
Jonathan Wren
7e373bb385
Merge pull request #763 from maebert/mobile-header 
🐞 Fix header display in docs on mobile devices
 2019-11-30 10:46:52 -08:00
Jonathan Wren
a5b5f4732a [#757] update mac python version test to match others 2019-11-29 22:04:02 -08:00
Jonathan Wren
e424e32a37 [#757] Add fast finish option to travis 2019-11-29 22:03:40 -08:00
Jonathan Wren
eb6c5200de [#757] update caching for ci 2019-11-29 22:02:57 -08:00
Jonathan Wren
174632f8e3 [#757] Be explicit about python versio so travis doesn't get confused 2019-11-29 16:23:52 -08:00
Jonathan Wren
f16e7860e0 [#757] Group tests by python version 2019-11-29 16:21:03 -08:00
Jonathan Wren
cbd0014a52 [#757] Add more Mac tests for each Python version 2019-11-29 15:38:32 -08:00
Jonathan Wren
7b27e6d0c0 [#757] Add more testing for Windows across multiple Python versions 2019-11-29 15:07:44 -08:00
Jonathan Wren
a01fb67c87 [#757] Clean up travis yaml file for readability 2019-11-29 15:06:13 -08:00
Jonathan Wren
c6eab97f64 [#757] Take out unneeded quotes around strings in yaml 2019-11-29 15:05:15 -08:00
Manuel Ebert
b1307674d8 Display header in mobile docs 2019-11-29 12:51:25 -08:00
Jonathan Wren
427f1321b7 [#757] update CI logic to new format 2019-11-29 12:11:17 -08:00
Jonathan Wren
7f83a1ef26 [#757] add explicit os at root per travis config linter 2019-11-29 11:46:29 -08:00
Jonathan Wren
f64f742839 [#757] add stage name to test stage to be explicit 2019-11-29 11:46:29 -08:00
Jonathan Wren
7fe1281c38 [#757] Add quotes around environment variables to be a little safer 2019-11-29 11:46:29 -08:00
Jonathan Wren
44531bb47f [#757] Take out old code (no longer needed) 2019-11-29 11:46:29 -08:00
Jonathan Wren
19fb2207dd [#757] Move deploy to it's own stage on CI so it doesn't run multiple 
times
 2019-11-29 11:46:29 -08:00