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

Bringing fork up to date #1

Merged
merged 21 commits into from
Mar 25, 2019
Merged

Bringing fork up to date #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d78337c
Added join/list public/private teams permissions (#2393)
jespino Mar 19, 2019
764c126
MM-12488: Adds groups search and filters. (#2461)
mkraft Mar 19, 2019
b0ad1fb
Remove period from OAuth apps description in Main Menu > Integrations…
jasonblais Mar 19, 2019
abf1cdd
[MM-14253] Modify Elasticsearch admin console messages to reference u…
mgdelacroix Mar 19, 2019
2ddd75a
MM-13634 Fix error message when drag and dropping folders (#2449)
jwilander Mar 19, 2019
be23c33
[MM-14356] Some strings in Channel Settings aren't localizable (#2484)
bradjcoughlin Mar 20, 2019
1796712
[MM-14571] Add e2e to test @mentions notifications (#2507)
thekiiingbob Mar 20, 2019
b696197
MM-14533 - Removing width for channel title (#2497)
asaadmahmood Mar 20, 2019
c55a82e
[MM-13482] Adds e2e tests to check timestamp on edited post (#10041) …
letsila Mar 20, 2019
3ed1e03
UI Automation: Write an automated test for Mobile using cypress. Dele…
d28park Mar 20, 2019
c071663
MM-14350: Fixes relative link under custom subpath. (#2511)
mkraft Mar 20, 2019
543c0cd
translations PR 20190318 (#2517)
enahum Mar 20, 2019
ee41ff2
MM-14500 Fix for pop caused by size_aware_image (#2469)
sudheerDev Mar 20, 2019
320995d
[MM-14491] avoid hiding the popover when the cursor is moved away fro…
kosgrz Mar 20, 2019
38b9bd9
add hide prop to profile popover from the at_mention component (#2506)
mickmister Mar 20, 2019
c426e3a
added marked commit that fixes formatted embedded link to italicize w…
saturninoabril Mar 21, 2019
3380271
MM-14358 - E2E Test for "Message Draft Pencil Icon visible in channel…
kelvintyb Mar 21, 2019
a242f14
Add (SAML|LDAP|Email) Login Button Color Configurations (#2502)
lieut-data Mar 21, 2019
4b3ada3
[MM-14375] Fix flaky test on collapsed specs and separated markdown s…
saturninoabril Mar 22, 2019
89e0e82
fix flaky tests on some account settings specs (#2530)
saturninoabril Mar 23, 2019
ff2190a
custom URL scheme upper case letters not working (#2309)
Hobby-Student Mar 23, 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
custom URL scheme upper case letters not working (mattermost#2309)
  • Loading branch information
@Hobby-Student @hanzei
Hobby-Student authored and hanzei committed Mar 23, 2019
commit ff2190afe8dedda5aef42cf5dc5a247bb98d9406
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"localforage": "1.7.3",
"localforage-observable": "1.4.0",
"mark.js": "8.11.1",
"marked": "github:mattermost/marked#2c0c788631f703cad7cdc9fbbdc54ca4b6166b25",
"marked": "github:mattermost/marked#7041218f9bd64e4bdf9eb2de1b07be57c9050705",
"mattermost-redux": "github:mattermost/mattermost-redux#c57649018344820122c00b485118415588f2778b",
"moment-timezone": "0.5.23",
"pdfjs-dist": "2.0.489",
Expand Down
2 changes: 1 addition & 1 deletion utils/markdown/renderer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export default class Renderer extends marked.Renderer {
if (!scheme) {
outHref = `http:https://${outHref}`;
} else if (isUrl && this.formattingOptions.autolinkedUrlSchemes) {
const isValidUrl = this.formattingOptions.autolinkedUrlSchemes.indexOf(scheme) !== -1;
const isValidUrl = this.formattingOptions.autolinkedUrlSchemes.indexOf(scheme.toLowerCase()) !== -1;

if (!isValidUrl) {
return text;
Expand Down