Commit Graph

586 Commits

Author SHA1 Message Date
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