Skip to content

[Stable12] fix scss webroot and url rewrite #7688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 15 commits into from
Jan 5, 2018
Merged

[Stable12] fix scss webroot and url rewrite #7688

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f13b3b6
Fixed scss url rewriting
skjnldsv Dec 27, 2017
00412d1
Fixed webroot for scss files
skjnldsv Dec 27, 2017
5008eb8
getWebDir function
skjnldsv Dec 27, 2017
89b6bc9
Use OC_Util function for app web path
skjnldsv Dec 28, 2017
a46d45a
Fixup! getWebdir return
skjnldsv Dec 28, 2017
87b1839
Added tests for various installations types
skjnldsv Dec 28, 2017
9fa49c7
Correctly remove temp test directory tree
skjnldsv Dec 28, 2017
1ae126a
Fixed tests
skjnldsv Dec 28, 2017
51cc76b
Fixed tests
skjnldsv Jan 4, 2018
fa95733
Fixed url rebase with theming
skjnldsv Jan 4, 2018
cf53560
Proberly detect variable changes
skjnldsv Jan 4, 2018
1f2437e
Fixup! Proberly detect variable changes
skjnldsv Jan 4, 2018
7bc63f6
Fix faulty path in theming scss generation
juliusknorr Jan 5, 2018
7a282de
Rollback caching fix
skjnldsv Jan 5, 2018
b95d18b
Revert rebaseurl function edit
skjnldsv Jan 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
  • Loading branch information
@skjnldsv
skjnldsv committed Jan 4, 2018
commit 51cc76b80db415320c8e34cbc961855fac77b77c
2 changes: 1 addition & 1 deletion tests/lib/Template/CSSResourceLocatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public function testFindSCSSWithAppPathSymlink() {
$webRoot = $resource[1];
$file = $resource[2];

$expectedRoot = '/';
$expectedRoot = '';
$expectedWebRoot = '';
$expectedFile = 'test-file';

Expand Down