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

167 commits

Author SHA1 Message Date
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
Julius Härtl
ce5ad7e7f4
Prefer custom theme over theming app 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-07-12 11:42:15 +02:00
Lukas Reschke
c1c676f602 Merge pull request #4910 from nextcloud/make-the-logo-smaller-cream 
Fix logo being too big on log in page, fix #4585
 2017-05-19 20:50:09 +02:00
Julius Härtl
52f10c436e
Scale logo only for custom ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-19 16:18:09 +02:00
Lukas Reschke
c605472950 Merge pull request #4888 from nextcloud/theming-fallback-icons 
Fallback to default favicon
 2017-05-18 23:30:02 +02:00
Julius Härtl
489131333a
Inject FileAccessHelper for proper testing 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-18 10:45:42 +02:00
Morris Jobke
2ec616323b Merge pull request #4918 from nextcloud/theming-capabilities-plain-background 
OCS Return color when theming uses no background image
 2017-05-17 10:42:41 -05:00
Julius Härtl
81847c01b0
Return color when theming uses no background image 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 13:16:44 +02:00
Julius Härtl
639168ede4
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:16:59 +02:00
Julius Härtl
d3865b6096
Use appdata logo when generating icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:14:37 +02:00
Julius Härtl
edb5502b9d
Add proper Content-Type to icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:11:29 +02:00
Julius Härtl
1157f413c9
Fallback to default favicon 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-17 10:11:29 +02:00
Lukas Reschke
099234cf12
Add function to request SVG or regular fallback image 
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 14:51:55 +02:00
Julius Härtl
510f7cf1b6
Fix tests for theming backgroundColor 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-08 10:16:30 +02:00
Morris Jobke
ac04fb8277 Fix invalid theming URLs 
* logo and background image had the cache buster applied twice:
  background-image: url(http://192.168.99.100/server/core/img/logo.svg?v=0?v=0);

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-05 00:37:32 -03:00
Julius Härtl
7c69c117e2
Delete theming images when logo/background is reset to default 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-30 11:04:55 -03:00
Julius Härtl
b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Joas Schilling
6448cf5748
Mock it 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 12:16:07 +02:00
Joas Schilling
bedd500884
Logo and background URLs must be relative 
They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 11:43:06 +02:00
Julius Härtl
bc1efdf2e1
Fix theming tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-25 11:39:49 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 11:39:45 +02:00
Joas Schilling
8c703c954d
Fix theming tests 
Trying to configure method "shouldReplaceIcons" which cannot be configured
because it does not exist, has not been specified, is final, or is static

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:10:34 +02:00
Morris Jobke
d83c8e0271
ThemingDefaults append cacheBusterCounter to logo URL by default 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:09 -05:00
Morris Jobke
5b4adf66e5
Move OC_Defaults to OCP\Defaults 
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-09 21:43:01 -05:00
Lukas Reschke
281ad406e8
Add support for theming 
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-07 12:03:47 -05:00
Jan-Christoph Borchardt
9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-29 18:23:23 +02:00
Julius Haertl
e5ddb40a3e
Add test for creating AppData folder 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-02-20 15:48:22 +01:00
Julius Haertl
3f0134622d
Use createMock 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-02-16 15:13:39 +01:00
Julius Haertl
b2cbe3530d
Use ::class in tests and correct import 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-02-16 15:13:39 +01:00
Julius Haertl
88a0ef7d4a
Add tests for theming migration step 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-02-16 15:13:38 +01:00
Julius Haertl
345d1f1291
Adapt ThemingController tests 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-02-16 15:13:38 +01:00
Morris Jobke
e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons 
add icons to navigation of personal & admin settings
 2017-01-24 10:56:31 -06:00
Morris Jobke
8565011b8d Merge pull request #3144 from nextcloud/use-data-download-response 
Use DataDownloadResponse
 2017-01-19 15:36:31 -06:00
Joas Schilling
5812e99f1d
Fix app section tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-19 15:30:40 +01:00
Morris Jobke
3798f842c0
theme app navigation menu highlight color 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-18 21:42:50 -06:00
Lukas Reschke
be3ec7ffb7
Use DataDownloadResponse 
1. As documented
2. No need to show this inline, downloading has security advantages

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-18 17:00:09 +01:00
Julius Haertl
797e761492
Move sizing to renderAppIcon method 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-12-04 13:38:29 +01:00
Morris Jobke
faee255ff4 Merge pull request #840 from nextcloud/theming-icon-endpoint 
Add dynamic icon creation
 2016-11-18 15:35:34 +01:00
Robin Appelman
8b9ad46ba3 Merge pull request #768 from nextcloud/s3-objectstore 
Add S3 objectstore backend
 2016-11-18 14:55:07 +01:00
Julius Haertl
2ab4d1e0a3
Use IAppManager instead of OC_App 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 11:07:44 +01:00
Julius Haertl
d409fe1c52
Error handling and tests if file was not found 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:25 +01:00
Julius Haertl
78de213b85
Sanitize input and small fixes 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:25 +01:00
Julius Haertl
3a400f92d1
Replace null return with NotFoundException 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:25 +01:00
Julius Haertl
cc8b1d3829
Fix icon-folder css 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Julius Haertl
2e8dd21815
Improve caching 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Julius Haertl
492d0b9f9b
Caching for icon files using AppData 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Julius Haertl
9e28a3ba12
Theming: Code cleanup and cache buster for mime icons 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Julius Haertl
237034818d
Check if dynamic icons can be used 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Julius Haertl
af8976ab03
Add IconBuilder class to encapsulate icon generation 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:24 +01:00
Julius Haertl
b466628bfd
Improve unit tests for image generation 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:23 +01:00
Julius Haertl
ac7f852ed9
Theming: Add IconController tests 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:23 +01:00
Julius Haertl
d1fcfe8e7d
Theming: Add colorized icon css from icons.css 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-18 10:23:23 +01:00
Roeland Jago Douma
07acd34d6e
Fix themeing unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-16 15:30:37 +01:00
Julius Haertl
520f2f6221
Revert "Fix #1782" 
This reverts commit bc5268bdc8.

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-16 13:52:51 +01:00
John Molakvoæ
bc5268bdc8
Fix #1782 
Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-02 15:07:24 +01:00
Jan-Christoph Borchardt
cbd9fb3c5c also fix log in button confirm arrow when theming, fix #1615 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-25 14:24:24 +02:00
Jan-Christoph Borchardt
551cffd1b8 remove slight transparency of primary action button, ref #1615 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2016-10-25 13:16:13 +02:00
Joas Schilling
67408c3f63
Add image URLs and tests 2016-09-06 08:55:22 +02:00
Roeland Jago Douma
011364317a
Fix ThemingDefaults getMock deprecation 2016-08-31 20:33:18 +02:00
Julius Haertl
d43c9b9e79
Theming: fix primary button for bright colors 2016-08-29 19:07:27 +02:00
iamfool
7e1a690059 Update AdminTest.php 2016-08-29 01:47:23 -07:00
Lukas Reschke
683f0e7f77
Use temporary file as cache 2016-08-27 21:38:41 +02:00
Lukas Reschke
73bc108451
Increase theming performance 
1. Set proper caching headers (`Pragma: cache`)
2. Resize image proportionally to a max size of 1920px
3. Store images with progressive mode

This resizes a previous 2.8 MB picture to 300kb and makes it rendering going down from 11 seconds to less than 1 here. And future requests won't have to download the file newly.
 2016-08-27 21:02:08 +02:00
Roeland Jago Douma
53725d4d15 Merge pull request #771 from nextcloud/theming-fixes 
Theming: Fix missing color usage
 2016-08-26 15:02:21 +02:00
Julius Haertl
d95aec2ed2
Theming: Add preview for login screen 2016-08-26 12:08:12 +02:00
Julius Haertl
218e2f7850
Theming: Adjust jquery ui elements 2016-08-26 12:07:52 +02:00
Julius Haertl
2b0ed6c27a
Theming: colorize primary buttons 2016-08-26 12:07:52 +02:00
Joas Schilling
c7c53aefb2
Use the lazy root to make tests pass 🙈 2016-08-24 09:52:05 +02:00
Julius Haertl
80fe499707
Theming: Add logo and background to ThemingDefaults 2016-08-24 00:40:22 +02:00
Lukas Reschke
7ffb7b0d84
Use MockBuilder instead of createMock 
CI uses an older PHPUnit
 2016-08-15 16:43:22 +02:00
Lukas Reschke
8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Arthur Schiwon
0fdf801c25
fix theming tests 2016-08-12 16:58:59 +02:00
Bjoern Schiessle
18fd8ff70c
rename "Tenmplate" to "ThemingDefaults" to make the auto loader happy" 2016-08-12 15:32:28 +02:00
Julius Haertl
5f4e88ef6c
Theming: Add OCA.Theming Js for app interaction 2016-08-10 13:39:21 +02:00
Julius Haertl
ef17f8b3ba
Add css classes to allow app developers using the theming colors 2016-08-09 22:54:25 +02:00
Morris Jobke
dbf3ca5baf Merge pull request #682 from nextcloud/fix-theming-logo 
fix missing semicolon to fix themed logo on log in page
 2016-08-01 19:50:42 +02:00
Jan-Christoph Borchardt
ad5e98c81a fix missing semicolon to fix themed logo on log in page 2016-08-01 09:57:05 +02:00
Joas Schilling
13c19e5286
Validate the input of the theming options 2016-08-01 09:37:12 +02:00
Joas Schilling
5306b4feba
Fix tests 2016-07-28 17:49:08 +02:00
Joas Schilling
7efadf7b6b
Move classes to PSR-4 2016-07-28 17:49:08 +02:00
Bjoern Schiessle
14ca7c9cdc
fix background id selector for the first run wizard 2016-07-28 16:32:39 +02:00
Bjoern Schiessle
ee1be23b37
fix unit tests 2016-07-28 13:30:55 +02:00