Manual license edit of remaining files

crates/i18n/src/sprintf/grammar.pest

@@ -1,16 +1,8 @@
-// Copyright 2023 The Matrix.org Foundation C.I.C.
+// Copyright 2024 New Vector Ltd.
+// Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
+// SPDX-License-Identifier: AGPL-3.0-only
-// you may not use this file except in compliance with the License.
+// Please see LICENSE in the repository root for full details.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 message = _{ (text | percent | placeholder)* ~ EOI }
 

crates/iana-codegen/src/main.rs

@@ -75,19 +75,11 @@ impl Display for File {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         writeln!(
             f,
-            r#"// Copyright 2023 The Matrix.org Foundation C.I.C.
+            r#"// Copyright 2024 New Vector Ltd.
+// Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
+// SPDX-License-Identifier: AGPL-3.0-only
-// you may not use this file except in compliance with the License.
+// Please see LICENSE in the repository root for full details.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 #![allow(clippy::doc_markdown)]
 

frontend/index.html

@@ -1,17 +1,9 @@
 <!--
+Copyright 2024 New Vector Ltd.
 Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
 -->
 
 <!-- Must be kept in sync with templates/app.html -->

templates/app.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {# Must be kept in sync with frontend/index.html #}
 {% set _ = translator(lang) %}

templates/base.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021, 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% set _ = translator(lang) %}
 

templates/components/back_to_client.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% macro link(text, uri, mode, params, type="button", kind="primary", destructive=False) %}
   {% if type == "button" %}

templates/components/button.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021-2023 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% macro link(text, href="#", class="", size="lg") %}
   <a class="cpd-button {{ class }}" data-kind="primary" data-size="{{ size }}" href="{{ href | prefix_url }}">{{ text }}</a>

templates/components/captcha.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% macro form(class="") -%}
   {%- if captcha|default(False) -%}

templates/components/errors.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% macro form_error_message(error) -%}
   {% if error.kind == "invalid_credentials" %}

templates/components/field.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021, 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% set cnt = counter() %}
 

templates/components/footer.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2023 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 <footer class="legal-footer">
   {%- if branding.policy_uri or branding.tos_uri -%}
@@ -38,4 +30,4 @@ limitations under the License.
   {%- if branding.imprint -%}
     <p class="imprint">{{ branding.imprint }}</p>
   {%- endif -%}
-</footer>
+</footer>

templates/components/icon.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2023 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {# Regenerate with the following shell script:
 
@@ -1065,4 +1057,3 @@ done
   <path d="M4 20c-.55 0-1.02-.196-1.413-.587A1.926 1.926 0 0 1 2 18V6c0-.55.196-1.02.587-1.412A1.926 1.926 0 0 1 4 4h16c.55 0 1.02.196 1.413.588.391.391.587.862.587 1.412v12c0 .55-.196 1.02-.587 1.413A1.926 1.926 0 0 1 20 20H4Zm0-2h16V8H4v10Z"/>
 </svg>
 {% endmacro %}
-

templates/components/idp_brand.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2023 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% macro logo(brand, class="") -%}
     {% if brand == "google" -%}

templates/components/logout.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% macro button(text, csrf_token, as_link=false, post_logout_action={}) %}
   <form method="POST" action="{{ "/logout" | prefix_url }}" class="inline-flex">
@@ -27,4 +19,3 @@ limitations under the License.
     {% endif %}
   </form>
 {% endmacro %}
-

templates/components/scope.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2023 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% macro list(scopes) %}
   <ul>

templates/emails/recovery.html

@@ -1,17 +1,9 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
 -#}
 
 {%- set _ = translator(lang) -%}
@@ -38,8 +30,8 @@ limitations under the License.
     <a id="button" href="{{ recovery_link }}" target="_blank" style="
         display: inline-block;
         transition: background-color 0.1s ease;
-        font-size: 18px; 
+        font-size: 18px;
-        font-size: 1.125rem; 
+        font-size: 1.125rem;
         font-weight: 600;
         color: #FFF;
         background-color: #1B1D22;
@@ -52,4 +44,4 @@ limitations under the License.
     <br />
     {{ _("mas.emails.recovery.you_can_ignore") }}
 </body>
-</html>
+</html>

templates/emails/recovery.subject

@@ -1,17 +1,9 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
 -#}
 
 {%- set _ = translator(lang) -%}

templates/emails/recovery.txt

@@ -1,17 +1,9 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
 -#}
 
 {%- set _ = translator(lang) -%}
@@ -21,4 +13,4 @@ limitations under the License.
 
     {{ recovery_link }}
 
-{{ _("mas.emails.recovery.you_can_ignore") }}
+{{ _("mas.emails.recovery.you_can_ignore") }}

templates/emails/verification.html

@@ -1,17 +1,9 @@
 {#
-Copyright 2021, 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
 -#}
 
 {%- set _ = translator(lang) -%}

templates/emails/verification.subject

@@ -1,17 +1,9 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
 -#}
 
 {%- set _ = translator(lang) -%}

templates/emails/verification.txt

@@ -1,17 +1,9 @@
 {#
-Copyright 2021, 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
 -#}
 
 {%- set _ = translator(lang) -%}

templates/form_post.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 <!DOCTYPE html>
 <html>

templates/pages/404.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2023 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/account/emails/add.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/account/emails/verify.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/consent.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/device_consent.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2023 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 
@@ -165,4 +157,3 @@ limitations under the License.
     </header>
   {% endif %}
 {% endblock content %}
-

templates/pages/device_link.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 
@@ -48,4 +40,3 @@ limitations under the License.
     {{ button.button(text=_("action.continue")) }}
   </form>
 {% endblock content %}
-

templates/pages/error.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {# Sometimes we don't have the language set, so we default to english #}
 {% set lang = lang or "en" %}

templates/pages/index.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/login.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021, 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 
@@ -58,7 +50,7 @@ limitations under the License.
         {% call(f) field.field(label=_("common.password"), name="password", form_state=form) %}
           <input {{ field.attributes(f) }} class="cpd-text-control" type="password" autocomplete="password" required />
         {% endcall %}
-        
+
         {% if features.account_recovery %}
           {{ button.link_text(text=_("mas.login.forgot_password"), href="/recover", class="self-center") }}
         {% endif %}

templates/pages/policy_violation.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 
@@ -58,4 +50,3 @@ limitations under the License.
     {% endif %}
   </main>
 {% endblock content %}
-

templates/pages/reauth.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 
@@ -60,4 +52,3 @@ limitations under the License.
     </div>
   </main>
 {% endblock content %}
-

templates/pages/recovery/consumed.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/recovery/disabled.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/recovery/expired.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/recovery/finish.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/recovery/progress.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/recovery/start.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/register.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2021, 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2021-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/sso.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/upstream_oauth2/do_register.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/upstream_oauth2/link_mismatch.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/pages/upstream_oauth2/suggest_link.html

@@ -1,18 +1,10 @@
 {#
-Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2024 New Vector Ltd.
+Copyright 2022-2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {% extends "base.html" %}
 

templates/swagger/doc.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 <!DOCTYPE html>
 <html lang="en">

templates/swagger/oauth2-redirect.html

@@ -1,18 +1,10 @@
 {#
+Copyright 2024 New Vector Ltd.
 Copyright 2024 The Matrix.org Foundation C.I.C.
 
-Licensed under the Apache License, Version 2.0 (the "License");
+SPDX-License-Identifier: AGPL-3.0-only
-you may not use this file except in compliance with the License.
+Please see LICENSE in the repository root for full details.
-You may obtain a copy of the License at
+-#}
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
 
 {# This is taken from the swagger-ui/dist/oauth2-redirect.html file #}
 

tools/syn2mas/.eslintrc.cjs

@@ -5,19 +5,10 @@
 // Please see LICENSE in the repository root for full details.
 
 const HEADER_TEMPLATE = `\
-// Copyright %%CURRENT_YEAR%% The Matrix.org Foundation C.I.C.
+// Copyright %%CURRENT_YEAR%% New Vector Ltd.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
+// SPDX-License-Identifier: AGPL-3.0-only
-// you may not use this file except in compliance with the License.
+// Please see LICENSE in the repository root for full details.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 `;
 

tools/syn2mas/src/index.ts

@@ -1,17 +1,9 @@
 #!/usr/bin/env node
-// Copyright 2023 The Matrix.org Foundation C.I.C.
+// Copyright 2024 New Vector Ltd.
+// Copyright 2023, 2024 The Matrix.org Foundation C.I.C.
 //
-// Licensed under the Apache License, Version 2.0 (the "License");
+// SPDX-License-Identifier: AGPL-3.0-only
-// you may not use this file except in compliance with the License.
+// Please see LICENSE in the repository root for full details.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
 
 import log4js from "log4js";
 import { ArgumentConfig, parse } from "ts-command-line-args";