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

MERGING release/23.10 into main #53

Merged
merged 17 commits into from
Jan 16, 2024
Merged

MERGING release/23.10 into main #53

merged 17 commits into from
Jan 16, 2024

Commits on Jul 10, 2023

  1. CM-188 Adjusted backend for social protection

    @malinowskikam
    malinowskikam committed Jul 10, 2023
    Configuration menu
    Copy the full SHA
    4877cf9 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge pull request #42 from openimis/feature/CM-188 

    CM-188 Adjusted backend for social protection
    @delcroip
    delcroip authored Jul 12, 2023
    Configuration menu
    Copy the full SHA
    ac7dcd6 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. CM-256: Add sonar-project.properties

    @dborowiecki
    dborowiecki committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    0dad2df View commit details
    Browse the repository at this point in the history

  2. Merge pull request #43 from openimis/sonar_attach 

    CM-256: Add sonar-project.properties
    @jdolkowski
    jdolkowski authored Jul 27, 2023
    Configuration menu
    Copy the full SHA
    089cdb0 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. OP-1518: load config

    Jan committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    c274bf0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #44 from openimis/feature/OP-1518 

    OP-1518: load config
    @delcroip
    delcroip authored Sep 12, 2023
    Configuration menu
    Copy the full SHA
    459a41f View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. OP-1557 Add dependency for contribution plan 

    The contribution plan migrations refer to the calculationrules model that is then deleted.
We need to ensure that these operations are executed in the right order, i.e. deleting the model only after the contribution plan doesn't need it anymore.

This shouldn't affect the development branch that has squashed commits and other operations. It also won't break the upgrade as the migrations themselves are the same, only the dependency tree.
    @edarchis
    edarchis committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    09db7b6 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. CI update

    @dborowiecki
    dborowiecki committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    198e665 View commit details
    Browse the repository at this point in the history

  2. CI Update 2

    @dborowiecki
    dborowiecki committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    884ff6d View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Merge pull request #46 from openimis/ci_update 

    CI Update for openimis-be-calculation_py
    @jdolkowski
    jdolkowski authored Sep 20, 2023
    Configuration menu
    Copy the full SHA
    e29365f View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. CM-188 Adjusted backend for social protection

    @malinowskikam @edarchis
    malinowskikam authored and edarchis committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    6a68265 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. MERGING RELEASE branches (#48) 

    * CI update

* CI Update 2

---------

Co-authored-by: Damian Borowiecki <[email protected]>
Co-authored-by: Jan <[email protected]>
    @dragos-dobre @dborowiecki @jdolkowski
    3 people authored Oct 18, 2023
    Configuration menu
    Copy the full SHA
    5919a97 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Merge pull request #49 from openimis/develop 

    MERGING RELEASE branches
    @hirensoni913
    hirensoni913 authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    8537e03 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #50 from openimis/release/23.10 

    MERGING RELEASE branches
    @hirensoni913
    hirensoni913 authored Nov 13, 2023
    Configuration menu
    Copy the full SHA
    20cd476 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Merge pull request #51 from openimis/main 

    MERGING RELEASE branches
    @delcroip
    delcroip authored Dec 6, 2023
    Configuration menu
    Copy the full SHA
    22b905e View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Merge pull request #45 from openimis/hotfix/OP-1557_dependency_calcru… 

    …les_contrib_plan

OP-1557 Add dependency for contribution plan
    @delcroip
    delcroip authored Dec 11, 2023
    Configuration menu
    Copy the full SHA
    4379b8a View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. Merge pull request #52 from openimis/develop 

    MERGING develop into release/23.10
    @delcroip
    delcroip authored Dec 15, 2023
    Configuration menu
    Copy the full SHA
    1553464 View commit details
    Browse the repository at this point in the history