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

UCP and allowed media hosts #3011

Merged
merged 7 commits into from
Jun 23, 2024
Merged

UCP and allowed media hosts #3011

merged 7 commits into from
Jun 23, 2024

Conversation

modelrailroader
Copy link
Contributor

I moved the ucp to twig while I build the button from #3010

And I added a new config item where users can add media hosts for videos or pictures manually. I think, this really makes sense because otherwise it only can be changed in the code.

phpmyfaq/assets/src/user/ucp.js Outdated Show resolved Hide resolved
phpmyfaq/assets/src/user/ucp.js Outdated Show resolved Hide resolved
phpmyfaq/assets/src/user/ucp.js Outdated Show resolved Hide resolved
phpmyfaq/assets/src/user/ucp.js Outdated Show resolved Hide resolved
phpmyfaq/assets/templates/ucp.twig Outdated Show resolved Hide resolved
phpmyfaq/src/phpMyFAQ/Setup/Installer.php Show resolved Hide resolved
phpmyfaq/src/phpMyFAQ/Helper/FaqHelper.php Outdated Show resolved Hide resolved
phpmyfaq/translations/language_en.php Outdated Show resolved Hide resolved
@modelrailroader
Copy link
Contributor Author

All requested changed are implemented.

@modelrailroader
Copy link
Contributor Author

I resolved the merge conflict.

@thorsten thorsten merged commit b75ab8a into thorsten:main Jun 23, 2024
7 checks passed
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.

2 participants