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.

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

Stage Release #2714

Merged
merged 30 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
5152617
Stable Release (#2603)
github-actions[bot] Mar 20, 2024
2a521f5
Stable Release (#2607)
github-actions[bot] Mar 20, 2024
6d73f9c
Stable Release (#2608)
github-actions[bot] Mar 20, 2024
7915c62
Stable Release (#2610)
github-actions[bot] Mar 20, 2024
298de8e
Beta Release (#2636)
shrunyan Mar 27, 2024
e7e401e
Beta Release (#2639)
shrunyan Mar 27, 2024
f217565
Beta Release (#2642)
shrunyan Mar 27, 2024
63f0860
Merge branch 'stable' into beta
shrunyan Mar 27, 2024
8b366ef
Stable Release (#2643)
shrunyan Mar 27, 2024
fe983ed
Beta Release (#2645)
shrunyan Mar 27, 2024
9f00621
Stable Release (#2647)
shrunyan Mar 27, 2024
25b7083
Beta Release (#2653)
shrunyan Mar 29, 2024
4505161
Stable Release (#2654)
shrunyan Mar 29, 2024
b873e97
Beta Release (#2656)
shrunyan Mar 29, 2024
6ca9740
Stable Release (#2657)
shrunyan Mar 29, 2024
c81aafe
Convert dates used in the activity log api calls to UTC (#2692)
finnar-bin Apr 24, 2024
cb5cb67
Truncate text when duplicating item (#2696)
finnar-bin Apr 29, 2024
42f57a3
Fix selected item not found issues on internal link (#2695)
agalin920 Apr 29, 2024
65c918b
Predict year while typing in date string (#2698)
finnar-bin Apr 30, 2024
7001ba5
Beta Release (#2659)
github-actions[bot] May 2, 2024
c8b5164
Schedule content item publish revamp (#2678)
finnar-bin May 8, 2024
fbd7053
hotfix: provide required array prop
shrunyan May 10, 2024
82a6739
task: autohighlight and set max height
finnar-bin May 13, 2024
2de2148
task: use iso format for datetime preview
finnar-bin May 14, 2024
9ad7f21
Zesty material version bump (#2717)
finnar-bin May 23, 2024
811b160
merge stable to dev
shrunyan May 23, 2024
02d4e9e
remove legacy workflow
shrunyan May 23, 2024
4f702ff
Merge branch 'dev' into merge/stable-to-dev
shrunyan May 23, 2024
fcbfa0f
Merge/stable to dev (#2721)
shrunyan May 23, 2024
b56963f
Merge branch 'stage' into dev
shrunyan May 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/cd-beta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ jobs:

- name: Create Stable Release
if: "!steps.check.outputs.skip"

run: gh pr create -B stable -H beta --title 'Stable Release' --body 'Created by Github action'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15 changes: 15 additions & 0 deletions cypress/e2e/content/actions.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,21 @@ describe("Actions in content editor", () => {
);
});

it("Fills in default values for a new item", () => {
cy.waitOn("/v1/content/models*", () => {
cy.visit("/content/6-a1a600-k0b6f0/new");
});

cy.get("#12-0c3934-8dz720 input").should(
"have.value",
"default single line text field"
);
cy.get("#12-d39a38-85sqdt").contains("zesty-io-logo-horizontal-dark.png");
cy.get("#12-bcd1dcc5f4-2rpm9p").contains(
"5 Tricks to Teach Your Pitbull: Fun & Easy Tips for You & Your Dog!"
);
});

it("Creates a new item", () => {
cy.waitOn("/v1/content/models*", () => {
cy.visit("/content/6-a1a600-k0b6f0/new");
Expand Down
15 changes: 8 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@tinymce/tinymce-react": "^4.3.0",
"@welldone-software/why-did-you-render": "^6.1.1",
"@zesty-io/core": "1.10.0",
"@zesty-io/material": "^0.13.1",
"@zesty-io/material": "^0.13.2",
"chart.js": "^3.8.0",
"chartjs-adapter-moment": "^1.0.1",
"chartjs-plugin-datalabels": "^2.0.0",
Expand Down
8 changes: 7 additions & 1 deletion src/shell/components/FieldTypeDateTime/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const FieldTypeDateTime = ({
if (showTimezonePicker) {
return `Stored in UTC as ${moment
.utc(moment.tz(value, timezone))
.format("yyyy-MM-DD HH:mm:ss.ssssss")}`;
.format()}`;
}

if (dateString && timeString) {
Expand Down Expand Up @@ -271,6 +271,7 @@ export const FieldTypeDateTime = ({
),
timezonePicker: showTimezonePicker && (
<Autocomplete
autoHighlight
fullWidth
disableClearable
size="small"
Expand All @@ -294,6 +295,11 @@ export const FieldTypeDateTime = ({
setTimezone(value.id);
onTimezoneChange && onTimezoneChange(value.id);
}}
ListboxProps={{
sx: {
maxHeight: 320,
},
}}
/>
),
}}
Expand Down
1 change: 1 addition & 0 deletions src/shell/components/favicon/favicon.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ export default connect((state) => {
name={"favicon"}
onChange={handleImage}
hideDrag
images={[]}
/>
{imageModal && (
<MemoryRouter>
Expand Down
Loading