Update develop branch from official repo #3
Merged
Conversation
This file contains 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
This endpoint will no longer be part of the public API.
Unfortunately it is still necessary here, because the tests rely on the fact that everything is cleaned up in between test cases, and I don't have access to the underlying service at this point.
This also uses the unminified version for now, to aid in debugging. We should really let the build system minify these files.
MediaElement's fill-mode needs access to the dimensions of its parent element in order to adapt its own elements. This is impossible when they are not part of the DOM, yet.
This fixes Markdown formatting issues and dangling URLs in the documentation.
This is just a cosmetic change; you probably have to specify the version explicity, anyway. But at least it signals the versions supported.
Now that Opencast < 5 is well beyond it's support, we can drop this hack to work around the module renaming.
…-version Raise supported Opencast version
…counts Made comment counts update recursively
Translate GoldenLayout tab titles on the fly
…-firefox-hotfix Preliminary fix for category editing controls in Firefox
Modern versions of Maven allow us to specify the version of the parent using a property from said parent.
…apper Use wrapper provided by MediaElement.js to listen for player events
Remove redundant shim configuration
Enable embedding the annotation tool in an `iframe`
Remove the `/reset`-endpoint (from the public API at least)
Simplify the POM structure
Without it, the `maven-frontend-plugin` picks whatever the specified `node` version comes with, which should be fine. And if it is not, we will notice it hopefully, thanks to `--engine-strict`.
This profile will be deactivated by `maven.test.skip`, so that we don't even look at it when we skip tests. This is needed to make building (without tests) against Opencast 6 work again.
It does not actually goggle the annotations, but the pane to create new ones. Plus: We need that other name now. ;)
Implement shortcuts for the first 9 categories/labels/scale values
Add ability to toggle free text annotations
Enable global play/pause using the spacebar
Change loop controller constraints when changing the active loop
mliradelc
added a commit
that referenced
this pull request
Jun 24, 2019
# This is the 1st commit message: Add HLS support Update files from develop branch Fixed German translation file syntax Closes opencast#173. Add Emacs configuration `npm update && npm audit fix` Changed `less` plugin for `grunt` This switches from `assemble-less` to `grunt-contrib-less` and updates the latter at least a bit, all in order to get rid of a few security vulnerabilities. Further updates pending mostly because of incompatibilities. Updated `grunt-contrib-less` to the latest version More package updates # This is the commit message #2: Removed unused grunt plugin # This is the commit message #3: Removed some unused dependencies # This is the commit message #4: Improved code quality # This is the commit message #5: Removed some dead code and obsolete comments # This is the commit message #6: Got rid of `box-sizing`-'polyfill" Box sizing has good enough support now. If we still want backwards compat, I feel like a CSS postprocessor would be a better approach. # This is the commit message opencast#7: Simplified some event handling code # This is the commit message opencast#8: Refactored comment model slightly Comments should be creatable without text. But I **do** see the problem this brings. So why not make the empty string the default text? ;) # This is the commit message opencast#9: Refactored some view cleanup and deleted related dead code # This is the commit message opencast#10: Allowed editing multiple annotations simultaneously # This is the commit message opencast#11: Use `maven-enforcer-plugin` instead of `prerequisites` Fixes opencast#187. # This is the commit message opencast#12: Pinned `maven-install-plugin` Fixes opencast#185. # This is the commit message opencast#13: Added an `npm start` script
mliradelc
added a commit
that referenced
this pull request
Jun 24, 2019
# This is the 1st commit message: Add HLS support Update files from develop branch Fixed German translation file syntax Closes opencast#173. Add Emacs configuration `npm update && npm audit fix` Changed `less` plugin for `grunt` This switches from `assemble-less` to `grunt-contrib-less` and updates the latter at least a bit, all in order to get rid of a few security vulnerabilities. Further updates pending mostly because of incompatibilities. Updated `grunt-contrib-less` to the latest version More package updates # This is the commit message #2: Removed unused grunt plugin # This is the commit message #3: Removed some unused dependencies # This is the commit message #4: Improved code quality # This is the commit message #5: Removed some dead code and obsolete comments # This is the commit message #6: Got rid of `box-sizing`-'polyfill" Box sizing has good enough support now. If we still want backwards compat, I feel like a CSS postprocessor would be a better approach. # This is the commit message opencast#7: Simplified some event handling code # This is the commit message opencast#8: Refactored comment model slightly Comments should be creatable without text. But I **do** see the problem this brings. So why not make the empty string the default text? ;) # This is the commit message opencast#9: Refactored some view cleanup and deleted related dead code # This is the commit message opencast#10: Allowed editing multiple annotations simultaneously # This is the commit message opencast#11: Use `maven-enforcer-plugin` instead of `prerequisites` Fixes opencast#187. # This is the commit message opencast#12: Pinned `maven-install-plugin` Fixes opencast#185. # This is the commit message opencast#13: Added an `npm start` script # This is the commit message opencast#14: Updated `grunt-cli` # This is the commit message opencast#15: Improved code quality
mliradelc
added a commit
that referenced
this pull request
Jun 24, 2019
# This is the 1st commit message: Add HLS support Update files from develop branch Fixed German translation file syntax Closes opencast#173. Add Emacs configuration `npm update && npm audit fix` Changed `less` plugin for `grunt` This switches from `assemble-less` to `grunt-contrib-less` and updates the latter at least a bit, all in order to get rid of a few security vulnerabilities. Further updates pending mostly because of incompatibilities. Updated `grunt-contrib-less` to the latest version More package updates # This is the commit message #2: Removed unused grunt plugin # This is the commit message #3: Removed some unused dependencies # This is the commit message #4: Improved code quality # This is the commit message #5: Removed some dead code and obsolete comments # This is the commit message #6: Got rid of `box-sizing`-'polyfill" Box sizing has good enough support now. If we still want backwards compat, I feel like a CSS postprocessor would be a better approach. # This is the commit message opencast#7: Simplified some event handling code # This is the commit message opencast#8: Refactored comment model slightly Comments should be creatable without text. But I **do** see the problem this brings. So why not make the empty string the default text? ;) # This is the commit message opencast#9: Refactored some view cleanup and deleted related dead code # This is the commit message opencast#10: Allowed editing multiple annotations simultaneously # This is the commit message opencast#11: Use `maven-enforcer-plugin` instead of `prerequisites` Fixes opencast#187. # This is the commit message opencast#12: Pinned `maven-install-plugin` Fixes opencast#185. # This is the commit message opencast#13: Added an `npm start` script # This is the commit message opencast#14: Updated `grunt-cli` # This is the commit message opencast#15: Improved code quality # This is the commit message opencast#16: Revert back to a stable version of `grunt-cli` Closes opencast#188. # This is the commit message opencast#17: Fix XACML parsing of rules OAT filters for ACL rules with the wrong tag name "rules" instead of "Rule". # This is the commit message opencast#18: Fix exception during export when no e-mail is set # This is the commit message opencast#19: Simplified some of the export functions a bit # This is the commit message opencast#20: Remove unused and vulnerable dependency # This is the commit message opencast#21: Updated demo link in the README Changed the README to include a link to a working demo # This is the commit message opencast#22: Update README.md # This is the commit message opencast#23: Update checkstyle to fix a vulnerability # This is the commit message opencast#24: Improve the style of the checkstyle configuration # This is the commit message opencast#25: Update `grunt`
mliradelc
pushed a commit
that referenced
this pull request
Jul 5, 2021
…ine-categories Resolve merge conflicts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.