Skip to content
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

[assets] configurable URL for static resources #7911

Merged
merged 23 commits into from
Oct 22, 2019
Merged

[assets] configurable URL for static resources #7911

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c559a9f
static url
lunny Mar 14, 2019
42f964f
add cors support for static resources
lunny Jul 14, 2019
dd82d6f
Merge branch 'master' into lunny/static_url
zeripath Aug 2, 2019
9b86fbb
Merge remote-tracking branch 'upstream/master' into lunny/static_url
das7pad Aug 18, 2019
219cec5
[assets] work on the migration to configurable url for assets
das7pad Aug 18, 2019
f219cac
[misc] fix whitespace
das7pad Aug 18, 2019
afd9218
[assets] fix the loading of the manifest.json
das7pad Aug 19, 2019
dc06785
Merge branch 'master' into lunny/static_url
techknowlogick Aug 26, 2019
08de5bc
Merge remote-tracking branch 'upstream/master' into lunny/static_url
das7pad Aug 27, 2019
743b2f7
Revert "add cors support for static resources"
das7pad Aug 28, 2019
fe285b6
Merge remote-tracking branch 'upstream/master' into lunny/static_url
das7pad Aug 28, 2019
4b1e3d8
[docs] add the STATIC_URL_PREFIX option
das7pad Aug 28, 2019
36e661e
[docs] reverse-proxy: nginx: add two setups for STATIC_URL_PREFIX
das7pad Aug 28, 2019
8987851
Merge branch 'master' into lunny/static_url
das7pad Sep 7, 2019
aefe7d9
Merge branch 'master' into lunny/static_url
lunny Oct 8, 2019
50eece0
Merge remote-tracking branch 'upstream/master' into lunny/static_url
das7pad Oct 16, 2019
6b625a0
[assets] migrate the url of a new asset to the static url prefix
das7pad Oct 16, 2019
fb41d86
Merge branch 'master' into lunny/static_url
lunny Oct 16, 2019
6378714
Merge branch 'master' into lunny/static_url
lunny Oct 16, 2019
44c857c
Merge branch 'master' into lunny/static_url
zeripath Oct 19, 2019
aca81f6
Merge branch 'master' into lunny/static_url
lunny Oct 19, 2019
16c8fdf
Merge branch 'master' into lunny/static_url
zeripath Oct 21, 2019
cfa4a60
Merge branch 'master' into lunny/static_url
zeripath Oct 22, 2019
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
Merge branch 'master' into lunny/static_url
  • Loading branch information
@lunny
lunny authored Oct 8, 2019
commit aefe7d98890e516a7b95e9ba7f1fad0eb66e11be

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.