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

Beta #3015

Merged

shrunyan merged 171 commits into master from beta

Oct 16, 2024

Contributor

shrunyan commented Oct 16, 2024

No description provided.

finnar-bin and others added 30 commits

June 13, 2024 22:34


          Reset user data on logout (#2709)

Fixes #2565 


https://github.com/zesty-io/manager-ui/assets/28705606/5f2bee49-07ed-4cfd-aa1d-8e0534d91b0b

Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Make bold string before semi colon and adjust the height and having e…

bedee65

…llipsis conditions depending on what notification will be displayed.


          Update to use MUI typography component

5c10df9


          Feature/multi item table (#2731)

6cf6782

Co-authored-by: Nar Cuenca <narc.ph@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>


          Merge branch 'dev' into feat/text-bold-before-semicolon-global-notifi…

20875a8

…cations


          Handle instance granular role handling (#2747)

154f323

Solution to handle immediate need of applying an Instance granular role
with publish: false

Required changes:

1. Content items only get filtered if at least one granular role targets
a content item. This ensures that given ONLY an instance granular role a
user is still able to see all the content items.

2. Use-permission hook now defaults zuid argument to instance zuid
(argument has been unused so far) in order to check permissions.

This allows for an instance granular role to be checked and have
priority over system role in the case no other entity zuid is provided


          Reset user data on logout (#2709)

8c6d355

Fixes #2565 


https://github.com/zesty-io/manager-ui/assets/28705606/5f2bee49-07ed-4cfd-aa1d-8e0534d91b0b

Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Feature/multi item table (#2731)

47e2b94

Co-authored-by: Nar Cuenca <narc.ph@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>


          Handle instance granular role handling (#2747)

97f1a03

Solution to handle immediate need of applying an Instance granular role
with publish: false

Required changes:

1. Content items only get filtered if at least one granular role targets
a content item. This ensures that given ONLY an instance granular role a
user is still able to see all the content items.

2. Use-permission hook now defaults zuid argument to instance zuid
(argument has been unused so far) in order to check permissions.

This allows for an instance granular role to be checked and have
priority over system role in the case no other entity zuid is provided


          Merge branch 'dev' into feat/text-bold-before-semicolon-global-notifi…

1f43b3a

…cations


          fix craeated by filter and move lang code setup to parent

b2c6b48


          remove fix height

02964e3


          Merge branch 'feat/text-bold-before-semicolon-global-notifications' of …

afa9c01

…https://github.com/zesty-io/manager-ui into feat/text-bold-before-semicolon-global-notifications


          Merge branch 'dev' into feat/text-bold-before-semicolon-global-notifi…

d891244

…cations


          Comment System (#2711)

a8899f0

**This is dependent on BE Change: [insert pr here]**


https://github.com/zesty-io/manager-ui/assets/28705606/80fd0937-9c61-427d-b1da-7e3f34263776

---------

Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Andres Galindo <agalin920@gmail.com>


          Merge branch 'stage' into dev

b70a575


          Merge branch 'dev' into feat/text-bold-before-semicolon-global-notifi…

af6d4c2

…cations


          fix craeated by filter and move lang code setup to parent

ff78046


          Comment System (#2711)

70158f0

**This is dependent on BE Change: [insert pr here]**


https://github.com/zesty-io/manager-ui/assets/28705606/80fd0937-9c61-427d-b1da-7e3f34263776

---------

Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Andres Galindo <agalin920@gmail.com>


          Schema min/max characters rule (#2755)

9d2836c

Resolves #2719 


https://github.com/zesty-io/manager-ui/assets/28705606/e1d545ef-46c1-4e12-bfe2-2618b0949068


          Vqa fixes and updates multi item table

5cd2bf0


          Removed fixed menu item heights

03829f3


          up tooltip widths

fb592ce


          resolve conflict

a41488e


          Merge conflict resolution (#2767)

a28beca


          Add one-offs for small Select input

8eb65f4


          add initialized check


          [Schema Rules] Add one-offs for small Select input (#2769)

48d309e


          [Schema Rules] Only show error blurb when user clicks Save (#2770)

39f9096

https://github.com/zesty-io/manager-ui/assets/28705606/3199125a-76e0-40be-9e35-67bcc5258949


          Stage Release (#2771)

c9c065f

Created by Github action

agalin920 and others added 28 commits

July 30, 2024 12:32


          Stage merge conflicts 2 (#2893)

27b2b83

Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2885)

71e4c82

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve stage conflicts (#2895)

fa8c77b

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2894)

ccb121c

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve stage conflicts 3 (#2903)

954b4a0

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2900)

d1f6f29

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Fix/resolve stage conflicts (#2907)

a0841f3

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2906)

58f0bcb

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve stage conflicts (#2912)

17151b5

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2910)

4541c18

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve dev stage conflicts (#2931)

0ec8716

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2924)

04baa91

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Chore/resolve stage conflicts (#2944)

84b5ce4

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2935)

dcdb274

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve stage conflicts (#2949)

7876c43

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2946)

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve merge conflicts (#2955)

754e42d

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2950)

c44b38f

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve stage conflicts (#2964)

2ef5b94

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2957)

deeb2f5

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/fix merge issues (#2968)

f151682

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/fix merge issues (#2969)

b48e55b

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Chore/resolve merge conflicts (#2971)

4a95625

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Stage Release (#2967)

33208b5


          Chore/resolve beta conflicts (#2976)

c5d02f9

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>


          Stage Release (#2973)

c66a379

Created by Github action

---------

Co-authored-by: Andres Galindo <agalin920@gmail.com>
Co-authored-by: Nar -- <28705606+finnar-bin@users.noreply.github.com>
Co-authored-by: Stuart Runyan <shrunyan@gmail.com>
Co-authored-by: Allen Pigar <50983144+allenpigar@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Remove meta desc validation on dataset items (#2985)

a13b369


          Resolve internal link zuids (#3014)

1ec2f36

Fixes #3008

shrunyan merged commit 51d5199 into master

2 checks passed

sentry-io bot commented Oct 17, 2024

Suspect Issues

This pull request was deployed and Sentry observed the following issues:

‼️ TypeError: undefined is not an object (evaluating 'n.map') bj(src/apps/content-editor/src/app/views/ItemEd... View Issue

_{Did you find this useful? React with a 👍 or 👎}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet