Skip to content

Commit 601092e

Browse files
authored
Merge pull request #2906 from nextcloud/fix/filelist-update
2 parents 37844a4 + e43e73b commit 601092e

44 files changed

Lines changed: 1179 additions & 1165 deletions

Some content is hidden

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

β€ŽLICENSES/0BSD.txtβ€Ž

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +0,0 @@
1-
The Nextcloud marks
2-
Nextcloud and the Nextcloud logo is a registered trademark of Nextcloud GmbH in Germany and/or other countries.
3-
These guidelines cover the following marks pertaining both to the product names and the logo: β€œNextcloud”
4-
and the blue/white cloud logo with or without the word Nextcloud; the service β€œNextcloud Enterprise”;
5-
and our products: β€œNextcloud Files”; β€œNextcloud Groupware” and β€œNextcloud Talk”.
6-
This set of marks is collectively referred to as the β€œNextcloud marks.”
7-
8-
Use of Nextcloud logos and other marks is only permitted under the guidelines provided by the Nextcloud GmbH.
9-
A copy can be found at https://nextcloud.com/trademarks/
Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +0,0 @@
1-
License
2-
3-
Unsplash visuals are made to be used freely. Our license reflects that.
4-
5-
* All images can be downloaded and used for free
6-
* Commercial and non-commercial purposes
7-
* No permission needed (though attribution is appreciated!)
8-
9-
What is not permitted πŸ‘Ž
10-
11-
* Images cannot be sold without significant modification.
12-
* Compiling images from Unsplash to replicate a similar or competing service.
13-
14-
15-
Longform
16-
17-
Unsplash grants you an irrevocable, nonexclusive, worldwide copyright license to download, copy, modify, distribute, perform, and use images from Unsplash for free, including for commercial purposes, without permission from or attributing the photographer or Unsplash. This license does not include the right to compile images from Unsplash to replicate a similar or competing service.

β€ŽLICENSES/MIT.txtβ€Ž

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,17 @@ MIT License
22

33
Copyright (c) <year> <copyright holders>
44

5-
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
6+
associated documentation files (the "Software"), to deal in the Software without restriction, including
7+
without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the
9+
following conditions:
610

7-
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
11+
The above copyright notice and this permission notice shall be included in all copies or substantial
12+
portions of the Software.
813

9-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
15+
LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO
16+
EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
17+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
18+
USE OR OTHER DEALINGS IN THE SOFTWARE.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žcss/viewer-init.cssβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* extracted by css-entry-points-plugin */
2-
@import './init-CLgquFfe.chunk.css';
3-
@import './viewerAction-60RCWKf0.chunk.css';
4-
@import './NcActionButton-DndYZcrz.chunk.css';
2+
@import './init-DdG1tait.chunk.css';
3+
@import './viewerAction-6cpbKhU6.chunk.css';
4+
@import './NcActionButton-DyH89PpO.chunk.css';
55
@import './NcActionLink-Cay-IPuV.chunk.css';

β€Žcss/viewer-main.cssβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/* extracted by css-entry-points-plugin */
2-
@import './main-CvEdi1qV.chunk.css';
3-
@import './viewerAction-60RCWKf0.chunk.css';
2+
@import './main-D70yuWu9.chunk.css';
3+
@import './viewerAction-6cpbKhU6.chunk.css';
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)