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

Merge development to staging #839

Merged
merged 77 commits into from
Jun 15, 2023
Merged

Merge development to staging #839

merged 77 commits into from
Jun 15, 2023

Commits on Apr 25, 2023

  1. bugfix-CS-37275 add the error message showing the content_type UID wh… 

    …ich caused the error
    @cs-raj
    cs-raj committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    666720c View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. changed the error message

    @cs-raj
    cs-raj committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    1fc782d View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. removed stray console.log from /contentstack-import/src/lib/util/inde… 

    …x.js
    @cs-raj
    cs-raj committed May 5, 2023
    Configuration menu
    Copy the full SHA
    166f1d6 View commit details
    Browse the repository at this point in the history

  2. fixed error when when content_type uid is not there in error message … 

    …which caused error
    @cs-raj
    cs-raj committed May 5, 2023
    Configuration menu
    Copy the full SHA
    32e4ca3 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Merge branch 'development' into bugfix-CS-37275

    @cs-raj
    cs-raj committed May 15, 2023
    Configuration menu
    Copy the full SHA
    f1a67eb View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. fix: export & import error logs

    @aman19K
    aman19K committed May 18, 2023
    Configuration menu
    Copy the full SHA
    149ceb6 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. Merge branch 'development' into bugfix/CS-34294-error-logs

    @aman19K
    aman19K committed May 19, 2023
    Configuration menu
    Copy the full SHA
    3ee1647 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

  1. fix(import): added warning messages for non existing content-types re… 

    …ferred in globalfields
    @vkalta
    vkalta committed May 22, 2023
    Configuration menu
    Copy the full SHA
    8d902d9 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2023

  1. Merge branch 'development' into bugfix-CS-37275

    @cs-raj
    cs-raj committed May 23, 2023
    Configuration menu
    Copy the full SHA
    f0de6ae View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Merge branch 'development' into bugfix/CS-34294-error-logs

    @aman19K
    aman19K committed May 24, 2023
    Configuration menu
    Copy the full SHA
    fac4e1c View commit details
    Browse the repository at this point in the history

  2. Changed the error message to display the content type due to which er… 

    …ror is there
    @cs-raj
    cs-raj committed May 24, 2023
    Configuration menu
    Copy the full SHA
    2586d98 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into bugfix-CS-37275

    @cs-raj
    cs-raj committed May 24, 2023
    Configuration menu
    Copy the full SHA
    f6c0257 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. WIP: added stack-api-key flag

    @abhinav-from-contentstack
    abhinav-from-contentstack committed May 25, 2023
    Configuration menu
    Copy the full SHA
    a2cb30d View commit details
    Browse the repository at this point in the history

  2. fix: Merged 38247

    @abhinav-from-contentstack
    abhinav-from-contentstack committed May 25, 2023
    Configuration menu
    Copy the full SHA
    4fd68c8 View commit details
    Browse the repository at this point in the history

  3. WIP: adding stack-api-key flag

    @abhinav-from-contentstack
    abhinav-from-contentstack committed May 25, 2023
    Configuration menu
    Copy the full SHA
    36233f1 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge remote-tracking branch 'origin/development' into fix/import_glo… 

    …bal_field_references
    @vkalta
    vkalta committed May 31, 2023
    Configuration menu
    Copy the full SHA
    4da8a1a View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2023

  1. added stack-api-key, made alias or stack-api-key required

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    1466643 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into feat/CS-38249

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    4775451 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #806 from contentstack/fix/import_global_field_ref… 

    …erences

fix(import): added warning messages for non existing content-types referred in globalfields
    @netrajpatel
    netrajpatel committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    9c37dad View commit details
    Browse the repository at this point in the history

  4. added branch flag

    @akashbhosale97
    akashbhosale97 committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    129edf4 View commit details
    Browse the repository at this point in the history

  5. added a check for stacks with no branch

    @akashbhosale97
    akashbhosale97 committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    d4038db View commit details
    Browse the repository at this point in the history

  6. added logs folder to gitignore

    @akashbhosale97
    akashbhosale97 committed Jun 1, 2023
    Configuration menu
    Copy the full SHA
    09758d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. added validations

    @akashbhosale97
    akashbhosale97 committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    4b7f9ad View commit details
    Browse the repository at this point in the history

  2. added error message to appear red

    @akashbhosale97
    akashbhosale97 committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    5f3e1a7 View commit details
    Browse the repository at this point in the history

  3. added example command with branch flag

    @akashbhosale97
    akashbhosale97 committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    f024e95 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. fix: added isAuthenticated

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    56b5e39 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into feat/CS-38249

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    3fba13e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into bugfix/CS-34294-error-logs

    @aman19K
    aman19K committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    e28235d View commit details
    Browse the repository at this point in the history

  4. refactor: export & import config example

    @aman19K
    aman19K committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    0348ac4 View commit details
    Browse the repository at this point in the history

  5. updated export & import readme file

    @aman19K
    aman19K committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    a66f339 View commit details
    Browse the repository at this point in the history

  6. fix: added branch validation

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    1232e0e View commit details
    Browse the repository at this point in the history

  7. added changes to errors messages as per doc review

    @akashbhosale97
    akashbhosale97 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    a7f4794 View commit details
    Browse the repository at this point in the history

  8. removed error thrown if branch was not passed then branches plan does… 

    … not exist error removed
    @akashbhosale97
    akashbhosale97 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    d0f0bfa View commit details
    Browse the repository at this point in the history

  9. added changes for branch flag validation

    @akashbhosale97
    akashbhosale97 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    7626a0c View commit details
    Browse the repository at this point in the history

  10. fix: handled case where branch flag is not passed

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    8f1dc21 View commit details
    Browse the repository at this point in the history

  11. fix: added fix for a case with management token and oauth

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    f8b7754 View commit details
    Browse the repository at this point in the history

  12. changed choose to enter

    @akashbhosale97
    akashbhosale97 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    f5b705d View commit details
    Browse the repository at this point in the history

  13. fixed throwing full error when user does not have permissions to expo… 

    …rt users from an org
    @akashbhosale97
    akashbhosale97 committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    1aa17ca View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. refactor: stack dummy value

    @aman19K
    aman19K committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    9ac0240 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #825 from contentstack/feat/export-import-config-e… 

    …xample

Update example config for contentstack export & import plugin
    @netrajpatel
    netrajpatel committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    0f79671 View commit details
    Browse the repository at this point in the history

  3. changed the logic to have utility to check if branch exists

    @akashbhosale97
    akashbhosale97 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    a6a687f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development' into feat/branch-support-export-to-csv

    @akashbhosale97
    akashbhosale97 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    066fb89 View commit details
    Browse the repository at this point in the history

  5. auth-handler unit tests

    Shrutika Almeida authored and Shrutika Almeida committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    f7ad119 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'development' into oauth-unit-test

    Shrutika Almeida authored and Shrutika Almeida committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    e38557f View commit details
    Browse the repository at this point in the history

  7. version bump

    @akashbhosale97
    akashbhosale97 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    458bd92 View commit details
    Browse the repository at this point in the history

  8. changes to resolve comments

    @akashbhosale97
    akashbhosale97 committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    9aee02d View commit details
    Browse the repository at this point in the history

  9. Merge pull request #824 from contentstack/feat/branch-support-export-… 

    …to-csv

CS-38921 [Branch support for export to csv] - Merge into development
    @netrajpatel
    netrajpatel committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    bbb0588 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. latest development changes

    Shrutika Almeida authored and Shrutika Almeida committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    6a81e3a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #826 from contentstack/oauth-unit-test 

    auth-handler unit tests
    @netrajpatel
    netrajpatel committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    85a51ba View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into feat/CS-38249

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    109611e View commit details
    Browse the repository at this point in the history

  4. fix: updated http call with sdk method

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    02f68c9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'development' into feat/CS-31208

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    01b65a4 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #827 from contentstack/feat/CS-38249 

    Feat/cs 38249
    @netrajpatel
    netrajpatel committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    c371de9 View commit details
    Browse the repository at this point in the history

  7. Oauth screen UI update

    Shrutika Almeida authored and Shrutika Almeida committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    baecdc3 View commit details
    Browse the repository at this point in the history

  8. latest code from development branch

    Shrutika Almeida authored and Shrutika Almeida committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    5486b3d View commit details
    Browse the repository at this point in the history

  9. Merge branch 'development' into bugfix-CS-37275

    @cs-raj
    cs-raj committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    69bff58 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. fix: replaced http client with sdk method for update config

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    99d4913 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #828 from contentstack/oauth-window-updates 

    Oauth screen UI update
    @netrajpatel
    netrajpatel committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    5693713 View commit details
    Browse the repository at this point in the history

  3. removed error log code from index to import content_type file

    @cs-raj
    cs-raj committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    19db4d6 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Merge branch 'development' into bugfix/CS-34294-error-logs

    @aman19K
    aman19K committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    7ab686b View commit details
    Browse the repository at this point in the history

  2. version bump

    @aman19K
    aman19K committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    ce33ffc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #833 from contentstack/bugfix/CS-34294-error-logs 

    Improve error details in Logs file | CLI
    @netrajpatel
    netrajpatel committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    42cedef View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development' into bugfix-CS-37275

    @netrajpatel
    netrajpatel committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    d1ac3b3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #816 from contentstack/bugfix-CS-37275 

    Bugfix cs 37275
    @netrajpatel
    netrajpatel committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    211c168 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'development' into feat/CS-31208

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    1fdff9b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'development' into feat/CS-31209

    @abhinav-from-contentstack
    abhinav-from-contentstack committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    1ca5b4f View commit details
    Browse the repository at this point in the history

  8. Merge pull request #835 from contentstack/feat/CS-31208 

    Feat/cs 31208
    @netrajpatel
    netrajpatel committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    690a21c View commit details
    Browse the repository at this point in the history

  9. Merge branch 'development' into feat/CS-31209

    @netrajpatel
    netrajpatel committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    a8be7ad View commit details
    Browse the repository at this point in the history

  10. Merge pull request #834 from contentstack/feat/CS-31209 

    Feat/cs 31209
    @netrajpatel
    netrajpatel committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    16236e8 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'staging' into development

    @aman19K
    aman19K committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    bb558d9 View commit details
    Browse the repository at this point in the history

  12. version bump

    @aman19K
    aman19K committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    90ddef3 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #836 from contentstack/feat/merge-staging 

    Merge staging to development | version bump
    @netrajpatel
    netrajpatel committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    cb7aea2 View commit details
    Browse the repository at this point in the history

  14. fix: entries publish

    @aman19K
    aman19K committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    e1fc17c View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Merge pull request #837 from contentstack/bugfix/CS-39527 

    Entries publish error -> Please provide valid parameter for environments
    @netrajpatel
    netrajpatel committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    1d2bc9d View commit details
    Browse the repository at this point in the history

  2. fix(clone): fixed target branches issue

    @vkalta
    vkalta committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    a2ede36 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into fix/clone_issues

    @aman19K
    aman19K committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    a3eac95 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Merge pull request #838 from contentstack/fix/clone_issues 

    fix(clone): fixed target branches issue
    @netrajpatel
    netrajpatel committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    b82e53d View commit details
    Browse the repository at this point in the history