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.

Sign up for GitHub

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

Jump to bottom

Fix failure to import into directory journal #1314

Merged
merged 6 commits into from
Aug 21, 2021
Merged

Fix failure to import into directory journal #1314

merged 6 commits into from
Aug 21, 2021

Commits on Jul 31, 2021

  1. Re-enable failing directory journal import tests

    @micahellison
    micahellison committed Jul 31, 2021
    Configuration menu
    Copy the full SHA
    7cdba42 View commit details
    Browse the repository at this point in the history

  2. Appropriately track journal name and modified entries in FolderJourna… 

    …l when importing
    @micahellison
    micahellison committed Jul 31, 2021
    Configuration menu
    Copy the full SHA
    076674f View commit details
    Browse the repository at this point in the history

  3. Run make format

    @micahellison
    micahellison committed Jul 31, 2021
    Configuration menu
    Copy the full SHA
    58b3e34 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2021

  1. Merge branch 'develop' into directory-journal-import

    @micahellison
    micahellison committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    678dfa3 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2021

  1. Merge branch 'develop' into directory-journal-import

    @micahellison
    micahellison committed Aug 21, 2021
    Configuration menu
    Copy the full SHA
    4b611c8 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into directory-journal-config-encrypt 

    # Conflicts:
#	tests/bdd/features/encrypt.feature
    @micahellison
    micahellison committed Aug 21, 2021
    Configuration menu
    Copy the full SHA
    248c6dd View commit details
    Browse the repository at this point in the history