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

Folders, sharing and responsive datatables #1000

Merged
merged 19 commits into from
Oct 26, 2020

Conversation

PeterMis
Copy link
Member

…o feature/3.0.0-beta

# FIXED Conflicts:
#	lib/Controller/DisplayGroup.php
#	lib/Controller/Playlist.php
#	lib/routes-web.php
#	lib/routes.php
#	views/campaign-page.twig
#	views/display-page.twig
#	views/displaygroup-page.twig
#	views/layout-page.twig
#	views/library-page.twig
#	views/playlist-page.twig
WIP: First attempt at handling folder permissions
…o feature/3.0.0-beta

# FIXED Conflicts:
#	lib/Controller/Layout.php
#	lib/routes.php
#	views/user-page.twig
#	web/theme/default/css/xibo.css
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.

I have a few minor comments in here to tidy up

lib/Entity/Campaign.php Show resolved Hide resolved
lib/Entity/Campaign.php Show resolved Hide resolved
lib/Entity/Folder.php Show resolved Hide resolved
lib/Entity/Folder.php Show resolved Hide resolved
lib/Factory/TagFactory.php Outdated Show resolved Hide resolved
views/displaygroup-page.twig Outdated Show resolved Hide resolved
Log grid - disabled responsive, we need to better format message column before enabling this I think
…andle user experience with Folder feature disabled
@@ -210,6 +210,7 @@
{{/if}}
{{#if OldMediaId}}
Copy link
Member

Choose a reason for hiding this comment

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

Just noticed this capital O

@PeterMis PeterMis merged commit 15cfc29 into xibosignage:develop Oct 26, 2020
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.

Permissions: Folders and Sharing
2 participants