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

Jump to bottom

[assets] configurable URL for static resources #7911

Merged
merged 23 commits into from
Oct 22, 2019
Merged

[assets] configurable URL for static resources #7911

merged 23 commits into from
Oct 22, 2019

Commits on Jul 14, 2019

  1. static url

    @lunny
    lunny committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    c559a9f View commit details
    Browse the repository at this point in the history

  2. add cors support for static resources

    @lunny
    lunny committed Jul 14, 2019
    Configuration menu
    Copy the full SHA
    42f964f View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2019

  1. Merge branch 'master' into lunny/static_url

    @zeripath
    zeripath authored Aug 2, 2019
    Configuration menu
    Copy the full SHA
    dd82d6f View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2019

  1. Merge remote-tracking branch 'upstream/master' into lunny/static_url

    @das7pad
    das7pad committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    9b86fbb View commit details
    Browse the repository at this point in the history

  2. [assets] work on the migration to configurable url for assets 

    Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
    @das7pad
    das7pad committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    219cec5 View commit details
    Browse the repository at this point in the history

  3. [misc] fix whitespace 

    Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
    @das7pad
    das7pad committed Aug 18, 2019
    Configuration menu
    Copy the full SHA
    f219cac View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2019

  1. [assets] fix the loading of the manifest.json 

    It is generated dynamically, and as such can not be served by the cdn.

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
    @das7pad
    das7pad committed Aug 19, 2019
    Configuration menu
    Copy the full SHA
    afd9218 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2019

  1. Merge branch 'master' into lunny/static_url

    @techknowlogick
    techknowlogick authored Aug 26, 2019
    Configuration menu
    Copy the full SHA
    dc06785 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2019

  1. Merge remote-tracking branch 'upstream/master' into lunny/static_url 

    # Conflicts:
#	templates/admin/hook_new.tmpl
    @das7pad
    das7pad committed Aug 27, 2019
    Configuration menu
    Copy the full SHA
    08de5bc View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2019

  1. Revert "add cors support for static resources" 

    This reverts commit 42f964f

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
    @das7pad
    das7pad committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    743b2f7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into lunny/static_url

    @das7pad
    das7pad committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    fe285b6 View commit details
    Browse the repository at this point in the history

  3. [docs] add the STATIC_URL_PREFIX option 

    Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
    @das7pad
    das7pad committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    4b1e3d8 View commit details
    Browse the repository at this point in the history

  4. [docs] reverse-proxy: nginx: add two setups for STATIC_URL_PREFIX 

    Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
    @das7pad
    das7pad committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    36e661e View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2019

  1. Merge branch 'master' into lunny/static_url

    @das7pad
    das7pad authored Sep 7, 2019
    Configuration menu
    Copy the full SHA
    8987851 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2019

  1. Merge branch 'master' into lunny/static_url

    @lunny
    lunny authored Oct 8, 2019
    Configuration menu
    Copy the full SHA
    aefe7d9 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2019

  1. Merge remote-tracking branch 'upstream/master' into lunny/static_url 

    # Conflicts:
#	modules/setting/setting.go
    @das7pad
    das7pad committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    50eece0 View commit details
    Browse the repository at this point in the history

  2. [assets] migrate the url of a new asset to the static url prefix 

    REF: f2a3abc
Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
    @das7pad
    das7pad committed Oct 16, 2019
    Configuration menu
    Copy the full SHA
    6b625a0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into lunny/static_url

    @lunny
    lunny authored Oct 16, 2019
    Configuration menu
    Copy the full SHA
    fb41d86 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into lunny/static_url

    @lunny
    lunny authored Oct 16, 2019
    Configuration menu
    Copy the full SHA
    6378714 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2019

  1. Merge branch 'master' into lunny/static_url

    @zeripath
    zeripath authored Oct 19, 2019
    Configuration menu
    Copy the full SHA
    44c857c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into lunny/static_url

    @lunny
    lunny authored Oct 19, 2019
    Configuration menu
    Copy the full SHA
    aca81f6 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2019

  1. Merge branch 'master' into lunny/static_url

    @zeripath
    zeripath authored Oct 21, 2019
    Configuration menu
    Copy the full SHA
    16c8fdf View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2019

  1. Merge branch 'master' into lunny/static_url

    @zeripath
    zeripath authored Oct 22, 2019
    Configuration menu
    Copy the full SHA
    cfa4a60 View commit details
    Browse the repository at this point in the history