Skip to content

[FIX] Links and upload paths when running in a subdir#13982

Merged
rodrigok merged 3 commits intodevelopfrom
fix-links0-when-run-in-subdir
Apr 6, 2019
Merged

[FIX] Links and upload paths when running in a subdir#13982
rodrigok merged 3 commits intodevelopfrom
fix-links0-when-run-in-subdir

Conversation

@MarcosSpessatto
Copy link
Contributor

@MarcosSpessatto MarcosSpessatto commented Apr 2, 2019

Maybe related to #13849

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13982 April 2, 2019 20:21 Inactive
@MarcosSpessatto MarcosSpessatto added this to the 1.1.0 milestone Apr 2, 2019
@ura14h
Copy link
Contributor

ura14h commented Apr 3, 2019

@MarcosSpessatto
The commit #13746 may give your pull-request a impact. I recommend to merge the latest master and check your patch.

@MarcosSpessatto
Copy link
Contributor Author

@ura14h thanks for let me know, but this branch is updated with the latest develop changes, what means that your changes already is there. 🙂

currentSize = data.css.length;
Inject.rawHead('css-theme', `<link rel="stylesheet" type="text/css" href="/theme.css?${ currentHash }">`);
const themePath = `/theme.css?${ currentHash }`;
Inject.rawHead('css-theme', `<link rel="stylesheet" type="text/css" href=${ getURL(themePath) }>`);
Copy link
Contributor

@geekgonecrazy geekgonecrazy Apr 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesn't this href still need to be in " ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does not need, does not change behavior, but I'll add to keep the pattern.

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13982 April 5, 2019 18:27 Inactive
@sampaiodiego sampaiodiego changed the title [FIX] Fix links to run correctly when the server is running in a subdir [FIX] Links and upload paths when running in a subdir Apr 6, 2019
@rodrigok rodrigok merged commit bc80e0e into develop Apr 6, 2019
@rodrigok rodrigok deleted the fix-links0-when-run-in-subdir branch April 6, 2019 17:59
wreiske added a commit to wreiske/Rocket.Chat that referenced this pull request Apr 7, 2019
… into emoji-upgrades

* 'emoji-upgrades' of https://github.com/wreiske/Rocket.Chat:
  Settings: disable reset button (RocketChat#14026)
  Settings: hiding  reset button for readonly fields (RocketChat#14025)
  [NEW] Add support to updatedSince parameter in emoji-custom.list and deprecated old endpoint (RocketChat#13510)
  [IMPROVE] Add permission to change other user profile avatar (RocketChat#13884)
  [IMPROVE] UI of Permissions page (RocketChat#13732)
  [NEW] Chatpal: Enable custom search parameters (RocketChat#13828) (RocketChat#13829)
  [FIX] Closing sidebar when room menu is clicked. (RocketChat#13842)
  [FIX] Check settings for name requirement before validating (RocketChat#14021)
  Fix debug logging not being enabled by the setting (RocketChat#13979)
  [FIX] Links and upload paths when running in a subdir (RocketChat#13982)
@rodrigok rodrigok mentioned this pull request Apr 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

Comments