Skip to content

Commit c31238b

Browse files
Merge branch 'next'
2 parents 3472dfd + ebcb391 commit c31238b

File tree

19 files changed

+19
-19
lines changed

19 files changed

+19
-19
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ For discussion around the Opencast Annotation Tool the [mailing list](https://gr
5858

5959
### Current Development of this branch
6060
* [virtUOS, Universität Osnabrück](https://www.virtuos.uni-osnabrueck.de)
61-
* [ELAN e.V.](https://elan-ev.de)
61+
* [elan e.V.](https://elan-ev.de)
6262

6363
### Contact
6464
* Rüdiger Rolf, [[email protected]](mailto:[email protected]), Phone: +49 541 969 6511

frontend/js/alerts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, ELAN e.V., Germany
2+
* Copyright 2018, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/configuration.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, ELAN e.V., Germany
2+
* Copyright 2018, elan e.V., Germany
33
* Copyright 2012, Entwine GmbH, Switzerland
44
* Licensed under the Educational Community License, Version 2.0
55
* (the "License"); you may not use this file except in compliance

frontend/js/event-target.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, ELAN e.V., Germany
2+
* Copyright 2018, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/integrations/search.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, ELAN e.V., Germany
2+
* Copyright 2018, elan e.V., Germany
33
* Copyright 2012, Entwine GmbH, Switzerland
44
* Licensed under the Educational Community License, Version 2.0
55
* (the "License"); you may not use this file except in compliance

frontend/js/models/resource.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2017, ELAN e.V., Germany
2+
* Copyright 2017, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/util.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2018, ELAN e.V., Germany
2+
* Copyright 2018, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/category-modal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021, ELAN e.V., Germany
2+
* Copyright 2021, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/category-modal/label.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021, ELAN e.V., Germany
2+
* Copyright 2021, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/modal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021, ELAN e.V., Germany
2+
* Copyright 2021, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/print.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2017, ELAN e.V., Germany
2+
* Copyright 2017, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/scale-modal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021, ELAN e.V., Germany
2+
* Copyright 2021, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/scale-modal/scale-editor.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021, ELAN e.V., Germany
2+
* Copyright 2021, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/scale-modal/scale-value.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021, ELAN e.V., Germany
2+
* Copyright 2021, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/scale-modal/scale-values.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021, ELAN e.V., Germany
2+
* Copyright 2021, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/timeline-group.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2019, ELAN e.V., Germany
2+
* Copyright 2019, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

frontend/js/views/track-modal.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2021, ELAN e.V., Germany
2+
* Copyright 2021, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

opencast-backend/annotation-impl/src/main/java/org/opencast/annotation/endpoint/util/Responses.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2017, ELAN e.V., Germany
2+
* Copyright 2017, elan e.V., Germany
33
* Licensed under the Educational Community License, Version 2.0
44
* (the "License"); you may not use this file except in compliance
55
* with the License. You may obtain a copy of the License at

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<id>jkniephoff</id>
5757
<name>Julian Kniephoff</name>
5858
<email>[email protected]</email>
59-
<organization>ELAN e.V.</organization>
59+
<organization>elan e.V.</organization>
6060
<organizationUrl>https://elan-ev.de</organizationUrl>
6161
<timezone>Europe/Berlin</timezone>
6262
</developer>

0 commit comments

Comments
 (0)