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

bugfix/sphinx-5.3.0-requirement #446

Merged
merged 8 commits into from
Aug 22, 2023

Commits on Aug 4, 2023

  1. resolve CHANGELOG conflict

    bgunnar5 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    7888493 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Configuration menu
    Copy the full SHA
    77d09c3 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. Version/1.10.3 (LLNL#445)

    * fix default worker bug with all steps
    
    * version bump and requirements fix
    
    * Bugfix/filename-special-vars (LLNL#425)
    
    * fix file naming bug
    
    * fix filename bug with variable as study name
    
    * add tests for the file name special vars changes
    
    * modify changelog
    
    * implement Luc's suggestions
    
    * remove replace line
    
    * Create dependabot-changelog-updater.yml
    
    * testing outputs of modifying changelog
    
    * delete dependabot-changelog-updater
    
    * feature/pdf-docs (LLNL#427)
    
    * first attempt at adding pdf
    
    * fixing build error
    
    * modify changelog to show docs changes
    
    * fix errors Luc found in the build logs
    
    * trying out removal of latex
    
    * reverting latex changes back
    
    * uncommenting the latex_elements settings
    
    * adding epub to see if latex will build
    
    * adding a latex engine variable to conf
    
    * fix naming error with latex_engine
    
    * attempting to add a logo to the pdf build
    
    * testing an override to the searchtools file
    
    * revert back to not using searchtools override
    
    * update changelog
    
    * bugfix/openfoam_singularity_issues (LLNL#426)
    
    * fix openfoam_singularity issues
    
    * update requirements and descriptions for openfoam examples
    
    * bugfix/output-path-substitution (LLNL#430)
    
    * fix bug with output_path and variable substitution
    
    * add tests for cli substitutions
    
    * bugfix/scheduler-permission-error (LLNL#436)
    
    * Release/1.10.2 (LLNL#437)
    
    * bump version to 1.10.2
    
    * bump version in CHANGELOG
    
    * resolve develop to main merge issues (LLNL#439)
    
    * fix default worker bug with all steps
    
    * version bump and requirements fix
    
    * dependabot/certifi-requests-pygments (LLNL#441)
    
    * Bump certifi from 2022.12.7 to 2023.7.22 in /docs
    
    Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.12.7 to 2023.7.22.
    - [Commits](certifi/python-certifi@2022.12.07...2023.07.22)
    
    ---
    updated-dependencies:
    - dependency-name: certifi
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    
    * add all dependabot changes and update CHANGELOG
    
    ---------
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    
    * bugfix/server-pip-redis-conf (LLNL#443)
    
    * add *.conf to the MANIFEST file so pip will grab the redis.conf file
    
    * add note explaining how to fix a hanging merlin server start
    
    * modify CHANGELOG
    
    * add second export option to docs and fix typo
    
    * bump to version 1.10.3 (LLNL#444)
    
    ---------
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    bgunnar5 and dependabot[bot] authored Aug 18, 2023
    Configuration menu
    Copy the full SHA
    faf71ed View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. Configuration menu
    Copy the full SHA
    7155c6d View commit details
    Browse the repository at this point in the history
  2. trying to merge origin main

    bgunnar5 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    1b0fa95 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4ae83d9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    96b7df8 View commit details
    Browse the repository at this point in the history
  5. update CHANGELOG

    bgunnar5 committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    3730a06 View commit details
    Browse the repository at this point in the history