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

Develop #11

Merged
merged 42 commits into from
Dec 16, 2022
Merged

Develop #11

merged 42 commits into from
Dec 16, 2022

Commits on Dec 8, 2022

  1. Delete README.md

    @mbelinsky
    mbelinsky committed Dec 8, 2022
    Configuration menu
    Copy the full SHA
    ba5a16c View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. Handle invalid program id

    @palindaa
    palindaa committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    8cbb4b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2022

  1. Company API and user permission updates

    @palindaa
    palindaa committed Dec 10, 2022
    Configuration menu
    Copy the full SHA
    ae81d6d View commit details
    Browse the repository at this point in the history

  2. Fix user delete issue

    @palindaa
    palindaa committed Dec 10, 2022
    Configuration menu
    Copy the full SHA
    e033d92 View commit details
    Browse the repository at this point in the history

  3. Fix user delete issue

    @palindaa
    palindaa committed Dec 10, 2022
    Configuration menu
    Copy the full SHA
    aeb6211 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2022

  1. Add company suspend

    @palindaa
    palindaa committed Dec 11, 2022
    Configuration menu
    Copy the full SHA
    30bb465 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

  1. Add programme validations

    @palindaa
    palindaa committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    ec1493d View commit details
    Browse the repository at this point in the history

  2. Remove vanatu code base from the main branch 

    Signed-off-by: palindaa <palinda@xeptagon.com>
    @palindaa
    palindaa committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    8f97cbd View commit details
    Browse the repository at this point in the history

  3. Merge pull request #10 from undp/develop_merge_fix 

    Develop merge fix
    @palindaa
    palindaa authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    a536918 View commit details
    Browse the repository at this point in the history

  4. analytics api basic setup

    @YathurshanT
    YathurshanT committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    15ec8a2 View commit details
    Browse the repository at this point in the history

  5. web dashboard changes

    @YathurshanT
    YathurshanT committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    b947ecd View commit details
    Browse the repository at this point in the history

  6. API changes

    @palindaa
    palindaa committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    54f5c0d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #50 from xeptagondev/develop_merge_fix 

    API changes
    @palindaa
    palindaa authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    e93f569 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #49 from xeptagondev/dashboard_changes 

    Dashboard changes
    @palindaa
    palindaa authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    94401e8 View commit details
    Browse the repository at this point in the history

  9. Make source of funding optional

    @palindaa
    palindaa committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    1c2ac8d View commit details
    Browse the repository at this point in the history

  10. Merge pull request #51 from xeptagondev/develop_merge_fix 

    Make source of funding optional
    @palindaa
    palindaa authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    e6428c2 View commit details
    Browse the repository at this point in the history

  11. unit test ci/cd

    @palindaa
    palindaa committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    4907cce View commit details
    Browse the repository at this point in the history

  12. Merge pull request #52 from xeptagondev/develop_merge_fix 

    unit test ci/cd
    @palindaa
    palindaa authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    51cc57e View commit details
    Browse the repository at this point in the history

  13. create project data file 

    Signed-off-by: shanika <shanikaw@xeptagon.com>
    @kdshanikaw
    kdshanikaw committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    abc11c0 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #53 from xeptagondev/testing 

    create project data file
    @palindaa
    palindaa authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    2ad5155 View commit details
    Browse the repository at this point in the history

  15. Commit to test API testing

    @palindaa
    palindaa committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    e59e975 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #54 from xeptagondev/develop_merge_fix 

    Commit to test API testing
    @palindaa
    palindaa authored Dec 12, 2022
    Configuration menu
    Copy the full SHA
    9ded40d View commit details
    Browse the repository at this point in the history

  17. update project creation data file 

    Signed-off-by: shanika <shanikaw@xeptagon.com>
    @kdshanikaw
    kdshanikaw committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    fd1f0c8 View commit details
    Browse the repository at this point in the history

  18. change dto to array 

    Signed-off-by: palindaa <palinda@xeptagon.com>
    @palindaa
    palindaa committed Dec 12, 2022
    Configuration menu
    Copy the full SHA
    c856607 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2022

  1. Added getting programmeSTatic details end point

    @YathurshanT
    YathurshanT committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    335335d View commit details
    Browse the repository at this point in the history

  2. Added getting programmeSTatic details changes

    @YathurshanT
    YathurshanT committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    80c67de View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/xeptagondev/undp-carbon-… 

    …registry into dashboard_changes

merging develop
    @YathurshanT
    YathurshanT committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    be58496 View commit details
    Browse the repository at this point in the history

  4. Added getting programmeSTatic details changes

    @YathurshanT
    YathurshanT committed Dec 13, 2022
    Configuration menu
    Copy the full SHA
    d15b1ed View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2022

  1. initial development of stats API

    @palindaa
    palindaa committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    035b9af View commit details
    Browse the repository at this point in the history

  2. enable winston logger

    @palindaa
    palindaa committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    708c351 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #56 from xeptagondev/dashboard_changes 

    Dashboard changes
    @palindaa
    palindaa authored Dec 15, 2022
    Configuration menu
    Copy the full SHA
    5b82cf7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into credit_share 

    # Conflicts:
#	lambda/services/src/shared/dto/programme.dto.ts

Signed-off-by: palindaa <palinda@xeptagon.com>
    @palindaa
    palindaa committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    c0fda4a View commit details
    Browse the repository at this point in the history

  5. intermiate change

    @palindaa
    palindaa committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    d803d2b View commit details
    Browse the repository at this point in the history

  6. Update counter.type.enum.ts

    @palindaa
    palindaa authored Dec 15, 2022
    Configuration menu
    Copy the full SHA
    5c15801 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #55 from xeptagondev/testing 

    update project creation data file
    @palindaa
    palindaa authored Dec 15, 2022
    Configuration menu
    Copy the full SHA
    2f3a0a5 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Credit transfer implementation

    @palindaa
    palindaa committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    5e198d6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #57 from xeptagondev/credit_share 

    Credit share
    @palindaa
    palindaa authored Dec 16, 2022
    Configuration menu
    Copy the full SHA
    b061145 View commit details
    Browse the repository at this point in the history

  3. Add company ledger functionality

    @palindaa
    palindaa committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    ea6d998 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #58 from xeptagondev/credit_share 

    Add company ledger functionality
    @palindaa
    palindaa authored Dec 16, 2022
    Configuration menu
    Copy the full SHA
    5aa0371 View commit details
    Browse the repository at this point in the history

  5. Fix single proponent percentage issue

    @palindaa
    palindaa committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    020a2d8 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #59 from xeptagondev/credit_share 

    Fix single proponent percentage issue
    @palindaa
    palindaa authored Dec 16, 2022
    Configuration menu
    Copy the full SHA
    fa8b7d4 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #12 from undp/develop_merge_fix 

    Develop merge fix
    @palindaa
    palindaa authored Dec 16, 2022
    Configuration menu
    Copy the full SHA
    4febc4a View commit details
    Browse the repository at this point in the history