forked from opencast-ilias/OpenCast
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Issue 13 #4
Open
chfsx
wants to merge
18
commits into
elan-ev:issue-13
Choose a base branch
from
srsolutionsag:issue-13
base: issue-13
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Issue 13 #4
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
* [FIX] Memory Limit Issue with large files to upload * [FIX] Show WaitOverlay on Form-Submit * Updated Changelog
Bumps [semver](https://github.com/npm/node-semver) from 7.3.5 to 7.5.4. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](npm/node-semver@v7.3.5...v7.5.4) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.2.1 to 4.2.3. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](socketio/socket.io-parser@4.2.1...4.2.3) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [engine.io](https://github.com/socketio/engine.io) to 6.4.2 and updates ancestor dependency [socket.io](https://github.com/socketio/socket.io). These dependencies need to be updated together. Updates `engine.io` from 6.2.1 to 6.4.2 - [Release notes](https://github.com/socketio/engine.io/releases) - [Changelog](https://github.com/socketio/engine.io/blob/main/CHANGELOG.md) - [Commits](socketio/engine.io@6.2.1...6.4.2) Updates `socket.io` from 4.5.4 to 4.6.1 - [Release notes](https://github.com/socketio/socket.io/releases) - [Changelog](https://github.com/socketio/socket.io/blob/main/CHANGELOG.md) - [Commits](socketio/socket.io@4.5.4...4.6.1) --- updated-dependencies: - dependency-name: engine.io dependency-type: indirect - dependency-name: socket.io dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
commit f4a44a9 Author: ferishili <[email protected]> Date: Thu Nov 16 14:50:52 2023 +0100 fix: activating ingest service properly commit b6f58fa Author: ferishili <[email protected]> Date: Thu Nov 16 09:05:42 2023 +0100 upgrade oc-php-lib to v1.5.0: php8.2 compat.
…ups) commit a31cf23 Author: ferishili <[email protected]> Date: Thu Nov 23 13:13:11 2023 +0100 bump version commit 2aca5ec Merge: 058c399 b67a7c6 Author: ferishili <[email protected]> Date: Thu Nov 23 13:12:31 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 058c399 Author: ferishili <[email protected]> Date: Mon Nov 20 17:24:48 2023 +0100 new LocaleTraits + fix fallback display names commit 8d4f167 Author: Christoph Reifers <[email protected]> Date: Mon Nov 20 13:11:10 2023 +0100 update language variables for sub-usages commit c21a67c Merge: 3abdfdc 20b22ab Author: ferishili <[email protected]> Date: Wed Nov 15 15:35:55 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 3abdfdc Author: ferishili <[email protected]> Date: Fri Nov 10 11:57:46 2023 +0100 bump plugin version to keep updates in place commit 5d29932 Merge: e145e92 e1a8b5c Author: ferishili <[email protected]> Date: Fri Nov 10 11:54:10 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit e145e92 Author: ferishili <[email protected]> Date: Wed Nov 8 09:31:55 2023 +0100 add sub props into usage: according to change reqs commit fc7f013 Author: ferishili <[email protected]> Date: Tue Nov 7 16:59:19 2023 +0100 $ilDB->createTable: according to changes req commit c23bcea Author: ferishili <[email protected]> Date: Tue Nov 7 15:31:49 2023 +0100 get rid of static: according to change reqs commit d2396e9 Author: ferishili <[email protected]> Date: Tue Nov 7 15:15:10 2023 +0100 add renderDropdowns desc: according to change reqs commit 7fbf353 Author: ferishili <[email protected]> Date: Tue Nov 7 15:04:36 2023 +0100 POST to const: according to change reqs commit ffce222 Author: ferishili <[email protected]> Date: Tue Nov 7 14:38:08 2023 +0100 fix: double $$ commit 92cd27b Author: ferishili <[email protected]> Date: Tue Nov 7 14:37:26 2023 +0100 GET to constr: according to change reqs commit 87ae4d9 Author: ferishili <[email protected]> Date: Tue Nov 7 13:12:46 2023 +0100 3rd value in_array: according to change requests commit 38a7894 Author: ferishili <[email protected]> Date: Tue Nov 7 10:41:48 2023 +0100 apply snake_case: according to change requests commit 0919944 Author: ferishili <[email protected]> Date: Tue Nov 7 10:06:55 2023 +0100 move related js: according to change request commit 3de7def Merge: 04adccf 94f02e4 Author: ferishili <[email protected]> Date: Fri Nov 3 10:12:17 2023 +0100 Merge branch 'main' into issue-182_oc-php-lib commit 04adccf Merge: 5c314a7 465b302 Author: ferishili <[email protected]> Date: Tue Oct 24 15:53:06 2023 +0200 Merge branch 'main' into issue-182_oc-php-lib commit 5c314a7 Author: ferishili <[email protected]> Date: Tue Oct 24 14:38:08 2023 +0200 fix: findOrGetInstance to apply cache! commit 1f97924 Author: ferishili <[email protected]> Date: Thu Oct 12 09:57:43 2023 +0200 final touches commit 3212483 Author: ferishili <[email protected]> Date: Wed Oct 11 15:56:04 2023 +0200 delete groups missign sub unlinking commit f00b724 Author: ferishili <[email protected]> Date: Wed Oct 11 15:33:59 2023 +0200 add display_name and extras columns to tables commit 2684abd Author: ferishili <[email protected]> Date: Wed Oct 11 12:19:54 2023 +0200 ext_dl_source commit 113628c Author: ferishili <[email protected]> Date: Thu Oct 5 17:21:39 2023 +0200 fix: download the items according to their usages. commit 9defb2c Author: ferishili <[email protected]> Date: Thu Oct 5 11:23:58 2023 +0200 fix: variable unmachted! commit ea3ccb8 Author: ferishili <[email protected]> Date: Wed Oct 4 15:01:32 2023 +0200 fix: dropdown rending in event tiles commit 078e8ce Merge: 87f01b3 5c925c2 Author: ferishili <[email protected]> Date: Thu Sep 7 10:41:29 2023 +0200 Merge branch 'main' into issue-182_oc-php-lib commit 87f01b3 Merge: 43e70fe 0cf065f Author: ferishili <[email protected]> Date: Fri Aug 25 16:30:36 2023 +0200 Merge branch 'oc-php-lib' into issue-182_oc-php-lib commit 43e70fe Author: ferishili <[email protected]> Date: Fri Aug 25 14:38:23 2023 +0200 refactoring rebase fixes and syncs commit e03eb89 Merge: d2d4bc6 63f88f9 Author: ferishili <[email protected]> Date: Thu Aug 24 17:00:02 2023 +0200 Merge branch 'oc-php-lib' into issue-182_oc-php-lib commit d2d4bc6 Author: ferishili <[email protected]> Date: Thu Aug 17 13:29:49 2023 +0200 fix type restriction, when importing setting commit 22bdedf Merge: 922c921 bc9b2a1 Author: ferishili <[email protected]> Date: Thu Aug 17 13:22:04 2023 +0200 Merge branch 'main' into issue-182 commit 922c921 Author: ferishili <[email protected]> Date: Mon Aug 14 11:18:30 2023 +0200 first draft
# 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
I close this since I think it's easier to use opencast-ilias#231 to proceed with all the open PRs |
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.
This PR should resolve the conflicts in that branch