Commits · 3f57d1282f0e30660b3ba341d296692fca8485c3 · mahara / mahara

22 Jul, 2019 4 commits

Behat fix for install_framework.feature · 3f57d128

Robert Lyon authored Jul 22, 2019

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

3f57d128

Bug 1825282: Show only html in smartevidence add feedback modal · 151207ad

Cecilia Vela Gurovic authored Jul 19, 2019

for the owner of the collection when the framework is not a
self-assess one
and for institution staff when the framework is a self-assess one

behatnotneeded

Change-Id: Iac63c94b7e07a526e2e8790de1d7f4fc7e409160

151207ad

Fix problem with elasticsearch testing in behat · 3361b419

Robert Lyon authored Jul 11, 2019

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

3361b419

Bug 1835321: behat test- published assessment is visible · 9cefb8a6
Cecilia Vela Gurovic authored Jul 22, 2019
```
for all user that can access the view

Change-Id: If29fe56b993f27f69601e3536b6fd2baea47f363
```
9cefb8a6

21 Jul, 2019 1 commit

Bug 1818591: Fix undefined index versioning error · 5d40e61e

Rebecca Blundell authored Jun 18, 2019

behatnotneeded

Change-Id: I144b9763c393e8956d831b3169099b37d8fb4a0b
(cherry picked from commit 96feeef9)

5d40e61e

19 Jul, 2019 2 commits

Bug 1834470: Profile picture generates error when uploaded to Image Gallery. · bb240018

anupamadharmajan authored Jul 17, 2019

Fixed undefined upload_max_filesize variable and artefact type mismatch for profileicon

Sponsored by The Australian National University

behatnotneeded

Change-Id: I2014806ffbf8d36311d857f43de359e3f477dc58
(cherry picked from commit 99c88532)

bb240018

Bug 1827000: count(): Parameter must be an array in statistics.php:2408 · d2762fdc

Cecilia Vela Gurovic authored May 02, 2019

Also fixed problem on Content stats page when they have not been
generated by cron job

behatnotneeded

Change-Id: I6d1a1d5557ab99c9a1513196e2f83d7b2fb89e50
(cherry picked from commit 66f8ac10)

d2762fdc

18 Jul, 2019 2 commits
- Merge "Bug 1830847: Update info about upgrade" into 18.10_STABLE · 6f472d7f
  Cecilia Vela Gurovic authored Jul 19, 2019
  
  6f472d7f
- Bug 1835988: Needing to include datepicker *.js files correctly · ed821743
  Robert Lyon authored Jul 10, 2019
```
When the site is a subdirectory

behatnotneeded

Change-Id: I53a562f9fb5c7f52132cbabd00bb6bb3969a35f3
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit b6f63ff7)
```
  ed821743
17 Jul, 2019 3 commits

Bug 1830847: Update info about upgrade · e413627f

Robert Lyon authored Jul 17, 2019

behatnotneeded

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

e413627f

Bug 1824767: site template should not have the edit access section · 59ab073d
Cecilia Vela Gurovic authored May 02, 2019
```
behatnotneeded

Change-Id: I40553bc4ebf69eef950f1c170d442aa7a963efe0
(cherry picked from commit 0e1d50d4)
```
59ab073d

Bug 1835321: Manager can't see peer block when published · 12235f11

Cecilia Vela Gurovic authored Jul 04, 2019

WR#315075

Once the asessment is published by the author,
it'is supposed to be visible to everybody that
has access to the view

behatnotneeded

Change-Id: I116b665945a3d45fa2a14bb7654e55f561428368
(cherry picked from commit 7a2d6ce6)

12235f11

21 Jun, 2019 1 commit
- Merge "Bug 1785985: Offset the problematic cron jobs" into 18.10_STABLE · 27c127d1
  Robert Lyon authored Jun 21, 2019
  
  27c127d1
20 Jun, 2019 3 commits

Merge "Bug 1817326: Modal in a Modal popup problem" into 18.10_STABLE · bd6c0144
Robert Lyon authored Jun 21, 2019

bd6c0144

Bug 1817326: Modal in a Modal popup problem for editcomposite · 757ba5e6

Robert Lyon authored Jun 21, 2019

When closing the inner modal it removes a class from the <body> tag
causing the scrolling to break

behatnotneeded

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

757ba5e6

Bug 1817326: Modal in a Modal popup problem · cea4728f

Robert Lyon authored Jun 21, 2019

When closing the inner modal it removes a class from the <body> tag
causing the scrolling to break

behatnotneeded

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

cea4728f

19 Jun, 2019 1 commit
- Merge "Bug 1825092: Check institution is set in autocomplete form element" into 18.10_STABLE · b50c1565
  Robert Lyon authored Jun 19, 2019
  
  b50c1565
17 Jun, 2019 1 commit

Bug 1832805: Add missing lang strings when saving page to timeline · 6da035a1

Ghada El-Zoghbi authored Jun 17, 2019

Four new lang strings:
* cantversionviewinvalid
* cantversionvieweditpermissions
* cantversionviewsubmitted
* cantversionviewgroupeditwindow

Have separated the scenarios out for better feedback to the user.

Sponsored by The Australian National University

behatnotneeded

Change-Id: Id4952c37f35631b2f6a1dfad8129bac48108d733
(cherry picked from commit 1a08674a)
(cherry picked from commit 3cfbd58d)

6da035a1

14 Jun, 2019 3 commits

Bug 1831419: validate insertion of event log for comment · 467f1b08

Ghada El-Zoghbi authored Jun 03, 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)

467f1b08

Bug 1832803: Check for empty string before passing it to DOMDocument · 3dc61041

Ghada El-Zoghbi authored Jun 14, 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

3dc61041

Bug 1832796: Group journals - display add link only if user has permission · f6930a74

Ghada El-Zoghbi authored Jun 14, 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)

f6930a74

16 May, 2019 1 commit

Bug 1785985: Offset the problematic cron jobs · 6c6bbc25

Robert Lyon authored May 16, 2019

As mentioned in forum post
https://mahara.org/interaction/forum/topic.php?id=8450#post33705

behatnotneeded

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

6c6bbc25

14 May, 2019 2 commits

Bug 1827966: HTML export folder index pages not generated · 67bf2f95

Robert Lyon authored May 07, 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)

67bf2f95

Bug 1698699: Rewrite path to PDF in HTML export · bd2c77df

Robert Lyon authored May 06, 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)

bd2c77df

13 May, 2019 3 commits

Bug 1825092: Check institution is set in autocomplete form element · 17d64779

Robert Lyon authored Apr 16, 2019

To avoid error "Undefined index: institution" in
htdocs/lib/form/elements/autocomplete.php line 124

behatnotneeded

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

17d64779

Bug 1828141: Create a new institution correctly · 366c905b

Robert Lyon authored May 08, 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)

366c905b

Bug 1828135: Remove the pending emails when deleting user · 7af81af0

Robert Lyon authored May 08, 2019

behatnotneeded

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

7af81af0

06 May, 2019 2 commits

Bug 1827955: display correct header on SAML metadata page · 758ffe5a

Robert Lyon authored May 07, 2019

Behatnotneeded

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

758ffe5a

Bug 1817783: Lockblocks prevent a user from being deleted · 0f765fc4

Rebecca Blundell authored Apr 24, 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)

0f765fc4

05 May, 2019 1 commit
- Bug 1826795: block content in group/institution pages should always be displayed · 5ce05a26
  Cecilia Vela Gurovic authored Apr 29, 2019
```
behatnotneeded

Change-Id: I0ad0e632dbb3a2cf26cda321d0ec0a550b579d02
(cherry picked from commit 59cf4d24)
```
  5ce05a26
03 May, 2019 1 commit

Bug 1827455: Add the file info to ClamAV admin email · 8c15aea3

Robert Lyon authored May 03, 2019

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)

8c15aea3

02 May, 2019 1 commit

Bug 1827305: add_tags behat failing due to external media loading · b89c8ddf

Robert Lyon authored May 02, 2019

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)

b89c8ddf

30 Apr, 2019 4 commits

Version bump for 18.10.2testing · 0802595f
Robert Lyon authored Apr 30, 2019
```
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
```
0802595f
Version bump for 18.10.1 · 14b9a558
Robert Lyon authored Apr 30, 2019
```
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
```
14b9a558

Security bug 1819547: Need to escape collection title on matrix page · aee824bd

Robert Lyon authored Mar 12, 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)

aee824bd

Security Bug 1817221: Stop admin from being able to suspend the 'root' user · ac4f9f72

Robert Lyon authored Feb 22, 2019

behatnotneeded

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

ac4f9f72

28 Apr, 2019 1 commit

Bug 1826474: Adjusting sync_langpack.php to match new file naming · c4a12eba

Robert Lyon authored Apr 26, 2019

behatnotneeded

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

c4a12eba

25 Apr, 2019 2 commits

bug 1798203: Peer review prevents viewing objectionable content · 2f095020

Kevin Dibble authored Mar 25, 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)

2f095020

Bug 1800421: Needing to use older SASS variables in backport · 2cd7a871

Robert Lyon authored Apr 26, 2019

otherwise 'make css' fails

behatnotneeded

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

2cd7a871

23 Apr, 2019 1 commit

Bug 1825894: Ignore extra parameters in webservices · 3f05d3f4

Robert Lyon authored Apr 23, 2019

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)

3f05d3f4