Ghada El-Zoghbi authored Jun 03, 2019 and Robert Lyon committed Jun 15, 2019

When a page is shared by a group and the event log
is set to All, check if a log needs to be inserted
for the event: sharedcommenttogroup.

Sponsored by The Australian National University

behatnotneeded

Change-Id: Iafe2120a37049a1b1bca9ab1e23503d93efc12ea
(cherry picked from commit 7040639d)

Ghada El-Zoghbi authored Jun 14, 2019 and Robert Lyon committed Jun 15, 2019

If an empty string is passed to the DOMDocument, a warning is
generated. Avoid the warning by checking for an empty string.

Sponsored by The Australian National University

behatnotneeded

Change-Id: I4bd3982de81f6db97601a1dbe5232d344e87ca81

Ghada El-Zoghbi authored Jun 14, 2019 and Robert Lyon committed Jun 15, 2019

For a regular member who does not have permission to
add a journal to a group, the display message should
not include the 'Add one' link.

Sponsored by The Australian National University

behatnotneeded

Change-Id: I657f47b51b2c505cab4c2501f39e03b0252bdf72
(cherry picked from commit 9188fc20)
(cherry picked from commit c40945d8)

Robert Lyon authored May 07, 2019 and Cecilia Vela Gurovic committed May 14, 2019

Problem with trying to use expression as variable

behatnotneeded

Change-Id: I58409ab8373b9db8af9bc1a2b682995e3722f140
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 2ab0b286)
(cherry picked from commit 704050af)

Robert Lyon authored May 06, 2019 and Cecilia Vela Gurovic committed May 14, 2019

This patch rewrites the path to the html export version of the PDF file

behatnotneeded

Change-Id: I8d534af41258d219046e5f3586bf904777242cb9
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit d094f841)
(cherry picked from commit 9b29d17e)

Robert Lyon authored May 08, 2019 and Cecilia Vela Gurovic committed May 13, 2019

Need the default settings be interger rather than true/false

behatnotneeded

Change-Id: I65a032e3a5b1cf363b6f0ebcc6c7f5a3b30c2f34
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit e3171960)
(cherry picked from commit 883bb2cb)

Robert Lyon authored May 08, 2019 and Cecilia Vela Gurovic committed May 13, 2019

behatnotneeded

Change-Id: I04e7787c9d17418d2a5e80df3035255cb51b6d51
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit dc64aa25)

Behatnotneeded

Change-Id: Id4a2e64ae970dad25065ca38bc98de0a268c1c17
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 0aa44264)
(cherry picked from commit 8da7dfe1)

Rebecca Blundell authored Apr 24, 2019 and Robert Lyon committed May 07, 2019

Add code to remove lockblocks from a page
so that the page can successfully be deleted by the site admin
or the page owner.

behatnotneeded

Change-Id: I247bac245d3f9447c701b8db48dad9be15c15070
(cherry picked from commit d73d68fc)

behatnotneeded

Change-Id: I0ad0e632dbb3a2cf26cda321d0ec0a550b579d02
(cherry picked from commit 59cf4d24)

Currently we only log it to screen / error log but not add it to
admin's email

behatnotneeded

Change-Id: I2c092050c5b0e330d6033508d811bdb6cc15c25d
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 340687dd)

Because the external media loading takes focus from next add block we
should do this one last to avoid the clash.

Change-Id: If89a658fd5be4578052ede703299832a0498eac4
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit e6069b7c)

Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Robert Lyon authored Mar 12, 2019 and Cecilia Vela Gurovic committed Apr 30, 2019

To avoid potential XSS vector

behatnotneeded

Change-Id: I00eb57f1421a0969f8da93ace6210f84c0830fa7
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 51726c19)
(cherry picked from commit 270e2f73)

Robert Lyon authored Feb 22, 2019 and Cecilia Vela Gurovic committed Apr 30, 2019

behatnotneeded

Change-Id: I1e4b44f7fa39779eaf91c992e47d8e075b6cbe33
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 6e554667)
(cherry picked from commit d2bfca1c)

behatnotneeded

Change-Id: I014b602ee57f2e47effe518ffafc659dc453bb9e
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit b2020d5a)

Kevin Dibble authored Mar 25, 2019 and Robert Lyon committed Apr 26, 2019

Updated view to allow the user admin to view content if it has
reported objectionable content.

behatnotneeded

Change-Id: I277902b5a6121c5daaa6f692dcc391e9ef99caf8
(cherry picked from commit 39d44286)
(cherry picked from commit e535179c)

otherwise 'make css' fails

behatnotneeded

Change-Id: I47e6fda1999e95adc561c6bdeeda5fe8246c765e
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

We had a patch for ignoring parameters prefixed with 'custom_' in
bug 1697909 - but there were still problems from users when trying to
install LTI connections.

So we will now ignore any unknown parameter and let the user know by
recording this in the Mahara error log - we however will not be
returning the info about the extra parameters back to the system that
made the webservice call

behatnotneeded

Change-Id: I0cf5d966833a48e7db13d48b9e0be87285934002
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 515cfba6)
(cherry picked from commit e39ac7ce)

Robert Lyon authored Apr 08, 2019 and Cecilia Vela Gurovic committed Apr 17, 2019

Also allow embedded image export for Leap2A

This is for fixing points 2 and 3 on comment #3



behatnotneeded

Change-Id: I0f793c307b7cab978045881045722fd2150ded48
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit a86fb46a)
(cherry picked from commit dfd374da)

Cecilia Vela Gurovic authored Feb 18, 2019 and Robert Lyon committed Apr 15, 2019

behatnotneeded

Change-Id: I26ebb888908a8be5ba96057920f73c5507e3bbc9
(cherry picked from commit 1fa6bfc5)
(cherry picked from commit d946010e)

Cecilia Vela Gurovic authored Apr 10, 2019 and Robert Lyon committed Apr 11, 2019

need to populate js variable that contains external auth instances

this code was removed in following patch but we need it
https://reviews.mahara.org/#/c/8528/21

behatnotneeded

Change-Id: I7789cd3f61738de775df73c6eb5f1bc7a7f039be
(cherry picked from commit 03b8a0a6)
(cherry picked from commit f8ee1cd0)

Backporting change for creating version from
https://reviews.mahara.org/#/c/9615/



behatnotneeded

Change-Id: Ifa957f82ab250ab49d648fa081fbba107763b5cb
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

Cecilia Vela Gurovic authored Apr 09, 2019 and Robert Lyon committed Apr 10, 2019

behatnotneeded

Change-Id: Ief0fe215ac5f376db4e09bbab7fa724e81bf1b36

Cecilia Vela Gurovic authored Dec 28, 2018 and Robert Lyon committed Apr 07, 2019

saves in version

for plans:
 title
 description
 tags

for tasks:
 task title
 description
 completion date
 completed status(yes/no)
 tags

behatnotneeded
Change-Id: Ib09cf4b8718f1180cb5f021bc532659db7f39647
(cherry picked from commit b829af50)

There are two $string['portfolio'] strings one needs to be uppercase

behatnotneeded

Change-Id: Ia5e0390e719099408105c34810dae2fed35ad9b5
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 11534107)

Ghada El-Zoghbi authored Mar 13, 2019 and Robert Lyon committed Mar 27, 2019

behatnotneeded

Change-Id: Ifb11779659e707753ab5305684a4f1281f03931f
(cherry picked from commit f994c862)

Render the 'blog' blocktype with pagination in normal display but no
pagination in versioning display / or html export but rather list all
entries

behatnotneeded

Change-Id: If91c29b29240b31960fa15fca621fe2aea36f12c
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 0cfb63e6)

Robert Lyon authored Mar 20, 2019 and Cecilia Vela Gurovic committed Mar 26, 2019

We just want retracted blocks to display as non-retracted

behatnotneeded

Change-Id: I30a10f99784fc33c459a551f8c9b93ef890c5844
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 99c6bcdd)

In the arrow menu
So that it woeks on sites with clean urls

behatnotneeded

Change-Id: I1a20ae15dfac41db236b8862a7738f1e991d5480
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 099fb56d)

Rebecca Blundell authored Feb 26, 2019 and Cecilia Vela Gurovic committed Mar 06, 2019

behatnotneeded

Change-Id: I334c936f6eb5e41a5c70ee69cc97206653b7e321
(cherry picked from commit 373c3756)

Robert Lyon authored Feb 12, 2019 and Cecilia Vela Gurovic committed Mar 04, 2019

behatnotneeded

Change-Id: I2bc1172044a160d72905bf56a55f505ccd1250c0
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 650fae55)

Robert Lyon authored Feb 21, 2019 and Cecilia Vela Gurovic committed Mar 04, 2019

behatnotneeded

Change-Id: I5c219529ab0a5d193b6cbaf20207a76dec752515
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 9d554c02)

Fixing up some more places, like elasticsearch results, where we are
trying to get a cound on a variable that is not an array

behatnotneeded

Change-Id: I09b809240f18892a187c5e5ed2a3d1756e39b247
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit ef57506f)

Robert Lyon authored Feb 18, 2019 and Cecilia Vela Gurovic committed Feb 19, 2019

When adding comment to the entry and the journal is owned by
group/institution

behatnotneeded

Change-Id: Id492c04e3facdbf00a5dfdc4d714c3c5103ff3a2
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 5988b7de)

Fixes the problems with 'peerassesment' option and also adds the
'verify' option

behatnotneeded

Change-Id: I6492057738fa35b1de7262ee19621795ea10b0c3
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

and we got to 2nd page of pagination in a blog block

behatnotneeded

Change-Id: Ia6b3401ca63b7f2a25cc415726d51bb0400ef8d8
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 9f031671)