Skip to content

Commit ae9b7f7

Browse files
JulianKniephoffJulianKniephoff
committed
Merge branch 'update' into stable
2 parents 6268e84 + 99a4cb1 commit ae9b7f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+733
-478
lines changed

‎frontend/js/integrations/search.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ define([
8080
data: "id=" + mediaPackageId + "&limit=1",
8181
dataType: "json"
8282
}).then(function (data) {
83-
return data["search-results"].result;
83+
return data.result[0];
8484
});
8585
var mediaPackage = searchResult.then(function (result) {
8686
return result.mediapackage;

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/Annotation.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
65
*
7-
* http://www.osedu.org/licenses/ECL-2.0
86
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
11+
*
12+
* http://opensource.org/licenses/ecl2.txt
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
1621

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/Category.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
65
*
7-
* http://www.osedu.org/licenses/ECL-2.0
86
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
11+
*
12+
* http://opensource.org/licenses/ecl2.txt
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
1621

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/Comment.java‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
65
*
7-
* http://www.osedu.org/licenses/ECL-2.0
86
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
11+
*
12+
* http://opensource.org/licenses/ecl2.txt
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
21+
1622
package org.opencast.annotation.api;
1723

1824
import org.opencastproject.util.data.Option;

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/ExtendedAnnotationException.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
5+
*
6+
*
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
611
*
7-
* http://www.osedu.org/licenses/ECL-2.0
12+
* http://opensource.org/licenses/ecl2.txt
813
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
1621

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/ExtendedAnnotationService.java‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
65
*
7-
* http://www.osedu.org/licenses/ECL-2.0
86
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
11+
*
12+
* http://opensource.org/licenses/ecl2.txt
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
21+
1622
package org.opencast.annotation.api;
1723

1824
import org.opencastproject.mediapackage.MediaPackage;

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/Label.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
65
*
7-
* http://www.osedu.org/licenses/ECL-2.0
86
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
11+
*
12+
* http://opensource.org/licenses/ecl2.txt
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
1621

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/Resource.java‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
65
*
7-
* http://www.osedu.org/licenses/ECL-2.0
86
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
11+
*
12+
* http://opensource.org/licenses/ecl2.txt
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
21+
1622
package org.opencast.annotation.api;
1723

1824
import org.opencastproject.util.data.Option;

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/Scale.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
65
*
7-
* http://www.osedu.org/licenses/ECL-2.0
86
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
11+
*
12+
* http://opensource.org/licenses/ecl2.txt
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
1621

‎opencast-backend/annotation-api/src/main/java/org/opencast/annotation/api/ScaleValue.java‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
/**
2-
* Copyright 2012, Entwine GmbH, Switzerland
3-
* Licensed under the Educational Community License, Version 2.0
4-
* (the "License"); you may not use this file except in compliance
5-
* with the License. You may obtain a copy of the License at
1+
/*
2+
* Licensed to The Apereo Foundation under one or more contributor license
3+
* agreements. See the NOTICE file distributed with this work for additional
4+
* information regarding copyright ownership.
65
*
7-
* http://www.osedu.org/licenses/ECL-2.0
86
*
9-
* Unless required by applicable law or agreed to in writing,
10-
* software distributed under the License is distributed on an "AS IS"
11-
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12-
* or implied. See the License for the specific language governing
13-
* permissions and limitations under the License.
7+
* The Apereo Foundation licenses this file to you under the Educational
8+
* Community License, Version 2.0 (the "License"); you may not use this file
9+
* except in compliance with the License. You may obtain a copy of the License
10+
* at:
11+
*
12+
* http://opensource.org/licenses/ecl2.txt
13+
*
14+
* Unless required by applicable law or agreed to in writing, software
15+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
16+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
17+
* License for the specific language governing permissions and limitations under
18+
* the License.
1419
*
1520
*/
1621

0 commit comments

Comments
 (0)