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
907 commits 12 branches 99 tags 13 MiB
Commit graph

907 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Jonathan Wren
44bc75fb65 Merge branch 'master' into develop 2019-11-29 11:46:01 -08:00
Jonathan Wren
abb81acedb
Merge pull request #706 from pspeter/password-confirmation 
🛠 Add password confirmation when encrypting journals
 2019-11-29 06:42:38 -08:00
Jonathan Wren
b0b9c48aae
Merge pull request #759 from MinchinWeb/more-travis 
🛠 Add CI testing for Windows, Mac, and Python 3.8
 2019-11-29 06:30:05 -08:00
MinchinWeb
ae505dcbbd [Travis] Windows tests time out 2019-11-28 09:14:50 -07:00
MinchinWeb
34f7d9830f [Travis] Windows: try Python 3.7 for cryptography wheels? 2019-11-28 08:50:06 -07:00
MinchinWeb
9cad7ddb51 [Travis] Add Python to PATH on Windows 2019-11-28 08:39:22 -07:00
MinchinWeb
cdad3230f0 [Travis] include a test in not UTC 
see #742
 2019-11-28 08:35:53 -07:00
MinchinWeb
3c2ced0989 [Travis] no auto-ruby 2019-11-28 07:59:06 -07:00
MinchinWeb
b0f07eeb59 Appease the Travis gods 2019-11-28 07:49:33 -07:00
MinchinWeb
cab23ddc97 [Travis] add testing on Windows and Mac 
See #739 (Python 3.8), #619 (Windows)
 2019-11-28 07:43:05 -07:00
Jrnl Bot
4ecaf197f5 Incrementing version to v2.1.1-beta 2019-11-26 05:00:15 +00:00
micahellison
b5d33e3423
Merge pull request #756 from jrnl-org/develop 
Merge develop into master for beta release
 2019-11-25 20:56:48 -08:00
Jonathan Wren
0c1b577208
Merge pull request #751 from micahellison/readline-738 
[GH-738] preventing readline usage on Windows
 2019-11-25 20:42:33 -08:00
Jonathan Wren
c8bfa261c1
Merge pull request #755 from micahellison/on-today-bug-741 
[GH-741] adding test for bug that displays all entries -on today
 2019-11-25 20:41:05 -08:00
Micah Ellison
f633a93aab Merge develop to on-today-bug-741 2019-11-25 20:37:10 -08:00
Jonathan Wren
a529b70614 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: 1bbf074 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 1bbf074
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
 2019-11-25 20:29:34 -08:00
Jonathan Wren
223277ad69
Merge pull request #752 from micahellison/693-dev-docs 
[GH-693] Updating developer documentation (work in progress)
 2019-11-25 20:25:08 -08:00
Micah Ellison
13bdd94dfb [GH-693] cleaning up "Developing" section and adding a note about behave 2019-11-25 20:22:44 -08:00
Micah Ellison
29545c3a81 [GH-741] adding test for bug that displays all entries -on today 2019-11-25 19:39:58 -08:00
Peter Schmidbauer
e925fe22f9 Add password confirmation dialog 2019-11-19 14:24:36 +01:00
Jonathan Wren
0bd94c7872
Merge pull request #744 from alichtman/exit-after-no-text-entry 
Exit jrnl if no text entered into editor
 2019-11-18 22:06:04 -08:00
Micah Ellison
d947b19bcd [GH-693] work so far on updating developer documentation 2019-11-18 21:39:28 -08:00
Jonathan Wren
03e87237fc
Merge pull request #742 from MinchinWeb/dayone-tests 
[Dayone] re-add tests
 2019-11-18 21:20:00 -08:00