Merge branch 'stable' into next

opencast · Dec 11, 2024 · ebcb391 · ebcb391
2 parents 9969b5a + 6268e84
commit ebcb391
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ For discussion around the Opencast Annotation Tool the [mailing list](https://gr
 
 ### Current Development of this branch
 * [virtUOS, Universität Osnabrück](https://www.virtuos.uni-osnabrueck.de)
-* [ELAN e.V.](https://elan-ev.de)
+* [elan e.V.](https://elan-ev.de)
 
 ### Contact
 * Rüdiger Rolf, [[email protected]](mailto:[email protected]), Phone: +49 541 969 6511

diff --git a/frontend/js/alerts.js b/frontend/js/alerts.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2018, ELAN e.V., Germany
+ *  Copyright 2018, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/configuration.js b/frontend/js/configuration.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2018, ELAN e.V., Germany
+ *  Copyright 2018, elan e.V., Germany
  *  Copyright 2012, Entwine GmbH, Switzerland
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance

diff --git a/frontend/js/event-target.js b/frontend/js/event-target.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2018, ELAN e.V., Germany
+ *  Copyright 2018, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/integrations/search.js b/frontend/js/integrations/search.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2018, ELAN e.V., Germany
+ *  Copyright 2018, elan e.V., Germany
  *  Copyright 2012, Entwine GmbH, Switzerland
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance

diff --git a/frontend/js/models/resource.js b/frontend/js/models/resource.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017, ELAN e.V., Germany
+ *  Copyright 2017, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/util.js b/frontend/js/util.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2018, ELAN e.V., Germany
+ *  Copyright 2018, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/category-modal.js b/frontend/js/views/category-modal.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2021, ELAN e.V., Germany
+ *  Copyright 2021, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/category-modal/label.js b/frontend/js/views/category-modal/label.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2021, ELAN e.V., Germany
+ *  Copyright 2021, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/modal.js b/frontend/js/views/modal.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2021, ELAN e.V., Germany
+ *  Copyright 2021, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/print.js b/frontend/js/views/print.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017, ELAN e.V., Germany
+ *  Copyright 2017, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/scale-modal.js b/frontend/js/views/scale-modal.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2021, ELAN e.V., Germany
+ *  Copyright 2021, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/scale-modal/scale-editor.js b/frontend/js/views/scale-modal/scale-editor.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2021, ELAN e.V., Germany
+ *  Copyright 2021, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/scale-modal/scale-value.js b/frontend/js/views/scale-modal/scale-value.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2021, ELAN e.V., Germany
+ *  Copyright 2021, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/scale-modal/scale-values.js b/frontend/js/views/scale-modal/scale-values.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2021, ELAN e.V., Germany
+ *  Copyright 2021, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/timeline-group.js b/frontend/js/views/timeline-group.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2019, ELAN e.V., Germany
+ *  Copyright 2019, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/frontend/js/views/track-modal.js b/frontend/js/views/track-modal.js
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2021, ELAN e.V., Germany
+ *  Copyright 2021, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/...ackend/annotation-impl/src/main/java/org/opencast/annotation/endpoint/util/Responses.java b/...ackend/annotation-impl/src/main/java/org/opencast/annotation/endpoint/util/Responses.java
@@ -1,5 +1,5 @@
 /**
- *  Copyright 2017, ELAN e.V., Germany
+ *  Copyright 2017, elan e.V., Germany
  *  Licensed under the Educational Community License, Version 2.0
  *  (the "License"); you may not use this file except in compliance
  *  with the License. You may obtain a copy of the License at

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
       <id>jkniephoff</id>
       <name>Julian Kniephoff</name>
       <email>[email protected]</email>
-      <organization>ELAN e.V.</organization>
+      <organization>elan e.V.</organization>
       <organizationUrl>https://elan-ev.de</organizationUrl>
       <timezone>Europe/Berlin</timezone>
     </developer>