auth/saml default remoteuser (bug #932909)

Ensure that default behaviour is to match user
to remote user name

(cherry picked from commit f07be6020e70fa8f53cd77fdcd63e7fd7ff8aaea)

Conflicts:

	htdocs/auth/saml/lib.php

Change-Id: I4db156b2e0023315a2bcf09f47c4fbf7b23ce348
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Fixed Youtube html filter.

The html filter will now parse links with dashes and underscores in them.
Also will now parse links with parameters in them.
Also will now parse links that use https.

Bug #884438

Change-Id: I2375018af717f1384339937606040442fdf60455
Signed-off-by: Christopher Tombleson <christopher@catalyst.net.nz>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Merge "auth/saml default remoteuser (bug #932909)" into 1.4_STABLE
Merge "Fixed Youtube html filter." into 1.4_STABLE
Switch site registration URL to HTTPS (bug #943772)

Change-Id: I37e71267f9547a4245c852c6c995bde85ceb07e2
Signed-off-by: Francois Marier <francois@catalyst.net.nz>
Merge "Switch site registration URL to HTTPS (bug #943772)" into 1.4_STABLE
Version bump for 1.4.2

Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Version bump for 1.4.3testing

Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Add youtu.be to video filters (bug #1017464)

Youtube started giving youtu.be urls in their embed codes since
1.4.0 came out. It was added in 1.5 < but not ported to 1.4.

Change-Id: I210e5957c1678cdb58bcb4b80bb618bf175aa9e2
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Merge "Add youtu.be to video filters (bug #1017464)" into 1.4_STABLE
Json-encode login form when injected by js (bug #1009784)

Change-Id: Ia81053332cfa9e0f79268031795af8d34b45ff78
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>
Patch XSS vulnerability in Insert/Edit Image in Edit blog

Change-Id: Ia9df5e4eef4f3fb50ae1464540d777522179ac82
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>
Merge "Json-encode login form when injected by js (bug #1009784)" into 1.4_STABLE
Merge "Patch XSS vulnerability in Insert/Edit Image in Edit blog" into 1.4_STABLE
Sanitize links in links and resources menu (bug #1009774)

Links placed in the links and resources list have not been getting
checked and so have been displayed unfiltered to users and other
admins. These user-supplied links are now checked with sanitize_url
which has been extended to convert relative links to absolute.

Change-Id: I679627c4e33621df82705c39e77e7226ffef5a97
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Merge "Sanitize links in links and resources menu (bug #1009774)" into 1.4_STABLE
Version bump for 1.4.3

Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Version bump for 1.4.4testing

Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Fix XML Security bug

Change-Id: If2c9df36670aaae597470d0b640b4b58b2fb12e6
Signed-off-by: Melissa Draper <melissa@catalyst.net.nz>
Merge "Fix XML Security bug" into 1.4_STABLE