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

638 commits

Author SHA1 Message Date
Nextcloud bot
a625a4d704
[tx-robot] updated from transifex 2018-08-05 00:12:29 +00:00
Nextcloud bot
6a9bee478d
[tx-robot] updated from transifex 2018-08-01 00:11:59 +00:00
Roeland Jago Douma
b16f1093af
Merge pull request #10460 from nextcloud/bugfix/10443/theming-icons 
Use icon mixins for the theming scss
 2018-07-31 11:50:21 +02:00
Nextcloud bot
5e43f3c6a6
[tx-robot] updated from transifex 2018-07-31 00:12:12 +00:00
Julius Härtl
5d7c0b8cd2
Use icon mixins for the theming scss 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-31 00:10:34 +02:00
Nextcloud bot
8ac1f4168d
[tx-robot] updated from transifex 2018-07-22 00:12:42 +00:00
Nextcloud bot
b7e32df660
[tx-robot] updated from transifex 2018-07-19 00:12:05 +00:00
Morris Jobke
029219a9e7
Merge pull request #10177 from nextcloud/bugfix/noid/theming-load-with-custom-theme 
Load theming app css as well if legacy theme is enabled
 2018-07-11 09:09:09 +02:00
Nextcloud bot
0e0dd2a90b
[tx-robot] updated from transifex 2018-07-11 00:12:15 +00:00
Julius Härtl
805f503814
Load theming app css as well if legacy theme is enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-10 14:59:15 +02:00
Nextcloud bot
a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Nextcloud bot
1bf486d93f
[tx-robot] updated from transifex 2018-06-28 00:12:20 +00:00
Nextcloud bot
a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
Nextcloud bot
18cf85d264
[tx-robot] updated from transifex 2018-06-26 00:12:07 +00:00
Nextcloud bot
a4b5ff8420
[tx-robot] updated from transifex 2018-06-24 00:12:06 +00:00
Nextcloud bot
f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00: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
Julius Härtl
80efb51a1a
[theming] reload css variables instead of the whole server css 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-20 19:20:51 +02:00
John Molakvoæ (skjnldsv)
8aaf2c3272
Theming update on url 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-20 19:17:06 +02:00
Nextcloud bot
5e5671983c
[tx-robot] updated from transifex 2018-06-17 00:12:48 +00:00
Nextcloud bot
db9ad32d75
[tx-robot] updated from transifex 2018-06-16 00:13:15 +00: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
Nextcloud bot
84a1c915e6
[tx-robot] updated from transifex 2018-06-15 00:12:49 +00:00
Julius Härtl
ceee91d9d4
Add info message if an exception occurs during the svg to png conversion 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-14 17:36:02 +02:00
Roeland Jago Douma
e4db293cc1
Fix possible test timing issues in IconController 
Since the response now handles the caching. We need to provide a default
ITimeFactory mock. Else you might have failing tests.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-13 22:54:08 +02:00
Nextcloud bot
d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00: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
Julius Härtl
d132527aa9
Use svg opt out as parameter 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-05 16:47:38 +02:00
Julius Härtl
9b919245f6
Adjust ImageManager tests for png generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-05 16:47:38 +02:00
Julius Härtl
4a5826cddb
Generate PNG version of the theming app logo for mails 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-06-05 16:47:38 +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
Nextcloud bot
d3fceb9b83
[tx-robot] updated from transifex 2018-06-01 00:12:28 +00:00
Nextcloud bot
7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Nextcloud bot
645eaaa434
[tx-robot] updated from transifex 2018-05-29 00:12:21 +00:00
Nextcloud bot
2b2bbe359e
[tx-robot] updated from transifex 2018-05-28 00:12:45 +00:00
Nextcloud bot
9e00b51c87
[tx-robot] updated from transifex 2018-05-27 00:13:07 +00:00
Nextcloud bot
f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Morris Jobke
d4a0af7e5e
Merge pull request #9593 from nextcloud/fwdport/9586/master 
add privacy link to theming and fix scrollbars
 2018-05-25 09:49:36 +02:00
Nextcloud bot
60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00: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
Nextcloud bot
caa3953245
[tx-robot] updated from transifex 2018-05-24 00:13:48 +00:00
Nextcloud bot
4bbad8f88a
[tx-robot] updated from transifex 2018-05-23 00:15:44 +00:00
Nextcloud bot
0d90c5ebc4
[tx-robot] updated from transifex 2018-05-22 00:13:31 +00:00
Nextcloud bot
ca089b9412
[tx-robot] updated from transifex 2018-05-20 00:13:24 +00:00
Nextcloud bot
e2f1f7b8f5
[tx-robot] updated from transifex 2018-05-19 00:13:41 +00:00
Nextcloud bot
514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00: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
Morris Jobke
63d5491a73
Merge pull request #9503 from nextcloud/bugfix/noid/theming-mime-check 
Check mime type properly in theming app
 2018-05-17 15:48:44 +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
Nextcloud bot
ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Arthur Schiwon
feff9f5bd1
Use link not address in labels for URLs 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-16 00:56:08 +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
Nextcloud bot
5fcb3dd1dc
[tx-robot] updated from transifex 2018-05-12 00:13:00 +00:00
Arthur Schiwon
84ab102146
fix undo for url-typed inputs 
and minor adjustments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-11 15:57:32 +02:00
Arthur Schiwon
850e2256f3
fix tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-05-11 15:37:24 +02:00
Nextcloud bot
01c21601e8
[tx-robot] updated from transifex 2018-05-10 00:13:09 +00: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
Nextcloud bot
9fe95e8a7c
[tx-robot] updated from transifex 2018-05-08 00:11:34 +00:00
Nextcloud bot
94e3bdf703
[tx-robot] updated from transifex 2018-05-07 00:11:36 +00:00
Nextcloud bot
1ce3a618a8
[tx-robot] updated from transifex 2018-05-05 00:11:47 +00:00
Nextcloud bot
bd2aede6a3
[tx-robot] updated from transifex 2018-05-04 00:11:52 +00:00
Nextcloud bot
c8cb42fd26
[tx-robot] updated from transifex 2018-05-01 00:11:52 +00:00
Nextcloud bot
b87b0689c5
[tx-robot] updated from transifex 2018-04-30 00:11:48 +00:00
Nextcloud bot
a546dcfcb3
[tx-robot] updated from transifex 2018-04-29 00:11:47 +00:00
Nextcloud bot
6ee00a8be5
[tx-robot] updated from transifex 2018-04-28 00:11:58 +00:00
Morris Jobke
7da1e968f9
Merge pull request #9319 from nextcloud/rakekniven-patch-1 
Fixed typo
 2018-04-27 09:15:21 +02:00
Nextcloud bot
9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00:00
rakekniven
ace2063f21
Fixed typo 2018-04-26 18:12:21 +02:00
Morris Jobke
b3a0dec8d5
Merge pull request #8540 from nextcloud/theming-advanced 
Add option for header logo and favicon in theming app
 2018-04-25 08:47:14 +02:00
Nextcloud bot
8748e636f6
[tx-robot] updated from transifex 2018-04-20 00:12:00 +00: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
Julius Härtl
7f9dabd984
Make sure the custom favicon is used 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:40 +02:00
Julius Härtl
39f44e1452
Add typehints 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:40 +02:00
Julius Härtl
daadc1c892
Fix background color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
5a5c125b23
Return value 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
3ad2768909
Remove unneeded preview image handling 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
d8045966de
Fix undo preview and remove duplicate code 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
d8b57924fb
Add advanced theming options to frontend 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:39 +02:00
Julius Härtl
ee44dec0ac
Use generic image upload in theming JS 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Julius Härtl
dfda5c683d
Use SCSS for previewing images as well 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Julius Härtl
02d3e09c86
Move theming settings to SCSS 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Julius Härtl
272b392cac
Move to more generic image handling and add extra images 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-19 20:14:38 +02:00
Nextcloud bot
7ca526f8ac
[tx-robot] updated from transifex 2018-04-19 00:11:50 +00:00
Nextcloud bot
3c250b1a35
[tx-robot] updated from transifex 2018-04-17 00:13:08 +00:00
Nextcloud bot
b7a64f9c13
[tx-robot] updated from transifex 2018-04-13 00:11:47 +00:00
Nextcloud bot
9f194bc682
[tx-robot] updated from transifex 2018-04-07 00:11:49 +00:00
Nextcloud bot
0c12c06325
[tx-robot] updated from transifex 2018-04-05 00:11:47 +00:00
Nextcloud bot
b90b73df6f
[tx-robot] updated from transifex 2018-04-04 00:13:26 +00:00
Nextcloud bot
0f398e7611
[tx-robot] updated from transifex 2018-03-31 00:13:51 +00:00
Nextcloud bot
660ae73e5f
[tx-robot] updated from transifex 2018-03-30 00:11:34 +00:00
Nextcloud bot
65908bacd2
[tx-robot] updated from transifex 2018-03-29 00:13:35 +00:00
Nextcloud bot
9dad5ac59b
[tx-robot] updated from transifex 2018-03-28 00:21:16 +00: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
Nextcloud bot
7b4e51dbc7
[tx-robot] updated from transifex 2018-03-27 00:11:40 +00: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
Julius Härtl
e7c3b8da77
Clear any theming prefixed cache on cache buster increase 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-26 12:34:26 +02:00
Nextcloud bot
e2b44d199b
[tx-robot] updated from transifex 2018-03-26 00:13:15 +00:00
Nextcloud bot
89ebb8a663
[tx-robot] updated from transifex 2018-03-25 01:09:58 +00:00
Nextcloud bot
3b6a45b926
[tx-robot] updated from transifex 2018-03-24 01:12:19 +00:00
Nextcloud bot
64948bf30c
[tx-robot] updated from transifex 2018-03-23 01:11:28 +00:00
Nextcloud bot
c1b36e165e
[tx-robot] updated from transifex 2018-03-22 01:11:40 +00:00
Nextcloud bot
af3ab1de10
[tx-robot] updated from transifex 2018-03-21 01:11:55 +00:00
rakekniven
789221a0fc
Update ThemingControllerTest.php 
Adjusted test
 2018-03-19 15:07:49 +01:00
rakekniven
d88db9b496
Update ThemingController.php 
Changed file according to discussion on PR.
 2018-03-19 15:00:27 +01:00
rakekniven
b2ceb29484
Update ThemingController.php 
Changed wording according to discussion at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491259?issue=yes
Aligned ending of error messages
 2018-03-16 18:45:20 +01:00
Nextcloud bot
055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Nextcloud bot
7f00de841b
[tx-robot] updated from transifex 2018-03-14 01:11:29 +00:00
Nextcloud bot
3cae276149
[tx-robot] updated from transifex 2018-03-13 01:12:01 +00:00
Nextcloud bot
4e56a02450
[tx-robot] updated from transifex 2018-03-12 01:12:21 +00:00
Morris Jobke
15c099df4d
Merge pull request #8633 from nextcloud/rakekniven-i18n-fix 
Improved translation strings
 2018-03-11 19:33:26 +01:00
Nextcloud bot
2c503ccdee
[tx-robot] updated from transifex 2018-03-11 01:12:13 +00:00
rakekniven
bcdbbb56b0
Update ThemingControllerTest.php 
Fixed tests for https://github.com/nextcloud/server/pull/8633
 2018-03-10 12:57:09 +01:00
rakekniven
4fc4e6dcaa
Update ThemingController.php 
Improved translation string.
Reported at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491256?issue=yes
 2018-03-10 12:57:05 +01:00
Julius Härtl
573b940761
Use cache prefix for theming as well 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +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
Julius Härtl
50a9beb4bb
Move base url from global cache prefix to frontend related ones 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Nextcloud bot
3867a74f0d
[tx-robot] updated from transifex 2018-03-06 01:12:16 +00:00
Morris Jobke
3ced2c7ab2
Merge pull request #8601 from nextcloud/theming-fix-background-color 
Remove too restrict check for background image/color
 2018-03-05 11:28:41 +01:00
Nextcloud bot
6975cef00b
[tx-robot] updated from transifex 2018-03-04 01:12:42 +00:00
Christian Oliff
d838789259
Use correct input type for the url entry 
Change `type="text"` to `type="url"`
 2018-03-02 16:49:56 +09:00
Nextcloud bot
777313db42
[tx-robot] updated from transifex 2018-03-02 01:12:16 +00:00
Julius Härtl
c521791653
Remove to restrict check for background image/color 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-01 14:39:31 +01:00
Nextcloud bot
a7fb9ff8da
[tx-robot] updated from transifex 2018-03-01 01:12:11 +00:00
Nextcloud bot
533e8351ad
[tx-robot] updated from transifex 2018-02-28 01:12:31 +00:00
Sagorika Das
7394e8ae58
Empty name not allowed 
Do not allow empty name in theming app.

Signed-off-by: Sagorika Das <sagorika1996@gmail.com>
 2018-02-27 10:54:21 +01:00
Morris Jobke
4076c09195
Merge pull request #8463 from kyrofa/bugfix/8462/theming_app_outside_root 
theming: handle not being in the serverroot
 2018-02-26 18:27:54 +01:00
Kyle Fazzari
8dcbea124e
Remove null check 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-25 07:08:59 -08:00
Kyle Fazzari
25c89a6feb
Add mock to setup 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2018-02-24 08:16:42 -08:00
Nextcloud bot
68187e6036
[tx-robot] updated from transifex 2018-02-23 01:12:16 +00: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
Nextcloud bot
b3ca73dc27
[tx-robot] updated from transifex 2018-02-19 01:11:54 +00:00
Nextcloud bot
d953db8683
[tx-robot] updated from transifex 2018-02-17 01:12:04 +00:00
Joas Schilling
f095001e4b
Fix info.xml files of shipped apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:24:03 +01:00
Nextcloud bot
01623d4aca
[tx-robot] updated from transifex 2018-02-14 21:37:31 +00:00
Morris Jobke
d3d045dd5c
Remove unused import statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-14 16:55:43 +01:00
Nextcloud bot
3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot
71382daf67
[tx-robot] updated from transifex 2018-02-08 01:10:28 +00:00
Morris Jobke
0225ea1b9a
Merge pull request #8155 from nextcloud/use-guest-css 
Fix styling issues of guest pages
 2018-02-05 12:14:09 +01: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
Julius Härtl
1ac352de6c
Add space on guest pages with custom logo 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-02 14:20:13 +01:00
Julius Härtl
39461a2e09
Make sure theming logo css only applies when a logo is set 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-02 14:20:12 +01:00
Nextcloud bot
b78da27d0a
[tx-robot] updated from transifex 2018-02-01 18:28:02 +00: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
6770213649
Do not rewrite absolute URLs 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:08:45 +01:00