Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow combinations of --change-time, --delete, and --edit while correctly counting the number of entries affected #1669

Merged
merged 37 commits into from
Mar 25, 2023

Commits on Jan 15, 2023

  1. WIP

    wren committed Jan 15, 2023
    Configuration menu
    Copy the full SHA
    6eb7d85 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2023

  1. Remove ipdb and remove search mode conditional that added explicit ta…

    …g search behavior
    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    dc6900e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6e24769 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bade98e View commit details
    Browse the repository at this point in the history
  4. Clean up controller

    - streamline `run` function in `controller.py`
    - add debug logging
    - fix unnecessary import of Journal class (only needed for typing)
    - standardize summary display across different actions
    wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    c182395 View commit details
    Browse the repository at this point in the history
  5. Add currently-failing test conditions for count messages when changin…

    …g time and deleting
    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    752e55d View commit details
    Browse the repository at this point in the history
  6. Don't show summary if no entries found and prevent extra line break w…

    …hen no entries found by short-circuiting display method
    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    d341f32 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0c43920 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2e06e3d View commit details
    Browse the repository at this point in the history
  9. Remove unneeded exception when editor is empty and fix test that was …

    …testing incorrect message
    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    1873f69 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    80a4b07 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    742a16b View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    cac3b43 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    46b7a64 View commit details
    Browse the repository at this point in the history
  14. Fix unit test that did not account for new short-circuit when display…

    …ing journal with no entries
    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    8ee1632 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    2be80a5 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    905a9ec View commit details
    Browse the repository at this point in the history
  17. Update changelog [ci skip]

    jrnl-bot authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    99c29f2 View commit details
    Browse the repository at this point in the history
  18. Add documentation about information leaks in Vim/Neovim (jrnl-org#1674)

    * Add documentation about using Vim/Neovim as editor
    * Add documentation about information leaks in editors
    * Spelling fix
    
    ---------
    
    Co-authored-by: Jonathan Wren <jonathan@nowandwren.com>
    Granddave and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    3ec0839 View commit details
    Browse the repository at this point in the history
  19. Don't save templated journal entries if the received raw text is the …

    …same as the template itself (jrnl-org#1653)
    Briscoooe authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    a708c15 View commit details
    Browse the repository at this point in the history
  20. Update changelog [ci skip]

    jrnl-bot authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    c8d79d0 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    14fd024 View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    4ad9f58 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    94d78f3 View commit details
    Browse the repository at this point in the history
  24. Add tests for counting combinations of action arguments (change-time,…

    … edit, delete) and for change-time counts. Some are failing and should be investigated
    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    0e70a57 View commit details
    Browse the repository at this point in the history
  25. Remove extraneous comment in test

    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    9f44ab2 View commit details
    Browse the repository at this point in the history
  26. Track added/deleted counts in a register in the Journal class instead…

    … of attempting to infer it via controller counting
    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    7eec231 View commit details
    Browse the repository at this point in the history
  27. run poe format

    micahellison authored and wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    eac0571 View commit details
    Browse the repository at this point in the history
  28. Merge branch 'develop' into mode-actions-1639

    Conflicts:
      CHANGELOG.md
      docs/privacy-and-security.md
      jrnl/controller.py
      tests/bdd/features/change_time.feature
    wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    9bca32b View commit details
    Browse the repository at this point in the history
  29. run format

    wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    e6a36a9 View commit details
    Browse the repository at this point in the history
  30. add encrypted to tests

    wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    85a759e View commit details
    Browse the repository at this point in the history
  31. rename test file

    wren committed Mar 4, 2023
    Configuration menu
    Copy the full SHA
    33263f1 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    e813ff7 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2023

  1. Merge branch 'develop' into mode-actions-1639

    Conflicts:
      jrnl/controller.py
    wren committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    15a5b14 View commit details
    Browse the repository at this point in the history
  2. fix merge conflict typo

    wren committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    22409ff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    64c0824 View commit details
    Browse the repository at this point in the history
  4. run format

    wren committed Mar 25, 2023
    Configuration menu
    Copy the full SHA
    24b962b View commit details
    Browse the repository at this point in the history