Skip to content

Commit

Permalink
Merge pull request #999 from nextcloud/release/2.6.0
Browse files Browse the repository at this point in the history
release 3.0.0
  • Loading branch information
GretaD authored Oct 21, 2024
2 parents e5035f8 + 4b68fcd commit 5f2cf96
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 41 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
# Changelog
All notable changes to this project will be documented in this file.

## 3.0.0
### Added
- Move from index.php to ocs API
### Fixed
- Strong types to storage wrapper

## 2.5.0
### Added
- Force the user to scroll text to accept the TOS
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<description><![CDATA[Requires users to accept the terms of service before accessing data.
This product includes GeoLite2 data created by MaxMind, available from [maxmind.com](http://www.maxmind.com)]]></description>

<version>3.0.0-dev.0</version>
<version>3.0.0</version>
<licence>agpl</licence>
<author>Joas Schilling</author>

Expand Down
4 changes: 2 additions & 2 deletions js/terms_of_service-admin.js

Large diffs are not rendered by default.

21 changes: 7 additions & 14 deletions js/terms_of_service-admin.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
SPDX-License-Identifier: BSD-3-Clause
SPDX-License-Identifier: AGPL-3.0-or-later
SPDX-License-Identifier: (MPL-2.0 OR Apache-2.0)
SPDX-FileCopyrightText: inherits developers
SPDX-FileCopyrightText: escape-html developers
SPDX-FileCopyrightText: atomiks
SPDX-FileCopyrightText: Varun A P
Expand All @@ -16,12 +15,12 @@ SPDX-FileCopyrightText: Roeland Jago Douma
SPDX-FileCopyrightText: Rob Cresswell <[email protected]>
SPDX-FileCopyrightText: Paul Vorbach <[email protected]> (http://paul.vorba.ch)
SPDX-FileCopyrightText: Paul Vorbach <[email protected]> (http://vorb.de)
SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
SPDX-FileCopyrightText: Matt Zabriskie
SPDX-FileCopyrightText: Joyent
SPDX-FileCopyrightText: John-David Dalton <[email protected]> (http://allyoucanleet.com/)
SPDX-FileCopyrightText: John Molakvoæ (skjnldsv) <[email protected]>
SPDX-FileCopyrightText: Joas Schilling <[email protected]>
SPDX-FileCopyrightText: Jeff Sagal <[email protected]>
SPDX-FileCopyrightText: James Halliday
SPDX-FileCopyrightText: Jacob Clevenger<https://github.com/wheatjs>
SPDX-FileCopyrightText: Hypercontext
SPDX-FileCopyrightText: Hiroki Osame
Expand Down Expand Up @@ -146,6 +145,9 @@ This file is generated from multiple sources. Included packages:
- node-gettext
- version: 3.0.0
- license: MIT
- path-browserify
- version: 1.0.1
- license: MIT
- process
- version: 0.11.10
- license: MIT
Expand Down Expand Up @@ -185,15 +187,6 @@ This file is generated from multiple sources. Included packages:
- webpack
- version: 5.94.0
- license: MIT
- inherits
- version: 2.0.3
- license: ISC
- util
- version: 0.10.4
- license: MIT
- path
- version: 0.12.7
- license: MIT
- nextcloud
- version: 1.0.0
- terms_of_service
- version: 3.0.0-dev.0
- license: AGPL-3.0-or-later
2 changes: 1 addition & 1 deletion js/terms_of_service-admin.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/terms_of_service-public.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ SPDX-FileCopyrightText: escape-html developers
SPDX-FileCopyrightText: Tobias Koppers @sokra
SPDX-FileCopyrightText: T. Jameson Little <[email protected]>
SPDX-FileCopyrightText: Roman Shtylman <[email protected]>
SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
SPDX-FileCopyrightText: Matt Zabriskie
SPDX-FileCopyrightText: John-David Dalton <[email protected]> (http://allyoucanleet.com/)
SPDX-FileCopyrightText: John Molakvoæ (skjnldsv) <[email protected]>
SPDX-FileCopyrightText: Joas Schilling <[email protected]>
SPDX-FileCopyrightText: GitHub Inc.
SPDX-FileCopyrightText: Feross Aboukhadijeh
SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 <[email protected]> (https://cure53.de/)
Expand Down Expand Up @@ -65,6 +65,6 @@ This file is generated from multiple sources. Included packages:
- webpack
- version: 5.94.0
- license: MIT
- nextcloud
- version: 1.0.0
- terms_of_service
- version: 3.0.0-dev.0
- license: AGPL-3.0-or-later
6 changes: 3 additions & 3 deletions js/terms_of_service-registration.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ SPDX-FileCopyrightText: escape-html developers
SPDX-FileCopyrightText: Tobias Koppers @sokra
SPDX-FileCopyrightText: T. Jameson Little <[email protected]>
SPDX-FileCopyrightText: Roman Shtylman <[email protected]>
SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
SPDX-FileCopyrightText: Matt Zabriskie
SPDX-FileCopyrightText: John-David Dalton <[email protected]> (http://allyoucanleet.com/)
SPDX-FileCopyrightText: John Molakvoæ (skjnldsv) <[email protected]>
SPDX-FileCopyrightText: Joas Schilling <[email protected]>
SPDX-FileCopyrightText: GitHub Inc.
SPDX-FileCopyrightText: Feross Aboukhadijeh
SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 <[email protected]> (https://cure53.de/)
Expand Down Expand Up @@ -69,6 +69,6 @@ This file is generated from multiple sources. Included packages:
- webpack
- version: 5.94.0
- license: MIT
- nextcloud
- version: 1.0.0
- terms_of_service
- version: 3.0.0-dev.0
- license: AGPL-3.0-or-later
6 changes: 3 additions & 3 deletions js/terms_of_service-user.js.license
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ SPDX-FileCopyrightText: escape-html developers
SPDX-FileCopyrightText: Tobias Koppers @sokra
SPDX-FileCopyrightText: T. Jameson Little <[email protected]>
SPDX-FileCopyrightText: Roman Shtylman <[email protected]>
SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
SPDX-FileCopyrightText: Matt Zabriskie
SPDX-FileCopyrightText: John-David Dalton <[email protected]> (http://allyoucanleet.com/)
SPDX-FileCopyrightText: John Molakvoæ (skjnldsv) <[email protected]>
SPDX-FileCopyrightText: Joas Schilling <[email protected]>
SPDX-FileCopyrightText: GitHub Inc.
SPDX-FileCopyrightText: Feross Aboukhadijeh
SPDX-FileCopyrightText: Dr.-Ing. Mario Heiderich, Cure53 <[email protected]> (https://cure53.de/)
Expand Down Expand Up @@ -65,6 +65,6 @@ This file is generated from multiple sources. Included packages:
- webpack
- version: 5.94.0
- license: MIT
- nextcloud
- version: 1.0.0
- terms_of_service
- version: 3.0.0-dev.0
- license: AGPL-3.0-or-later

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ SPDX-License-Identifier: (MPL-2.0 OR Apache-2.0)
SPDX-FileCopyrightText: xiaokai <[email protected]>
SPDX-FileCopyrightText: rhysd <[email protected]>
SPDX-FileCopyrightText: inline-style-parser developers
SPDX-FileCopyrightText: inherits developers
SPDX-FileCopyrightText: escape-html developers
SPDX-FileCopyrightText: debounce developers
SPDX-FileCopyrightText: atomiks
Expand All @@ -26,10 +25,10 @@ SPDX-FileCopyrightText: Paul Vorbach <[email protected]> (http://vorb.de)
SPDX-FileCopyrightText: Matt Zabriskie
SPDX-FileCopyrightText: Mark <[email protected]>
SPDX-FileCopyrightText: Mapbox
SPDX-FileCopyrightText: Joyent
SPDX-FileCopyrightText: John-David Dalton <[email protected]> (http://allyoucanleet.com/)
SPDX-FileCopyrightText: John Molakvoæ (skjnldsv) <[email protected]>
SPDX-FileCopyrightText: Jeff Sagal <[email protected]>
SPDX-FileCopyrightText: James Halliday
SPDX-FileCopyrightText: Jacob Clevenger<https://github.com/wheatjs>
SPDX-FileCopyrightText: Hypercontext
SPDX-FileCopyrightText: Hiroki Osame
Expand Down Expand Up @@ -371,6 +370,9 @@ This file is generated from multiple sources. Included packages:
- node-gettext
- version: 3.0.0
- license: MIT
- path-browserify
- version: 1.0.1
- license: MIT
- process
- version: 0.11.10
- license: MIT
Expand Down Expand Up @@ -452,12 +454,3 @@ This file is generated from multiple sources. Included packages:
- zwitch
- version: 2.0.4
- license: MIT
- inherits
- version: 2.0.3
- license: ISC
- util
- version: 0.10.4
- license: MIT
- path
- version: 0.12.7
- license: MIT

Large diffs are not rendered by default.

0 comments on commit 5f2cf96

Please sign in to comment.