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

Upstream changes #357

Merged
merged 70 commits into from
May 24, 2024
Merged

Upstream changes #357

merged 70 commits into from
May 24, 2024

Commits on Mar 15, 2021

  1. login with github

    @ashishkmishra36
    ashishkmishra36 committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    dc37df9 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. added django template

    @ashishkmishra36
    ashishkmishra36 committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    b0c7e83 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. removed django template

    @ashishkmishra36
    ashishkmishra36 committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    07b2996 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2 from buildly-release-management/login-with-github 

    Login with github
    @ashishkmishra36
    ashishkmishra36 committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    a35b8fa View commit details
    Browse the repository at this point in the history

  3. initial commit

    @ashishkmishra36
    ashishkmishra36 committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    fde95b5 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. remove user groups

    @ashishkmishra36
    ashishkmishra36 committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    e1f52e5 View commit details
    Browse the repository at this point in the history

  2. updated urls

    @ashishkmishra36
    ashishkmishra36 committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    fa95b7c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from buildly-release-management/update-user-org… 

    …anization

User Role and User approval for Registration flow and Social Auth flow.
    @ashishkmishra36
    ashishkmishra36 committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    7c43d65 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. initial commit

    @ashishkmishra36
    ashishkmishra36 committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    5ac65b8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from buildly-release-management/update-pop-up-o… 

    …rg-name

Update pop up org name
    @ashishkmishra36
    ashishkmishra36 committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    f8b475a View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2021

  1. Updated dependency issues

    Yasmin Ansari committed Oct 1, 2021
    Configuration menu
    Copy the full SHA
    60ea4b1 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2021

  1. Datamesh update (#11) 

    * Datamesh async fixed

* Datamesh join function script
    @mthombare
    mthombare committed Oct 4, 2021
    Configuration menu
    Copy the full SHA
    0510488 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2021

  1. Email alert integration (#13) 

    * Integration - Email Notification

* Integration - Email Notification

* updated serializer

* updated unit test
    @mthombare
    mthombare committed Oct 5, 2021
    Configuration menu
    Copy the full SHA
    ec783bc View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2021

  1. datamesh join script (#14) 

    * datamesh join script

* datamesh join script

* comment removed

* updated datamesh join script

* updated datamesh join script

* updated join_record_datamesh function

* removed print statement
    @mthombare
    mthombare committed Oct 12, 2021
    Configuration menu
    Copy the full SHA
    6465b21 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2021

  1. Partner implementation (#17) 

    * Partner Implementation

* removed organization

* removed partner organization

* removed partner organization

* - partner unit test

* - updated test fixtures

* - removed comment
    @mthombare
    mthombare committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    6b17f51 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. Resolve permissions for Organization

    Yasmin Ansari committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    472abe6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18 from buildly-release-management/fix/update-org… 

    …-names-permission

Resolve permissions for Organization
    @mthombare
    mthombare committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    3539520 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2021

  1. fix core endpoint issue (#21) 

    * fix core endpoint issue

* updated comment
    @mthombare
    mthombare committed Nov 23, 2021
    Configuration menu
    Copy the full SHA
    9fbcf4d View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2021

  1. Updated environment variables

    Yasmin Ansari committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    4e048ab View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2021

  1. Updated environment values

    Yasmin Ansari committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    f193e26 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. Handle for Gateway response 400

    Yasmin Ansari committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    285c9b0 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. Merge pull request #24 from buildly-release-management/feat/google-re… 

    …sponse-handling

Handle for Gateway response 400
    @mthombare
    mthombare committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    1a9093e View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2021

  1. datamesh join: 

    - product <-> third party tool and
- product <-> product_team
    @mthombare
    mthombare committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    8c0da22 View commit details
    Browse the repository at this point in the history

  2. completed project tool service datamesh join

    @mthombare
    mthombare committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    85a33a5 View commit details
    Browse the repository at this point in the history

  3. completed release service datamesh join

    @mthombare
    mthombare committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    4378919 View commit details
    Browse the repository at this point in the history

  4. completed dev/partner service datamesh join

    @mthombare
    mthombare committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    92c2673 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2021

  1. Fix Datamesh request issue

    @mthombare
    mthombare committed Dec 23, 2021
    Configuration menu
    Copy the full SHA
    49612e6 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2021

  1. updated admin username and password

    @mthombare
    mthombare committed Dec 24, 2021
    Configuration menu
    Copy the full SHA
    622b051 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from buildly-release-management/feat#22/datame… 

    …sh-configuration

Datamesh Configuration
    @mthombare
    mthombare committed Dec 24, 2021
    Configuration menu
    Copy the full SHA
    1fc8b8d View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2022

  1. revert find endpoint fix

    @mthombare
    mthombare committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    b928816 View commit details
    Browse the repository at this point in the history

  2. updated datamesh join module name

    @mthombare
    mthombare committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    6ae3c59 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. Added script to load datamesh

    Yasmin Ansari committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    989f0d3 View commit details
    Browse the repository at this point in the history

  2. Handled blank response for join records

    Yasmin Ansari committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    348cc62 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #32 from buildly-release-management/feat#27/datame… 

    …sh-fetch-new-entries

Datamesh - Handle blank request for all models and updated service names in configuration script
    @mthombare
    mthombare committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    0b36a5c View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2022

  1. datamesh POST/PUT request implementation

    @mthombare
    mthombare committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    9ae39c9 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2022

  1. updated post request for different use-cases

    @mthombare
    mthombare committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    df2252a View commit details
    Browse the repository at this point in the history

  2. datamesh implemented delete request

    @mthombare
    mthombare committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    de11434 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. post empty response validation

    @mthombare
    mthombare committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    fcde76c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feat#27/datamesh-update-new-joinentry

    @mthombare
    mthombare committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    7af956f View commit details
    Browse the repository at this point in the history

  3. updated datamesh script for pk

    @mthombare
    mthombare committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    9f5304c View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2022

  1. converted into functions

    @mthombare
    mthombare committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    fc99668 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. updated put request

    @mthombare
    mthombare committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    60e4c9c View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2022

  1. updated PUT request for case -> The relation that exists but needs to… 

    … create join
    @mthombare
    mthombare committed Jan 17, 2022
    Configuration menu
    Copy the full SHA
    cd4d25c View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2022

  1. Allow users to be auto-approved after registration

    Yasmin Ansari committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    b42a491 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #37 from buildly-release-management/feat#36/approv… 

    …e-registration

Allow users to be auto-approved after registration
    @mthombare
    mthombare committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    45ca0d9 View commit details
    Browse the repository at this point in the history

  3. added fields on Relationship model

    @mthombare
    mthombare committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    b3d842f View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2022

  1. model via forward lookup

    @mthombare
    mthombare committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    40d03c6 View commit details
    Browse the repository at this point in the history

  2. param service name via forward_lookup

    @mthombare
    mthombare committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    5907771 View commit details
    Browse the repository at this point in the history

  3. written function for the case - Handles The relation that only needs … 

    …to update ID or UUID
    @mthombare
    mthombare committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    770bb89 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2022

  1. Get response after a POST and PUT request

    @mthombare
    mthombare committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    8c3ef01 View commit details
    Browse the repository at this point in the history

  2. refactor the functions

    @mthombare
    mthombare committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    14a40e6 View commit details
    Browse the repository at this point in the history

  3. updated func parameter

    @mthombare
    mthombare committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    4f8bb1b View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

  1. issue fix - delete join

    @mthombare
    mthombare committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    133162d View commit details
    Browse the repository at this point in the history

  2. delete status join

    @mthombare
    mthombare committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    8928e79 View commit details
    Browse the repository at this point in the history

  3. migration file

    @mthombare
    mthombare committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    880dedb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #38 from buildly-release-management/feat#27/datame… 

    …sh-update-new-joinentry

Datamesh handle the requests for all methods
    @mthombare
    mthombare committed Jan 25, 2022
    Configuration menu
    Copy the full SHA
    d6df535 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2022

  1. User Type Implementation (#45) 

    * added user type

* admin dashboard

* added survey_status

* serializer fields added

* help text
    @mthombare
    mthombare committed Feb 3, 2022
    Configuration menu
    Copy the full SHA
    ee2c859 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2022

  1. User profile update API (#48) 

    * user profile update API

* updated get_permission

* unit test cases

* added serializer field

* serializer organization_name validation
    @mthombare
    mthombare committed Feb 7, 2022
    Configuration menu
    Copy the full SHA
    7a02196 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2022

  1. updated core-user serializer update method

    @mthombare
    mthombare committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    7785b1a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #51 from buildly-release-management/feat#50/update… 

    …-profile-api

Update newly added fields
    @mthombare
    mthombare committed Feb 8, 2022
    Configuration menu
    Copy the full SHA
    46bf4d5 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. User registration update (#53) 

    * register with org validation

* uncommented invitation_token method

* updated load initial script for org creation

* set auto approve to false

* core user create method

* default org name

* added new var to update

* code format
    @mthombare
    mthombare committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    62b8af4 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2022

  1. updated gunicorn timeout

    @mthombare
    mthombare committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    83e6f8c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #55 from buildly-release-management/feat#54/increa… 

    …se-timeout

Increased gunicorn timeout
    @mthombare
    mthombare committed Feb 21, 2022
    Configuration menu
    Copy the full SHA
    611abae View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2022

  1. Merge branch 'master' into master

    Greg Lind committed Mar 21, 2022
    Configuration menu
    Copy the full SHA
    0782ef2 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2022

  1. removed unwanted files from upstream pr

    @abhishek-kumar-piyush
    abhishek-kumar-piyush committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    f2df7d4 View commit details
    Browse the repository at this point in the history

  2. updated migration files

    @abhishek-kumar-piyush
    abhishek-kumar-piyush committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    b5bc7c0 View commit details
    Browse the repository at this point in the history

  3. added new line

    @abhishek-kumar-piyush
    abhishek-kumar-piyush committed Apr 28, 2022
    Configuration menu
    Copy the full SHA
    11ce1f3 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2022

  1. removed unwanted changes

    @mthombare
    mthombare committed May 24, 2022
    Configuration menu
    Copy the full SHA
    b1b7ea9 View commit details
    Browse the repository at this point in the history

  2. removed prepare_get_request() function

    @mthombare
    mthombare committed May 24, 2022
    Configuration menu
    Copy the full SHA
    28d61e5 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Merge branch 'master' into upstream_changes

    @glind
    glind committed May 24, 2024
    Configuration menu
    Copy the full SHA
    ccc7da9 View commit details
    Browse the repository at this point in the history