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

Attempt to merge develop into branch #278

Merged
merged 26 commits into from
Aug 14, 2023
Merged

Attempt to merge develop into branch #278

merged 26 commits into from
Aug 14, 2023

Commits on Feb 14, 2023

  1. Attempt to merge develop into branch 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    a470461 View commit details
    Browse the repository at this point in the history

  2. Removed redundant check 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    455b03d View commit details
    Browse the repository at this point in the history

  3. Added getter 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    ac69ce0 View commit details
    Browse the repository at this point in the history

  4. Fix develop merge 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    34a1e1e View commit details
    Browse the repository at this point in the history

  5. Minor fix 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    35bec3c View commit details
    Browse the repository at this point in the history

  6. Fix

    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    2a11a67 View commit details
    Browse the repository at this point in the history

  7. Removed space in readme 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    2c11cf9 View commit details
    Browse the repository at this point in the history

  8. FIx 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    e5f84ce View commit details
    Browse the repository at this point in the history

  9. Added check for Working Storage in controller

    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    e668596 View commit details
    Browse the repository at this point in the history

  10. Simplified if-statements 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    a622801 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. Overhaul indents + Comments fixed 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    40d2e77 View commit details
    Browse the repository at this point in the history

  2. Fixed missing comma 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    1d6841a View commit details
    Browse the repository at this point in the history

  3. Minor fixes 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    b449a7e View commit details
    Browse the repository at this point in the history

  4. Mistakes fixed 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    6a87d63 View commit details
    Browse the repository at this point in the history

  5. Overlooked one mistake 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    6041cc8 View commit details
    Browse the repository at this point in the history

  6. Removed irrelevant UT. 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    3520e6d View commit details
    Browse the repository at this point in the history

  7. Remade approval-test-expected file. 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    66bcebe View commit details
    Browse the repository at this point in the history

  8. Removed VerifyAction from every single push 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    9de8d3b View commit details
    Browse the repository at this point in the history

  9. Updated action versions 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    07c2466 View commit details
    Browse the repository at this point in the history

  10. GitHub Actions Java Version Bump 

    Signed-off-by: Benjamin Mønster <[email protected]>
    Benjamin Mønster committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    2f04d4e View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. change to inline expansion. 

    Remove commenting out of linkage, replaced with new issue
Fix SQLCA.cpy to not use binary-long binary-short

Signed-off-by: Rune Christensen <[email protected]>
    @Rune-Christensen
    Rune-Christensen authored and Rune Christensen committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    9709307 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Developer' into FIx-unresolved-comments-from-pullreques… 

    …ts-by-sam94dion

# Conflicts:
#	scripts/windows_gnucobol_run_tests.cmd
#	src/main/java/org/openmainframeproject/cobolcheck/features/interpreter/InterpreterController.java
#	src/main/java/org/openmainframeproject/cobolcheck/services/cobolLogic/Interpreter.java
#	src/test/java/org/openmainframeproject/cobolcheck/InterpreterControllerTest.java
#	src/test/java/org/openmainframeproject/cobolcheck/MockIT.java
    Rune Christensen committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    6acdb26 View commit details
    Browse the repository at this point in the history

  3. Bug fixes 

    Signed-off-by: Rune Christensen <[email protected]>
    @Rune-Christensen
    Rune-Christensen authored and Rune Christensen committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    ebff04c View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Update Formatter.java small formatting fix 

    Signed-off-by: dakaa16 <[email protected]>
    @dakaa16
    dakaa16 authored Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7f28e74 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Merge branch 'Developer' into FIx-unresolved-comments-from-pullreques… 

    …ts-by-sam94dion

# Conflicts:
#	src/main/java/org/openmainframeproject/cobolcheck/features/interpreter/InterpreterController.java
#	src/test/java/org/openmainframeproject/cobolcheck/MockIT.java
    Rune Christensen committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    6e401cf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'FIx-unresolved-comments-from-pullrequests-by-sam94dion'… 

    … of https://github.com/openmainframeproject/cobol-check into FIx-unresolved-comments-from-pullrequests-by-sam94dion
    Rune Christensen committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    7dc8bd8 View commit details
    Browse the repository at this point in the history