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

Feature/kopff merge into dev #2828

Merged
merged 29 commits into from
Dec 18, 2024
Merged

Feature/kopff merge into dev #2828

merged 29 commits into from
Dec 18, 2024

Conversation

maurofmferrao
Copy link
Member

No description provided.

maurofmferrao and others added 27 commits August 1, 2024 09:58
@maurofmferrao
Upgrade Node.js and npm packages (#2663)
134fa83 
relates to xibosignageltd/xibo-private#792
@maurofmferrao
Toolbox Table view: Add upload option (#2687)
95c75c9 
relates to xibosignageltd/xibo-private#809
@dasgarner
Merge remote-tracking branch 'origin/develop' into feature/kopff_merg…
89fc147 
…e_410

# Conflicts:
#	package-lock.json
@dasgarner
Chore: npm install after merge
2576ed5
@dasgarner
Merge pull request #2724 from xibosignage/feature/kopff_merge_410
fb0ccea 
Merge 4.1.0 into kopff
@maurofmferrao
Folders : Share multiple in one action (#2723)
0fd918a 
relates to xibosignage/xibo#3407
@maurofmferrao
Fix for Kopff build (#2738)
c71f850
@mgbaybay
Pixabay: Get 1080p videos by default instead of 4k (#2729)
47c536e
@nadzpogi
Campaign: Layout assignment filtering improvements (#2739)
05fd763 
relates to xibosignage/xibo#3482
@nadzpogi
Auditing: Log mediaId when adding or deleting a widget, if applicable (…
afc4470 
…#2733)

relates to xibosignageltd/xibo-private#856
@nadzpogi
Feature: Emergency Alerts & Messages (Common Alert Protocol) (#2728)
258160e 
relates to xibosignageltd/xibo-private#833
@maurofmferrao
Javascript structure refactoring: First version relates to xibosignag…
c78d293 
…eltd/xibo-private#842 (#2761)
@nadzpogi
Playlists: Add folder-based media filtering to dynamic playlists (#2732)
5f9c853 
relates to xibosignageltd/xibo-private#841
@maurofmferrao
Javascript structure refactoring: Second version (#2781)
e370397 
relates to xibosignageltd/xibo-private#842

 - xibo-cms.js datatables moved to a new file
 - authed.twig and base.twig translations, variables and configs moved to dedicated files
  - translations and vars for editors moved to dedicated files
 - codemirror replaces heavier monaco code editor
 - old region forms removed
 - developer template page migrated
 - region and widget edit request changed to not display form
 - region and widget delete form route removed
 - file upload js is bundled
@maurofmferrao
Code Inputs: Expanded view (#2785)
d9226db 
relates to xibosignageltd/xibo-private#829
@maurofmferrao
Editor: Clear layout button (#2793)
1c19d67 
relates to xibosignageltd/xibo-private#866
@maurofmferrao
CMS navigation menu: Add active class (#2786)
164079b 
relates to xibosignage/xibo#3526
@maurofmferrao
Upgrade pdfjs-dist dependency (#2802)
be34694 
relates to xibosignage/xibo#3470

- Use isEvalSupported to prevent vulnerability
@maurofmferrao
Toolbox: Add description to module templates (#2788)
cd97f76 
relates to xibosignageltd/xibo-private#851
@maurofmferrao
Editor: Menu select creates JS error on console (#2807)
7506207 
relates to xibosignageltd/xibo-private#878
@maurofmferrao
Improve front-end validation (#2801)
977391f 
relates to xibosignageltd/xibo-private#867
@maurofmferrao
Elements in groups: Align to corners/centre (#2810)
ab62984 
relates to xibosignageltd/xibo-private#737
@maurofmferrao
Image widget: Add with default ratio (#2811)
54b15fc 
relates to xibosignageltd/xibo-private#760
@dasgarner
Errors: sanitize output (#2820)
035bf6a 
fixes xibosignage/xibo#3554
@dasgarner
User: force password change shouldn't be accessible unless set. (#2821)
8d12174 
fixes xibosignage/xibo#3555
@maurofmferrao
Layout Editor: Decrease the number of back-end requests (#2824)
e4f44b0 
relates to xibosignageltd/xibo-private#873
@maurofmferrao
Merge remote-tracking branch 'origin/kopff' into feature/kopff_merge_…
6ec9529 
…into_dev
@maurofmferrao maurofmferrao self-assigned this Dec 11, 2024
dasgarner
dasgarner previously approved these changes Dec 11, 2024
View reviewed changes
Copy link
Member

@dasgarner dasgarner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Structure and commit list looks good

dasgarner
dasgarner previously approved these changes Dec 12, 2024
View reviewed changes
ifarzana
ifarzana previously approved these changes Dec 17, 2024
View reviewed changes
Copy link
Contributor

@ifarzana ifarzana left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approve to build the container

@maurofmferrao maurofmferrao dismissed stale reviews from ifarzana and dasgarner via a56f080 December 17, 2024 15:39
@ifarzana
Copy link
Contributor

TEST: /Layout, /Schedule, /Display END

@github-actions GitHub Actions
Copy link

Test Suite: failed ❌
https://github.com/xibosignage/xibo-cms/actions/runs/12391832344

@ifarzana
Copy link
Contributor

TEST: login.cy.js END

@github-actions GitHub Actions
Copy link

Test Suite: succeeded ✅
https://github.com/xibosignage/xibo-cms/actions/runs/12392167495

@dasgarner dasgarner merged commit f7f6502 into develop Dec 18, 2024
3 checks passed
@dasgarner dasgarner deleted the feature/kopff_merge_into_dev branch December 18, 2024 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ifarzana ifarzana ifarzana approved these changes

@dasgarner dasgarner dasgarner left review comments

Assignees

@maurofmferrao maurofmferrao

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@maurofmferrao @ifarzana @dasgarner @mgbaybay @nadzpogi