Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

[Copy]Django Oscar Upgrade to version 3.1 #4099

Closed
wants to merge 88 commits into from

Commits on Mar 1, 2023

  1. build: Creating a missing workflow file self-assign-issue.yml.

    The .github/workflows/self-assign-issue.yml workflow is missing or needs an update to stay in
    sync with the current standard for this workflow as defined in the
    `.github` repo of the `openedx` GitHub org.
    Feanil Patel authored and pshiu committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    b782d39 View commit details
    Browse the repository at this point in the history
  2. build: Creating a missing workflow file `add-remove-label-on-comment.…

    …yml`.
    
    The .github/workflows/add-remove-label-on-comment.yml workflow is missing or needs an update to stay in
    sync with the current standard for this workflow as defined in the
    `.github` repo of the `openedx` GitHub org.
    Feanil Patel authored and pshiu committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    3dfeacb View commit details
    Browse the repository at this point in the history
  3. build: Updating a missing workflow file `add-depr-ticket-to-depr-boar…

    …d.yml`.
    
    The .github/workflows/add-depr-ticket-to-depr-board.yml workflow is missing or needs an update to stay in
    sync with the current standard for this workflow as defined in the
    `.github` repo of the `openedx` GitHub org.
    Feanil Patel authored and pshiu committed Mar 1, 2023
    Configuration menu
    Copy the full SHA
    62ba107 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2023

  1. docs: Remove repo specific CONTRIBUTING.rst

    We now have a org wide CONTRIBUTING.md that points to our correct
    general contributing guidelines.  We don't need repo specific ones that
    forward to other contributing docs.
    Feanil Patel authored and pshiu committed Mar 7, 2023
    Configuration menu
    Copy the full SHA
    0fc5040 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

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

Commits on Mar 9, 2023

  1. Configuration menu
    Copy the full SHA
    64e89b8 View commit details
    Browse the repository at this point in the history
  2. chore: quality

    adamstankiewicz authored and iloveagent57 committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    c74de17 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. fix: Pick the right purchase from ios response (#3921)

    * fix: Pick the right purchase from ios response
    
    iOS response contain multiple purchases, instead of picking the first purchase,
    pick the one which have given product id and latest date.
    LEARNER-9261
    jawad-khan authored Mar 16, 2023
    Configuration menu
    Copy the full SHA
    9495e3e View commit details
    Browse the repository at this point in the history
  2. feat: Added Android refund api (#3922)

    * feat: Added Android refund api
    
    Like Apple android doesn't have callback for every refund. Therefore we have created an endpoint  which we will hit daily through ecommerce worker.
    Learner-9149
    jawad-khan authored Mar 16, 2023
    Configuration menu
    Copy the full SHA
    4e117d0 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. feat: Error if products in basket are already purchased (#3929)

    * feat: Error if products in basket are already purchased
    
    * refactor: Add tests, Improve error message
    
    * refactor: Update docstring
    
    * test: Increase coverage
    moeez96 authored Mar 23, 2023
    Configuration menu
    Copy the full SHA
    654dfb5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c22db3d View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. fix: Fix error in checkout api for mobile (#3934)

    * fix: Fix error in checkout api for mobile
    moeez96 authored Mar 29, 2023
    Configuration menu
    Copy the full SHA
    fe975c4 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2023

  1. fix: Return error in case of duplicate transaction_id for mobile (#3936)

    * fix: Return error in case of duplicate transactionID for mobile
    
    * refactor: Review feedback, add documentation
    moeez96 authored Apr 3, 2023
    Configuration menu
    Copy the full SHA
    3ad694a View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. feat: Added course and expires field in product form on ecommerce das…

    …hboard (#3938)
    
    Forked catalogue app from oscar and added course and expire field in ProductForm. This change will enable to
    add Android sku from a same dashboard page.
    jawad-khan authored Apr 10, 2023
    Configuration menu
    Copy the full SHA
    c871aee View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2023

  1. fix: reorder JWT decoders (#3941)

    Reordered the JWT decoders to first use the standard
    library version, and then use the custom ecommerce
    decoder which uses multiple issuers. In this way, we
    can see if any JWTs cannot be decoded by that standard
    library version, and when and if we are ready to retire
    the custom JWT decoding code.
    
    See DEPR openedx/public-engineering#83
    robrap authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    405592f View commit details
    Browse the repository at this point in the history
  2. fix: cached monitoring (#3942)

    Monitoring features such as use of the increment
    method, to increment a custom attribute, requires
    the CachedCustomMonitoringMiddleware. This has been
    added so the earlier calls to increment will function.
    robrap authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    99fe140 View commit details
    Browse the repository at this point in the history
  3. feat: add discount_jwt monitoring (#3944)

    Add monitoring for the discount JWT.
    robrap authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    a50fd85 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. feat: Added data_share_consent field to order fullfillment notes (#3939)

    Co-authored-by: IrfanUddinAhmad <[email protected]>
    irfanuddinahmad and IrfanUddinAhmad authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    ae883c3 View commit details
    Browse the repository at this point in the history
  2. chore: Switch from edx-sphinx-theme to sphinx-book-theme

    The edx-sphinx theme is being deprecated, and replaced with sphinx-book-theme.
    This removes references to the deprecated theme and replaces them with the new
    standard theme for the platform.
    xitij2000 authored and pshiu committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    b5fa2e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. test: Add tests for Mobile IAP (#3937)

    * test: Add tests for mobile In-app purchases
    
    This reverts commit 54ea975.
    moeez96 authored Apr 13, 2023
    Configuration menu
    Copy the full SHA
    29e78ed View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. fix: fix codecov error

    Codecov PyPI package was removed on 12 April and the recommended step is to migrate to codecov Github Action instead.
    aht007 authored and pshiu committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    5c605ea View commit details
    Browse the repository at this point in the history
  2. fix: add an exec ex 2u max application check to the checkout flow. EN…

    …T-7059
    
    Also removes codecov from ci.yml workflow.
    iloveagent57 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    580be67 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

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

Commits on Apr 21, 2023

  1. fix: Updated format for data_share_consent field

    IrfanUddinAhmad authored and saleem-latif committed Apr 21, 2023
    Configuration menu
    Copy the full SHA
    c27b0fb View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. docs: Update the contributing guidelines link.

    We're moving towards a single set of guidelines org-wide.
    Feanil Patel authored and pshiu committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    300c376 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. feat!: remove custom JWT decoding (#3943)

    * feat!: remove custom JWT decoding
    
    Removes the ecommerce custom JWT decoding, and replaces
    with the simple decoding from the edx-drf-extensions
    library.
    
    * fix: drop constraints and make upgrade
    
    * fix: handle major upgrade of django-crispy-forms
    
    The major upgrade of django-crispy-forms called for
    some changes related to bootstrap3 and dependencies.
    See https://github.com/django-crispy-forms/django-crispy-forms/blob/main/CHANGELOG.md#major-changes-and-migration-guide
    
    * fix: code coverage reporting
    
    Codecov no longer exists on PyPI, so switch to github
    action to run coverage report.
    
    ---------
    
    Co-authored-by: Muhammad Zubair <[email protected]>
    robrap and zubair-ce07 authored Apr 26, 2023
    Configuration menu
    Copy the full SHA
    679a1f7 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. fix: Course to have multiple seats with certificate_type attribute (#…

    …3950)
    
    * fix: Course to have multiple seats with certificate_type attribute
    * refactor: Modify SKU generation hash, add tests
    * test: Modify tests
    moeez96 authored Apr 28, 2023
    Configuration menu
    Copy the full SHA
    43b7e87 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. temp: update JWT_DECODE_HANDER in devstack.py

    Jenkins job for building devstack images is temporarily broken.
    This should fix the devstack settings until this configuration
    change lands in an updated image:
    openedx-unsupported/configuration#6921
    robrap authored and pshiu committed May 1, 2023
    Configuration menu
    Copy the full SHA
    274f212 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

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

Commits on May 10, 2023

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

Commits on May 11, 2023

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

Commits on May 15, 2023

  1. refactor: Improve exception handling for mobile IAP (#3969)

    * refactor: Improve exception handling for mobile IAP
    * refactor: pylint fixes
    moeez96 authored May 15, 2023
    Configuration menu
    Copy the full SHA
    addfb62 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. feat: Fix capture_context error on Payment MFE (#3965)

    * feat: Fix capture_context error on Payment MFE
    
    * feat: removed whitespace
    
    * feat: removed whitespace
    
    * feat: modified test case
    
    * feat: modified test case
    
    ---------
    
    Co-authored-by: Muhammad Zubair <[email protected]>
    JadeyOlivier and zubair-ce07 authored May 16, 2023
    Configuration menu
    Copy the full SHA
    9cf9d56 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2023

  1. Configuration menu
    Copy the full SHA
    c623201 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3bae030 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

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

Commits on May 31, 2023

  1. chore: updated Python requirements (edx-ecommerce-worker to version 3…

    ….3.3) (#3968)
    
    Co-authored-by: Muhammad Zubair <[email protected]>
    ishahroz and zubair-ce07 authored May 31, 2023
    Configuration menu
    Copy the full SHA
    87292e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. Configuration menu
    Copy the full SHA
    f805880 View commit details
    Browse the repository at this point in the history
  2. fix: add edx-revenue-tasks to user_reviewers & remove team_reviewers

    Will create a Jira ticket instead of tagging all the members of
    @openedx/revenue-squad.
    pshiu committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    82ae511 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. feat: add sf line item field to enterprise offers

    ENT-7013
    brobro10000 authored and macdiesel committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e084e2d View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

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

Commits on Jun 16, 2023

  1. feat: add SDN endpoints (#3985)

    * feat: add endpoint to run SDN check and return counts
    
    * feat: add SDNCheckFailure REST APi
    christopappas authored Jun 16, 2023
    Configuration menu
    Copy the full SHA
    fd492fc View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. fix: fix 500 on SDN for subscriptions (#3989)

    * fix: fix 500 on SDN for subscriptions
    aht007 authored Jun 19, 2023
    Configuration menu
    Copy the full SHA
    6b88537 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Configuration menu
    Copy the full SHA
    2f1437e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fd5f0c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2023

  1. feat: Store price and currency for Mobile IAP (#3992)

    * feat: Store price and currency for mobile IAP
    moeez96 authored Jun 23, 2023
    Configuration menu
    Copy the full SHA
    0730221 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a4298d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2023

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

Commits on Jul 7, 2023

  1. Configuration menu
    Copy the full SHA
    8095432 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    05e9777 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a4766a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2023

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

Commits on Aug 3, 2023

  1. feat: unenroll refunded android users daily (#4015)

    * feat: unenroll refunded android users daily
    
    Django management command to un-enroll refunded android users. This command will be run by Jenkins job daily.
    jawad-khan authored Aug 3, 2023
    Configuration menu
    Copy the full SHA
    e233314 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. feat: mail mobile team for a mobile course change in publisher (#4014)

    * feat: mail mobile team for a mobile course change in publisher
    
    This will fix any unknown change from publisher to a course having mobile seats.
    After this fix mobile team will see mail and adjust price of the course on playstore or appstore.
    In the longer run we want to replace this solution by changing the course price directly using mobile platform apis.
    
    LEARNER-9377
    
    * fix: fixed coverage issue
    jawad-khan authored Aug 17, 2023
    Configuration menu
    Copy the full SHA
    b5a96f1 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. fix: readthedocs file renamed (#4024)

    Updating readthedocs extension as yml going to be deprecated in september Issue: edx/edx-arch-experiments#418
    zubairshakoorarbisoft authored Sep 1, 2023
    Configuration menu
    Copy the full SHA
    fa4ab4f View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. fix: Docker multi-arch images push for linux/amd64, linux/arm64 (#4006)

    * fix: docker multi-arch image push
    
    * fix: docker multi-arch images, code improvements
    
    ---------
    
    Co-authored-by: Salman Nawaz <[email protected]>
    salman2013 and Salman Nawaz authored Sep 7, 2023
    Configuration menu
    Copy the full SHA
    f0e196f View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2023

  1. feat: upgrade edx-drf-extensions and newrelic (#4027)

    * fix: test update for edx-drf-extensions 8.11.0
    
    The method generate_unversioned_payload in
    edx-drf-extensions now requires a user.id to
    function, so that needed to be added to the mock
    user.
    
    * feat: upgrade edx-drf-extensions
    
    Upgrade edx-drf-extensions to 8.12.0. This was done
    using a temporary constraint and pip-compile without
    the --upgrade to keep from upgrading unrelated
    requirements.
    
    * feat: upgrade newrelic
    
    Upgrade newrelic to 9.1.0. This was done
    using a temporary constraint and pip-compile without
    the --upgrade to keep from upgrading unrelated
    requirements.
    robrap authored Oct 20, 2023
    Configuration menu
    Copy the full SHA
    5ee776c View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. docs: Update RTD config. (#4042)

    The 'build.os' setting is now required.
    feanil authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    83045eb View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2023

  1. Feat: Upgrade django-oscar to version 3.2 (#4023)

    * feat: changes to upgrad django-oscar to version 3.2
    
    * chore: upgraded django oscar to version 3.2
    zubair-ce07 authored Oct 24, 2023
    Configuration menu
    Copy the full SHA
    4d275df View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0a7a61f View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2023

  1. fix: Added logs for ios refund exception (#4040)

    * fix: Added logs for ios refund exception
    jawad-khan authored Oct 26, 2023
    Configuration menu
    Copy the full SHA
    9483664 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fc58dd7 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. docs: Update the security e-mail address.

    This repository is now managed by the Axim Collaborative and security issues
    with it should be reported to [email protected] instead of [email protected]
    
    This work is being done as a part of openedx/wg-security#16
    feanil committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    90936d6 View commit details
    Browse the repository at this point in the history
  2. feat: upgrade edx-drf-extensions to 8.13.0 (#4047)

    Attempts fix for ENABLE_FORGIVING_JWT_COOKIES when
    ENABLE_SET_REQUEST_USER_FOR_JWT_COOKIE is also enabled, as it is in ecommerce.
    
    Note that this won't be put into effect until
    ENABLE_FORGIVING_JWT_COOKIES is toggled on
    separately.
    robrap authored Oct 31, 2023
    Configuration menu
    Copy the full SHA
    7e126dc View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

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

Commits on Nov 13, 2023

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

Commits on Nov 14, 2023

  1. fix: changed django migration to alter price field in stockrecord model

    chore: updated factory dependency
    
    refactor: updated field name
    
    feat: Mgmt Command to create mobile seats for new course runs (#4046)
    
    fix: skipped a failing test. Will fix it in another ticket
    
    fix: updated method
    
    refactor: made changes as per new version of oscar
    
    refactor: updated code to make voucher name unique
    
    fix: removed white spaces
    
    fix: removed white spaces
    
    refactor: changed code as per new version of oscar
    
    refactor: updated code
    
    fix: override Product model in catalogue app
    
    fix: removed extra spaces
    
    fix: updated  code
    
    fix: changes in code to pass checks
    
    fix: changes in code to pass checks
    zubair-ce07 committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    a8acca8 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f0b745 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    28f8cb6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8209a41 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. fix: removed code

    zubair-ce07 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    bd96751 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'zubair-django-oscar31-update' of github.com:openedx/eco…

    …mmerce into zubair-django-oscar31-update
    zubair-ce07 committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    d56b082 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4ef8517 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Configuration menu
    Copy the full SHA
    cad553c View commit details
    Browse the repository at this point in the history
  2. Merge branch 'zubair-django-oscar31-update' of github.com:openedx/eco…

    …mmerce into zubair-django-oscar31-update
    zubair-ce07 committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    ef3a5c4 View commit details
    Browse the repository at this point in the history
  3. docs: Update security e-mail address correctly.

    I updated the text but missed the mailto.  I just removed the mailto
    since it's not needed for the address to render properly.
    feanil authored and pshiu committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    7aa3886 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c68378a View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

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

Commits on Nov 28, 2023

  1. feat: upgrade edx-drf-extensions to 9.0.0 (#4060)

    9.0.0 fixes ENABLE_FORGIVING_JWT_COOKIES bug.
    The JWT's LMS user id will now be compared to the
    user object's lms_user_id, rather than to its id.
    For details, see:
    openedx/edx-drf-extensions#408
    
    Note that this won't be put into effect until
    ENABLE_FORGIVING_JWT_COOKIES is toggled on
    separately.
    
    Also, although this is a major upgrade, it only
    caused a backward-incompatible issue in edx-platform.
    There are no other changes required for ecommerce.
    
    This is part of the rollout of:
    edx/edx-arch-experiments#429
    robrap authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    59968f4 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2023

  1. Configuration menu
    Copy the full SHA
    8fbe9ab View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e6b2e6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e3860eb View commit details
    Browse the repository at this point in the history
  4. docs: updated readme for 2u/release contributions (#3927)

    docs: add decision record for master branch split
    wdrussell2015 authored Dec 5, 2023
    Configuration menu
    Copy the full SHA
    700cc13 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. feat: add atlas pull support (#4051)

    Refs: FC-0012 OEP-58
    shadinaif authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    e5b4f29 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

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

Commits on Jan 12, 2024

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

Commits on Jan 16, 2024

  1. fix: resolved conflicts

    zubair-ce07 committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    15bef43 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. chore: merged migrations

    zubair-ce07 committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    9a86856 View commit details
    Browse the repository at this point in the history