-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.
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
Use base url for cache prefix and SCSS caching #5429
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
juliusknorr
commented
Jun 15, 2017
- Add base url as cache prefix so cached imagePath calls will be stored for each base url (Nextcloud 12.0.0 caches complete URLs in redis #5329)
- Prefix cached SCSS files with hashed baseurl (fix for Theming background image fails for other trusted domains #5085 as discussed in Do not use absolute urls in SCSS #5137)
- Cleanup URLGenerator test
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rullzer, @LukasReschke and @tanghus to be potential reviewers. |
juliusknorr
force-pushed
the
cache-baseurl
branch
from
June 15, 2017 20:15
1f237aa
to
4aa2c5a
Compare
juliusknorr
force-pushed
the
cache-baseurl
branch
from
June 16, 2017 08:40
4aa2c5a
to
1add3f3
Compare
Codecov Report
@@ Coverage Diff @@
## master #5429 +/- ##
============================================
+ Coverage 54.13% 54.14% +<.01%
- Complexity 22329 22344 +15
============================================
Files 1380 1380
Lines 85544 85547 +3
Branches 1329 1329
============================================
+ Hits 46311 46321 +10
+ Misses 39233 39226 -7
|
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
juliusknorr
force-pushed
the
cache-baseurl
branch
from
June 16, 2017 08:52
1add3f3
to
517dfdd
Compare
LukasReschke
approved these changes
Jun 17, 2017
MorrisJobke
approved these changes
Jun 19, 2017
It fixes bugs in 12 (all linked above) I pledge for backporting to 12. |
danxuliu
added a commit
that referenced
this pull request
Aug 4, 2017
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; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the DataResponse from the controller now provides the full URL to the "server.css" file that has to be reloaded (if any). Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Merged
danxuliu
added a commit
that referenced
this pull request
Aug 4, 2017
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; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the DataResponse from the controller now provides the full URL to the "server.css" file that has to be reloaded (if any). Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
danxuliu
added a commit
that referenced
this pull request
Aug 8, 2017
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; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the DataResponse from the controller now provides the full URL to the "server.css" file that has to be reloaded (if any). Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
danxuliu
added a commit
that referenced
this pull request
Aug 10, 2017
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>
danxuliu
added a commit
that referenced
this pull request
Aug 10, 2017
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; as the file can not be loaded the "Loading preview" message is never removed and the "Saved" message is never shown. As it now depends on the hash of the base URL the file to be reloaded can no longer be hardcoded, so the full URL to the "server.css" file that has to be reloaded (if any) is now got from the DataResponse provided by the controller. Fixes #5975 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Was backported in #5584 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.