Commit graph

  • 4d768ae433
    fix up tests and related issues Jonathan Wren 2020-02-29 14:44:42 -08:00
  • 47e0305aa0
    Pretty print journal entries (#692) Aaron Lichtman 2019-11-19 04:56:57 +01:00
  • 28a4bd8f18
    Merge pull request #843 from jrnl-org/v2.5 Jonathan Wren 2020-02-29 15:13:28 -08:00
  • da30eaa62f Apply Black linting #843 Micah Ellison 2020-02-29 14:03:54 -08:00
  • 8a4fe0ec81 Fix FolderJournal path tests for Windows paths Micah Ellison 2020-02-29 13:29:19 -08:00
  • 71f918d878 Remove DayOne test made obsolete by FolderJournal Micah Ellison 2020-02-29 12:45:47 -08:00
  • 53c557005c Update FolderJournal reference to entry __unicode__ method to __str__ Micah Ellison 2020-02-29 12:35:05 -08:00
  • 12eed5c86a
    Merge pull request #857 from maebert/manu--better-parsing micahellison 2020-02-27 18:51:07 -08:00
  • 10d2178d5a Clean up shortcut for Limit #857 Manuel Ebert 2020-02-21 18:36:16 -08:00
  • 6e9f95623a Updating changelog [ci skip] Jrnl Bot 2020-02-22 19:50:50 +00:00
  • 5e3f3e165f
    Merge pull request #846 from aureooms/develop micahellison 2020-02-22 11:32:26 -08:00
  • a66c51b593
    Merge pull request #852 from aallbrig/master micahellison 2020-02-22 11:31:07 -08:00
  • 6ea974f82a Updating changelog [ci skip] Jrnl Bot 2020-02-22 19:22:51 +00:00
  • 7fc13417d1
    Merge pull request #854 from lrvl/patch-1 micahellison 2020-02-22 11:12:18 -08:00
  • fb97bd19f5
    Update recipes.md #854 Leroy van Logchem 2020-02-17 23:24:24 +01:00
  • f5c96725d0 Formatting for Advanced Usage documentation #852 aallbright 2020-02-16 10:30:35 -05:00
  • 44b61dd585 cleanup imports dbxnr 2020-02-13 17:56:34 +00:00
  • 9bbc38b7ce fixup alichtman's implementation dbxnr 2020-02-12 05:15:47 +00:00
  • 972a00f478 Merge branch 'develop' into interactive_delete dbxnr 2020-02-12 04:06:19 +00:00
  • 2777e6770c fix broken jrnl format import #794 dbxnr 2020-02-12 03:09:59 +00:00
  • ff1c180759 fix bug with reading root config dbxnr 2020-02-12 00:58:12 +00:00
  • 8268404bb2 add tags dbxnr 2020-02-11 23:49:24 +00:00
  • 16a4e60582 add tests dbxnr 2020-02-11 22:46:35 +00:00
  • 774355971a imported journal gets added to config dbxnr 2020-02-11 21:29:55 +00:00
  • 0c73448516 add some tests, black formatting dbxnr 2020-02-11 20:13:32 +00:00
  • 608f920d8f fix failing encyption tests dbxnr 2020-02-11 19:15:30 +00:00
  • d86bbaf861 Merge branch 'develop' of https://github.com/jrnl-org/jrnl into dayone2 dbxnr 2020-02-11 17:41:03 +00:00
  • f4fdc7cba5 add missing test config dbxnr 2020-02-11 16:50:11 +00:00
  • 2181d84545 add test, refactor solution dbxnr 2020-02-11 16:32:38 +00:00
  • d605f4d011 docs: Fix fish history instructions. #846 Aurélien Ooms 2020-02-09 15:23:53 +01:00
  • 95aa3bc1ae Updating changelog [ci skip] Jrnl Bot 2020-02-09 03:31:51 +00:00
  • 22994efde2 Merge pull request #837 from micahellison/windows-unicode-tests Jonathan Wren 2020-02-08 18:34:32 -08:00
  • 74a11cebdd
    Put back build lines in poetry config (#838) Jonathan Wren 2020-02-08 18:33:54 -08:00
  • 7f1f878a08
    Don't re-run tests on deployment (#839) Jonathan Wren 2020-02-08 18:33:28 -08:00
  • b2eab4bad3
    Get rid of dumb sex joke (#840) Jonathan Wren 2020-02-08 18:32:58 -08:00
  • 2be0436ef1
    Update site description (#841) Jonathan Wren 2020-02-08 18:32:30 -08:00
  • b76cd3dc49 Update old links (#844) Jonathan Wren 2020-02-08 18:31:47 -08:00
  • b26b25cb8f
    Merge pull request #845 from wren/stop-changelog-pile-up Jonathan Wren 2020-02-08 18:30:41 -08:00
  • 28c0d84845
    get rid of debug code #845 Jonathan Wren 2020-02-08 18:20:06 -08:00
  • 686b111e82
    Stop multipe changelog generators from crashing into each other Jonathan Wren 2020-02-08 17:33:47 -08:00
  • 2674009d4c
    Update old links #844 Jonathan Wren 2020-02-08 14:40:06 -08:00
  • 97cf65e516
    Merge branch 'develop' into v2.5 Jonathan Wren 2020-02-08 14:29:10 -08:00
  • d148afc232
    Update site description #841 Jonathan Wren 2020-02-08 14:14:37 -08:00
  • 0a61d9a53a
    Get rid of dumb sex joke #840 Jonathan Wren 2020-02-08 14:08:35 -08:00
  • aee2e2a123
    Don't re-run tests on deployment #839 Jonathan Wren 2020-02-08 14:06:01 -08:00
  • d495f6feaa Updating changelog [ci skip] Jrnl Bot 2020-02-08 22:03:03 +00:00
  • de08586764
    Put back build lines in poetry config #838 Jonathan Wren 2020-02-08 13:57:30 -08:00
  • aaa2efddec Restore emoji test now that it works in Windows Travis builds #837 Micah Ellison 2020-02-08 13:54:39 -08:00
  • 40b330e5ee Fix crashing unicode Travis tests on Windows and fail build if Windows tests fail (#836) micahellison 2020-02-08 13:51:14 -08:00
  • 89e0bbc3fb Fix crashing unicode Travis tests on Windows and fail build if Windows tests fail #836 Micah Ellison 2020-02-08 13:26:44 -08:00
  • 4ab9fa573c Updating changelog [ci skip] Jrnl Bot 2020-02-08 21:26:08 +00:00
  • e5d7845f18 Listing all entries in DayOne Classic journal throws IndexError (#786) MinchinWeb 2020-02-08 14:14:33 -07:00
  • 7ac3e3160d Updating changelog [ci skip] Jrnl Bot 2020-02-08 21:06:40 +00:00
  • 0cb6f5ec92
    Fix typo in encryption docs (#812) Aurélien Ooms 2020-02-08 16:53:01 -04:00
  • 550347eab1
    Add UTC support for failing DayOne tests (#785) MinchinWeb 2020-02-08 13:34:52 -07:00
  • 630a8fcaec
    Add test scenarios for the export feature (#824) Stav Shamir 2020-02-08 22:18:01 +02:00
  • 539eafd0bb
    Small fixes to changelog Jonathan Wren 2020-02-08 12:13:53 -08:00
  • 2e7da23528 Updating changelog [ci skip] Jrnl Bot 2020-02-08 20:12:49 +00:00
  • dc4ce6a3bb
    Merge pull request #833 from jrnl-org/master Jonathan Wren 2020-02-08 12:01:45 -08:00
  • fa971b0f2f
    Merge branch 'develop' into master #833 Jonathan Wren 2020-02-08 11:33:09 -08:00
  • b747de42f6 Incrementing version to v2.2.1-beta2 [ci skip] Jrnl Bot 2020-02-06 06:28:47 +00:00
  • f40e0de4b9 Updating changelog [ci skip] Jrnl Bot 2020-02-06 06:27:18 +00:00
  • 6bf0ccfb2b Updating changelog [ci skip] Jrnl Bot 2020-02-05 20:34:10 +00:00
  • 961581c5b1
    Merge pull request #829 from heymajor/patch-1 micahellison 2020-02-05 12:07:24 -08:00
  • 989870cb0f
    Merge pull request #830 from wren/homebrew-fix-781 micahellison 2020-02-05 12:06:46 -08:00
  • 436370b538
    Smoothing out formatting issues #829 heymajor 2020-02-01 17:52:33 -05:00
  • 57e39b592f
    Take out build system from pyproject config #781 #830 Jonathan Wren 2020-02-01 14:51:19 -08:00
  • c4f7d481bd Incrementing version to v2.2 [ci skip] Jrnl Bot 2020-02-01 21:24:21 +00:00
  • 0efd78cf3c Updating changelog [ci skip] Jrnl Bot 2020-02-01 21:22:57 +00:00
  • ba3f688e8f
    Updating/expanding template explanation heymajor 2020-02-01 16:12:30 -05:00
  • 9383c6cda3
    Incrementing version to v2.2-beta2 Jrnl Bot 2020-01-25 22:13:51 +00:00
  • 2cda0afd89 [Travis] manually upgrade virtualenv #826 MinchinWeb 2020-01-29 08:13:40 -07:00
  • 39c2cbdb58 Fix create_directory step #824 Stav Shamir 2020-01-28 09:00:00 +02:00
  • 979367abbf Run make format Stav Shamir 2020-01-28 08:25:24 +02:00
  • 5425b35cb5 [DayOne] change as per code review #785 MinchinWeb 2020-01-27 19:14:20 -07:00
  • 9dd69acfb9 Remove unused module export.py Stav Shamir 2020-01-27 14:26:54 +02:00
  • f6bec97c58 Add scenario for yaml export Stav Shamir 2020-01-27 14:12:02 +02:00
  • 5559cb534f Merge branch 'develop' of https://github.com/jrnl-org/jrnl into feature/restructuring-export-plugins Stav Shamir 2020-01-26 21:39:53 +02:00
  • 9c0ddd6ec0 Add scenario for fancy export Stav Shamir 2020-01-26 14:13:46 +02:00
  • 2bd4bc30b3 Add scenario for tags export Stav Shamir 2020-01-26 14:08:31 +02:00
  • 3c1496eed2 Add scenario for XML export Stav Shamir 2020-01-26 14:03:24 +02:00
  • e24beeffd0 Extract export_steps module Stav Shamir 2020-01-26 12:57:01 +02:00
  • 2920f7f668 Fix behave keyword "and" to correct case "And" Stav Shamir 2020-01-26 10:27:20 +02:00
  • 5033bb3e30 Updating changelog [ci skip] Jrnl Bot 2020-01-26 01:35:23 +00:00
  • 0c9b2831e4
    Merge pull request #823 from micahellison/travis-windows-tests Jonathan Wren 2020-01-25 17:25:08 -08:00
  • ace4f576b2 Updating changelog [ci skip] Jrnl Bot 2020-01-26 01:13:04 +00:00
  • e54da41000 [DayOne] YAML export improvements (#773) MinchinWeb 2020-01-25 18:01:55 -07:00
  • 9cc8539ff9 Keep skip_win directive for empty entry test that still stalls on Travis #823 Micah Ellison 2020-01-25 15:57:58 -08:00
  • 25a7577f0b Remove all skip_win directives now that Travis is not mangling newlines on Windows Micah Ellison 2020-01-25 15:40:05 -08:00
  • 9f615191b4 Prevent Travis from turning LF to CRLF in Windows Micah Ellison 2020-01-25 15:39:05 -08:00
  • 26184ba551 Setting git autocrlf to false to prevent Windows tests from failing #822 Micah Ellison 2020-01-25 15:10:28 -08:00
  • 932a5b6cc3 Updating changelog [ci skip] Jrnl Bot 2020-01-25 22:12:27 +00:00
  • b71f8fc430
    Merge pull request #820 from wren/version-fix Jonathan Wren 2020-01-25 13:44:13 -08:00
  • caedf1ae7f
    Merge pull request #819 from jrnl-org/develop Jonathan Wren 2020-01-25 13:17:15 -08:00
  • 0e5581c4ce
    Merge pull request #808 from wren/unpin-poetry micahellison 2020-01-25 12:26:04 -08:00
  • 879733a59f
    update poetry version #820 Jonathan Wren 2020-01-25 12:14:09 -08:00
  • f10cb4d4f8
    add maintainer field to config Jonathan Wren 2020-01-25 12:13:54 -08:00
  • c88457f9ff
    fix poetry warning Jonathan Wren 2020-01-25 11:52:47 -08:00
  • a753f53f54
    add version file to repo Jonathan Wren 2020-01-25 11:47:52 -08:00
  • 18acde7281 Merge branch 'dayone2' of github.com:dbxnr/jrnl into dayone2 dbxnr 2020-01-21 17:31:16 +00:00