averello/nextcloud-server-mirror
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-04 18:28:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
76,443 Commits 712 Branches 1,186 Tags
stable29
Commit Graph

90 Commits

Author SHA1 Message Date
Simon L
79b22a4254 feat(theming): allow to disable standalone windows 
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>

Signed-off-by: Simon L. <szaimen@e.mail.de>

Signed-off-by: Hamza Mahjoubi <hamzamahjoubi221@gmail.com>
 2025-02-07 21:58:26 +07:00
Ferdinand Thiessen
e7e5bec6c6 fix(theming): Harden admin web link settings 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
 2025-01-27 17:57:41 +00:00
Joas Schilling
aa5f037af7 chore: apply changes from Nextcloud coding standards 1.1.1 
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
 2023-11-23 10:36:13 +01:00
Vincent Petry
6e75931412 Limit key names when uploading theme images 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2023-01-11 16:16:44 +01:00
Côme Chilliet
f8a5be6a90 Remove deprecated at matcher from theming tests 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-06-16 15:55:05 +02:00
John Molakvoæ
3c75a99267 Phpunit 
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
 2022-04-21 19:00:28 +02:00
Côme Chilliet
37f8f7a5a1 Fix tests on PHP 8.1 for encryption, files_sharing, files_version, 
files_trashbin and theming apps

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:43:29 +01:00
Côme Chilliet
6b770eb579 Fix theming tests on PHP 8.1 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2021-12-16 09:43:29 +01:00
szaimen
0758e0258d improve webmanifest 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-08-24 11:42:04 +02:00
John Molakvoæ (skjnldsv)
215aef3cbd Update php licenses 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2021-06-04 22:02:41 +02:00
Christoph Wurst
d89a75be0b Update all license headers for Nextcloud 21 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-12-16 18:48:22 +01:00
John Molakvoæ (skjnldsv)
a7c4369941 Fix theming manifest tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2020-10-20 11:03:24 +02:00
Christoph Wurst
d9015a8c94 Format code to a single space around binary operators 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-05 20:25:24 +02:00
Julius Härtl
0daf097af3 Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-09-24 08:22:07 +02:00
Christoph Wurst
2a054e6c04 Update the license headers for Nextcloud 20 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-24 14:54:25 +02:00
Morris Jobke
234b510652 Change PHPDoc type hint from PHPUnit_Framework_MockObject_MockObject to \PHPUnit\Framework\MockObject\MockObject 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-08-12 13:55:19 +02:00
Roeland Jago Douma
3f1b6e2ce9 Move theming js to initial state 
A bit more elegant. Plus it will allow us to also write a proper
@nextcloud/theming package. To make life easier down the line for all.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-06-05 11:01:49 +02:00
Christoph Wurst
caff1023ea Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Christoph Wurst
afbd9c4e6e Unify function spacing to PSR2 recommendation 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 13:54:22 +02:00
Christoph Wurst
1a9330cd69 Update the license headers for Nextcloud 19 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-31 14:52:54 +02:00
Christoph Wurst
463b388589 Merge pull request #20170 from nextcloud/techdebt/remove-unused-imports 
Remove unused imports
 2020-03-27 17:14:08 +01:00
Christoph Wurst
2ee65f177e Use the shorter phpunit syntax for mocked return values 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:21:27 +01:00
Christoph Wurst
74936c49ea Remove unused imports 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-25 22:08:08 +01:00
Christoph Wurst
5bf3d1bb38 Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +01:00
Roeland Jago Douma
069b938ab0 Fix the theming tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-04 09:07:24 +01:00
Roeland Jago Douma
3a7cf40aaa Mode to modern phpunit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:18 +01:00
Roeland Jago Douma
c007ca624f Make phpunit8 compatible 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +01:00
Roeland Jago Douma
68748d4f85 Some php-cs fixes 
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-22 20:52:10 +01:00
Julius Härtl
47a0254bb3 Validate urls in theming settings and properly handle error messages 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-07-31 10:20:57 +02:00
Michael Weimann
38ea5d14b3 Disables SVG favicon uploads when imagemagick is missing. 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-09-05 20:50:21 +02:00
John Molakvoæ (skjnldsv)
4f0a318e02 Fixed theming tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:20:51 +02:00
Morris Jobke
8f6acbff62 Merge pull request #9258 from nextcloud/theming-logo-png 
Convert theming app logo to PNG to show it properly in emails
 2018-06-15 17:02:14 +02:00
Roeland Jago Douma
f65a6e782c Mock the timefactory in the theming tests 
Now that the cache logic is moved to the theming controller we must
properly overwrite this service. Else it could do 💥 in tests.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-07 11:42:21 +02:00
Julius Härtl
5b0ce806a3 Minor fixes and cleanup 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-06 13:15:52 +02:00
Roeland Jago Douma
e5cc8be9d5 Fix usage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-04 08:48:54 +02:00
Arthur Schiwon
16c061818e also add a privacy link 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-24 23:32:07 +02:00
Roeland Jago Douma
9236c20a28 Merge pull request #9437 from nextcloud/feature/noid/imprint 
allow to specify a link to a legal notice
 2018-05-17 21:16:03 +02:00
Julius Härtl
5b3ca8f7c6 Add Content-Disposition header 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-17 12:21:57 +02:00
Julius Härtl
2bf51c7b9e Properly check mime type of the uploaded file 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-17 11:46:01 +02:00
Arthur Schiwon
850e2256f3 fix tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-11 15:37:24 +02:00
Julius Härtl
b385f1c7d5 Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:40 +02:00
rakekniven
789221a0fc Update ThemingControllerTest.php 
Adjusted test
 2018-03-19 15:07:49 +01:00
rakekniven
bcdbbb56b0 Update ThemingControllerTest.php 
Fixed tests for https://github.com/nextcloud/server/pull/8633
 2018-03-10 12:57:09 +01:00
Kyle Fazzari
25c89a6feb Add mock to setup 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-24 08:16:42 -08:00
Kyle Fazzari
a1f1824116 theming: handle not being in the serverroot 
Currently, the theming app assumes it's in the serverroot. However, with
Nextcloud's flexibility regarding configurable app paths, this is not a
safe assumption to make. If it happens to be an incorrect assumption,
the theming app fails to work.

Instead of relying on the serverroot, just use the path from the
AppManager and utilize relative paths for assets from there.

Fix #8462

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-20 22:45:10 -08:00
Morris Jobke
0eebff152a Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Julius Härtl
f15e85c4f5 Theming: Add tests for mimetype and upload error checks 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-03 15:34:44 +02:00
Julius Härtl
c337c8fa45 Theming: Handle errors on uploaded files properly 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-03 15:32:50 +02:00
Julius Härtl
770aae42f6 Add themed manifest.json to theming app 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 09:23:12 +02:00
Daniel Calviño Sánchez
db52e861dd Provide "server.css" URL in ThemingController response 
Pull request #5429 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).

The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00