wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
43872 commits 157 branches 562 tags 714 MiB
Commit graph

148 commits

Author SHA1 Message Date
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
0847c98aaf
addjust footer height when legal links are present. fixes #9572 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-24 23:39:50 +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
Roeland Jago Douma
362e6b2903
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-14 13:30:22 +02:00
Arthur Schiwon
850e2256f3
fix tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-11 15:37:24 +02:00
Arthur Schiwon
62f1156a56
allow to specify a link to a legal notice 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-09 15:52:41 +02:00
Julius Härtl
d771f65911
Add more tests for ImageManager 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:40 +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
Roeland Jago Douma
06f52ead31
Merge pull request #8993 from nextcloud/theming-allow-ui-with-theme 
Show UI when using a custom theme
 2018-03-27 19:27:49 +02:00
Julius Härtl
b6501ae966
Show UI when using a custom theme 
Do not hide the theming app UI when using a custom theme besides it, but warn the users about some settings being overwritten by that.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-26 18:23:51 +02:00
Julius Härtl
af4acdc6d6
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-26 14:29:28 +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
Julius Härtl
95366bbd1f
Fix tests to use ICacheFactory 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +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
Roeland Jago Douma
0bde91600a
Fix theming test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-02 21:26:33 +01:00
Morris Jobke
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss 
SCSS hardening
 2018-01-29 16:12:10 +01:00
Julius Härtl
5dbf733395
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 20:13:28 +01:00
Julius Härtl
5e325730d6
Remove theming migration 
Those images are alredy migrated after the instance has been updated to NC12

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 15:10:22 +01:00
Joas Schilling
870023365c
Fix "Undefined method setExpectedException()" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 18:10:16 +01:00
Julius Härtl
d4e106f2b3
More detailed theming capabilities 
This will allow clients to easily check if a custom background is used

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-10 13:23:22 +01:00
Julius Härtl
9bb0299c98
Add colors to tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-08 16:50:03 +01:00
Roeland Jago Douma
094d41937a
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-18 21:06:52 +01:00
Morris Jobke
cce4c285db
Fix email buttons for white theme 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-11 14:33:54 +01:00
Julius Härtl
d70e9059a5
Theming: Fix tests for favicon containing multiple sizes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-11-13 10:18:48 +01:00
Julius Härtl
31b9fc9eac
Theming: Generate favicon sizes to avoid resizing issues done by the browser 
fixes #5193

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-11-13 10:18:47 +01:00
Morris Jobke
c7e5bc0f9a
Merge pull request #7112 from nextcloud/theming-imagemagick-hint 
Theming: add hint about favicon generation
 2017-11-09 12:16:55 +01:00
Morris Jobke
479966dce8
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-09 10:03:31 +01:00
Lukas Reschke
8c915baa34
Merge pull request #6788 from staabm/master 
Prevent XSS in links which open a new browser window
 2017-11-08 18:55:35 +01:00
Julius Härtl
00956c00b2
Theming: expose element color though capabilities API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-11-07 12:31:23 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Morris Jobke
43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +02:00
Markus Staab
db34b59238 Prevent XSS in links which open a new browser window 2017-10-19 12:16:04 +02: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
81ef116bfb
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:47:38 +02:00
Julius Härtl
8391ca8792
Use IAppManager instead of private API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:28:22 +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
Julius Härtl
b49ab065b7
Move theming related imagePath logic to ThemingDefaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 09:22:57 +02:00
Julius Härtl
8f10cee3ff
Fix tests for primary element color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-04 14:30:46 +02:00
Jan-Christoph Borchardt
badbab81ea Update background image to the one used on the website 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-29 16:04:11 +02:00
Joas Schilling
b7b4cfd6a1
Add the primary font color to the capabilities as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-15 13:50:08 +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
Daniel Calviño Sánchez
986dffdae4 Split updateStylesheet tests for success and error 
This is a preparatory step for a following commit in which the
properties present in the response will change depending on whether the
request was successful or not.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Daniel Calviño Sánchez
d7e45d45c4 Unify DataResponse format with its uses in the rest of the file 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-10 12:37:57 +02:00
Morris Jobke
e48ca730fe Add Android and iOS URLs to theming app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-19 10:20:47 +02:00