Staging #231
Merged
Staging #231
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # classes/Event/class.xoctEventRenderer.php # classes/class.xoctMainGUI.php # js/opencast/dist/index.js # js/opencast/src/index.js # lang/ilias_de.lang # lang/ilias_en.lang # plugin.php # sql/dbupdate.php
# Conflicts: # lang/ilias_de.lang # lang/ilias_en.lang # plugin.php # sql/dbupdate.php # src/Model/Config/PluginConfig.php
# Conflicts: # js/opencast/dist/index.js # src/Model/Config/PluginConfig.php
|
@ferishili of course you can open a PR against this branch (https://github.com/srsolutionsag/OpenCast/tree/staging) if you want to use the LocaleTrait now which has been merged already |
|
I did a quick test with all the features and didn't encounter any issues. 👍 |
|
I have provided the final PR against your repo, which completes this staging process. |
Completing the PR
|
Thanks you very much for testing and all contributions! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@ferishili, @dagraf and @reiferschris
I merged the three PRs
in this branch and resolved all conflicts. I cannot test the three features deeply, could you please have a look at this branch (code maybe @ferishili, testing @dagraf and @reiferschris )
I think this is the easiest way to merge those three PRs. the last (#229) will then be easy to adapt.
After merthis this PR here and the fixed version of #229, we are ready for our ILIAS8 lockdown.
This PR increases the plugin version to 5.6.0