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

deploy to prod #4960

Merged
merged 74 commits into from
Apr 14, 2024
Merged

deploy to prod #4960

merged 74 commits into from
Apr 14, 2024

Conversation

usu
Copy link
Member

@usu usu commented Apr 14, 2024

No description provided.

manuelmeister and others added 30 commits January 2, 2024 14:17
…ule-entries-on-activity

# Conflicts:
#	frontend/src/components/activity/ScheduleEntry.vue
BacLuc and others added 21 commits April 14, 2024 00:51
That camp1 is more realistic:
activity-progress-labels.yml: add 3 more
activityResponsibles.yml: add 200 (to all activities)
activityResponsibles.yml: add 10
materialItems.yml:
- add 1 to additional_materialList_camp1_1 for each materialnode
- add 200 items to additional_materialList_camp1_1 for materialnode additional_materialNode_camp1_1
materialLists.yml: add 12
activities.yml: add 200
Do not add it to every PR or push for now, run it overnight
and if the label is set on a PR.
We don't know if the tests are flaky, and they need quite some resources.
…y() matcher

Like this you see what was in the array.
api: add performance_test environment which loads more data
Use computed for picasso drag & drop bounds
Update dependency php to v8.3.6
chore(performance): use subresources & uriTemplate property to avoid …
…re/edit-schedule-entries-on-activity

# Conflicts:
#	common/locales/de.json
#	common/locales/en.json
#	common/locales/fr.json
#	common/locales/it.json
#	frontend/src/components/activity/ScheduleEntry.vue
#	frontend/src/components/activity/dialog/DialogActivityForm.vue
#	frontend/src/components/activity/dialog/FormScheduleEntryItem.vue
#	frontend/src/components/program/ScheduleEntries.vue
#	frontend/src/components/program/picasso/PicassoEntry.vue
#	frontend/src/locales/fr.json
…ries-on-activity

feat: Edit schedule entries from activity view
…iod-endpoint

Revert "chore(performance): use subresources & uriTemplate property to avoid …"
…-entries-on-activity

Revert "feat: Edit schedule entries from activity view"
@BacLuc BacLuc temporarily deployed to staging April 14, 2024 11:41 — with GitHub Actions Inactive
@carlobeltrame carlobeltrame temporarily deployed to staging April 14, 2024 11:42 Destroyed
@usu
Copy link
Member Author

usu commented Apr 14, 2024

/fast-forward

@BacLuc BacLuc merged commit 60a925e into prod Apr 14, 2024
136 of 138 checks passed
@BacLuc BacLuc temporarily deployed to prod April 14, 2024 12:19 — with GitHub Actions Inactive
@carlobeltrame carlobeltrame temporarily deployed to prod April 14, 2024 12:19 Destroyed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants