upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-11 14:54:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11
62829 commits 694 branches 1182 tags 8.3 GiB
Commit graph

86 commits

Author SHA1 Message Date
Côme Chilliet
1809386862
Fix codestyle 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 16:21:27 +01:00
Côme Chilliet
6be7aa112f
Migrate from ILogger to LoggerInterface in lib/private 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 16:21:25 +01:00
Carl Schwan
dfb569f097
Follow upstream security recommandation 
See https://scssphp.github.io/scssphp/docs/#security-considerations

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-12-02 15:57:53 +01:00
MichaIng
9189bc21fb Correct comment about OC_Defaults being used 
Signed-off-by: MichaIng <micha@dietpi.com>
 2021-11-15 18:44:02 +01:00
Carl Schwan
df3d9107ef
Fix core depending on theming app 
This was introduced in 309354852f
to fix a bug but I can't reproduce the bug after reverting this change.

Ideally we would need to create an interface in OCP and cleanup OC_Defaults
instead of depending on OC_Defaults.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-11-12 15:04:24 +01:00
Christopher Ng
309354852f Profile backend 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2021-10-19 04:59:35 +00: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
c3cb288268
Bump scssphp/scssphp from 1.0.3 to 1.4.0 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-01-11 12:41:25 +01:00
Roeland Jago Douma
cd849db8be
Avoid SCSS compilation if not needed 
Now we do on each template load a compile with the SCSS variables to see
if they changed or not. However there is no real reason for this if the
variables didn't change.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-11-06 11:31:36 +01:00
Morris Jobke
4bf891f605
Merge pull request #23478 from nextcloud/fix/21059/fix-deadlock-in-scsscacher 
Clear cached app config while waiting for the SCSSCache lock to return
 2020-10-16 14:56:43 +02:00
Morris Jobke
cce716f9f3
Clear cached app config while waiting for the SCSSCache to finish processing the file 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-16 13:28:00 +02:00
Morris Jobke
9273436534
SCSSCacher - Lock should not be removed 
This is within the failed lock acquiring branch. So the lock is free by another process and should not be removed because the cached file (that was created by the process having the lock) appeared on the filesystem.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-16 10:02:18 +02:00
Morris Jobke
e5fe3426c3
Provide log statements for SCSS cache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-10-16 00:09:11 +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
Roeland Jago Douma
4768526b81
Give up after 10 seconds in SCSS timeout 
Else we keep idling for ages which leads to bad UX

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-06-19 14:39:31 +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
30d985b639
Migrate leafo/scssphp to scssphp/scssphp 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-01-23 14:52:16 +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
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
ee743867d4
Make sure the cache is only reset once at a time 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-15 15:17:16 +02:00
Julius Härtl
e51010b0f4
Use a distributed cache for the isCachedCache 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-15 11:56:02 +02:00
Roeland Jago Douma
f8aeef7ae9
Lock SCSS so we only run 1 job at a time 
This is bit hacky but a start to lock the SCSS compiler properly
Retry during 10s then give up
Properly get error message
Do not clear locks and properly debug scss caching

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-12 16:18:02 +02:00
Julius Härtl
e8938df198
Move SCSS variable fetching before the variables.scss to properly calculate color values 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-29 16:47:39 +02:00
Julius Härtl
6ce474518c
Append cache bump parameter to scss files URL 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-08-01 12:42:49 +02:00
Robin Appelman
6686ca9b2a
cache isCached state for scss resources 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-24 17:30:39 +02:00
Julius Härtl
6ed8c19ab9
Use proper URL prefix for icons 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-19 08:16:59 +02:00
John Molakvoæ (skjnldsv)
14bc9ffda4
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:59 +02:00
John Molakvoæ (skjnldsv)
8977c71f88
Mixin scss icon api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:58 +02:00
John Molakvoæ (skjnldsv)
29ff7efe9a
Svg icon api sass function and upgrade of all styles 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:57 +02:00
John Molakvoæ (skjnldsv)
84e90e26c0
Svg color api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-19 08:16:30 +02:00
Roland Tapken
6270a01cab
Issue #9318: catch exceptions in SCSSCacher::resetCache() 
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-05-02 21:23:13 +02:00
John Molakvoæ (skjnldsv)
1d7b14dfb1
Use app version to generate scss filename 
Fixed scsscacher tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-28 08:33:46 +02:00
Julius Härtl
63e261b444
Actually clear cache values for all base urls 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-03-07 15:09:43 +01:00
Julius Härtl
b87e5a0f2e
Move depsCache clearing to SCSSCacher/JSCombiner 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00
Julius Härtl
7381a81d30
Add repair step to clear frontend related caches 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00
Julius Härtl
e4c58fc473
Add typehinting an fix some minor cleanup 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 20:11:37 +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
Julius Härtl
68db09ddce
Clear injectect variables when resetting the cache 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:07:30 +01:00
Julius Härtl
5eae4819bf
Make sure that injected variables do not break the CSS generation 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 17:03:22 +01:00
Julius Härtl
92e93704be
SCSS files are only cached if their size is > 0 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 17:02:54 +01:00
John Molakvoæ (skjnldsv)
c0c4443ffc
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
02bfc867ef
Added tests for various installations types 
- With root installation
 - Core css
 - App inside server root
 - Secondary apps directory outside server root
- With an installation in a sub directory
 - Core css
 - App inside server root
 - Secondary apps directory outside server root

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
88b72fd027
Fixup! getWebdir return 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:45 +01:00
John Molakvoæ (skjnldsv)
dc938628f7
Use OC_Util function for app web path 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
ad20af619f
getWebDir function 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
89ca9cb35c
Fixed webroot for scss files 
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:44 +01:00
John Molakvoæ (skjnldsv)
fb6c5cc416
Fixed scss url rewriting 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-30 05:55:43 +01:00
John Molakvoæ (skjnldsv)
f2d5927ea3
Reduce length of md5 in scss caching 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-12-14 11:11:54 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
John Molakvoæ (skjnldsv)
dec713fc92
Do not stop on scss compilation failure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-26 15:29:37 +02:00