Commits · ac4f9f72c50c780f48324eda955e9e0ee127fe97 · mahara / mahara

30 Apr, 2019 1 commit

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

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)

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 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)

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

17 Apr, 2019 1 commit

Bug 1800421: Allow peer instructions for HTML export · ac0aee9c

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)

ac0aee9c

15 Apr, 2019 1 commit
- Bug 1800321: Use institution tags in institution content · 2bec90d0
  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)
```
  2bec90d0
10 Apr, 2019 3 commits

Bug 1823783: remote username in user edit screen - adding back missing code · 5203ac74

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)

5203ac74

Bug 1804243: Adjust htdocs/view/createversion.php · 054e5404

Robert Lyon authored Apr 10, 2019

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>

054e5404

Bug 1804243: timeline: upgrade 'plans' blocktype in versions · b35fe0fc
Cecilia Vela Gurovic authored Apr 09, 2019 and Robert Lyon committed Apr 10, 2019
```
behatnotneeded

Change-Id: Ief0fe215ac5f376db4e09bbab7fa724e81bf1b36
```
b35fe0fc

07 Apr, 2019 1 commit

Bug 1804243: timeline: show correct version of a plan block · 6d33f81b

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)

6d33f81b

28 Mar, 2019 1 commit

Bug 1820927: language string clash in view.php lang file · b4322aa8

Robert Lyon authored Mar 20, 2019



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)

b4322aa8

26 Mar, 2019 3 commits

Bug 1808935: Error Deleting External App - Foreign Key Constraint · 73ca19dd
Ghada El-Zoghbi authored Mar 13, 2019 and Robert Lyon committed Mar 27, 2019
```
behatnotneeded

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

Bug 1815979: Ignore limit for block in versioning / html export · 7483a3bd

Robert Lyon authored Feb 15, 2019



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)

7483a3bd

Bug 1820912: Do not show retraction on blocks exported to HTML · 160208e2

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)

160208e2

19 Mar, 2019 1 commit

Bug 1820774: Need to have full url in Resume -> introduction link · 1b5ad3bd

Robert Lyon authored Mar 19, 2019



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)

1b5ad3bd

05 Mar, 2019 1 commit
- Bug 1777014: Profile completion for inst admin · 14a16d89
  Rebecca Blundell authored Feb 26, 2019 and Cecilia Vela Gurovic committed Mar 06, 2019
```
behatnotneeded

Change-Id: I334c936f6eb5e41a5c70ee69cc97206653b7e321
(cherry picked from commit 373c3756)
```
  14a16d89
03 Mar, 2019 2 commits

Bug 1814316: Checking memcached version if stats not available · 5119438d

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)

5119438d

Bug 1816840: Adjustments to dwoo library to fix unserialize problem · f8a92913

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)

f8a92913

20 Feb, 2019 1 commit
- Merge "Bug 1810862: Get progress for peer assessment working" into 18.10_STABLE · 748f74fd
  Robert Lyon authored Feb 20, 2019
  
  748f74fd
19 Feb, 2019 2 commits

Merge "Bug 1812120: Making sites with elasticsearch upgrade faster" into 18.10_STABLE · 745ff683
Robert Lyon authored Feb 20, 2019

745ff683

Bug 1812910: Needs to use is_array() before count() in PHP 7.2 · 09d05944

Robert Lyon authored Feb 04, 2019



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)

09d05944

18 Feb, 2019 1 commit

Bug 1816311: Showing correct journal entry poster's name · 1261963a

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)

1261963a

17 Feb, 2019 1 commit

Bug 1810862: Get progress for peer assessment working · 3f4202b6

Robert Lyon authored Jan 08, 2019



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>

3f4202b6

15 Feb, 2019 1 commit

Bug 1815953: Need to pass versioning as false when countcomments is true · bfe7d688

Robert Lyon authored Feb 15, 2019



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)

bfe7d688

11 Feb, 2019 1 commit

Bug 1814078: Including the PHPMailer SMTP file as well · 02f9a384

Robert Lyon authored Feb 05, 2019 and

Cecilia Vela Gurovic committed Feb 11, 2019



This is needed if the user has configured the SMTP settings in
Administration -> Configure site -> Email settings

behatnotneeded

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

02f9a384

08 Feb, 2019 1 commit

Bug 1812120: Making sites with elasticsearch upgrade faster · 57f0edd0

Robert Lyon authored Jan 17, 2019



As sites with 100,000+ views take forever to upgrade

We don't need to re-index the view row changes when adding the new
columns

behatnotneeded

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

57f0edd0

07 Feb, 2019 1 commit

Bug 1811284: Allow mathslate to work in https sites · 0201d72c

Robert Lyon authored Jan 30, 2019 and

Cecilia Vela Gurovic committed Feb 07, 2019



Currently the template file for this has hardcoded http urls
We need to use a different template if the mahara site is https://

behatnotneeded

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

0201d72c

30 Jan, 2019 2 commits

Bug 1812939: remove jquery-ui-timepicker lib · c0da1756
Cecilia Vela Gurovic authored Jan 23, 2019 and Robert Lyon committed Jan 31, 2019
```
behatnotneeded

Change-Id: Ieb19aae05762677e2ce8b27e564d658b0d9f1c24
```
c0da1756

Bug 1813200: Wallpost activity passing in confusing 'id' value · a468e253

Robert Lyon authored Jan 24, 2019 and

Cecilia Vela Gurovic committed Jan 30, 2019



When we allowed the wallpost to have embedded images we accidentally
adjusted what was being sent in the wall post activiy object by
including the 'id' value when we didn't need to and this caused
unexpected consequences.

behatnotneeded

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

a468e253

29 Jan, 2019 1 commit

Bug 1811141: upgrade cookie consent library to v3.1.0 · f63d8cdb

Robert Lyon authored Jan 10, 2019 and

Cecilia Vela Gurovic committed Jan 29, 2019



behatnotneeded

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

f63d8cdb

27 Jan, 2019 1 commit

Bug 1812910: Importer needs to use is_array() before count() in PHP 7.2 · 745e368f

Robert Lyon authored Jan 23, 2019 and

Cecilia Vela Gurovic committed Jan 28, 2019



When we are wanting to check if there is an array to foreach loop over
and that array has at least one entry.

Currently we try to loop over entries by checking with just count() and we get error
- count(): Parameter must be an array or an object that implements Countable

behatnotneeded

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

745e368f

24 Jan, 2019 3 commits
- Merge "Bug 1811163: Upgrade phpmailer to 6.0.6" into 18.10_STABLE · 459a71df
  Cecilia Vela Gurovic authored Jan 24, 2019
  
  459a71df
- Bug 1809494: Change Page submitted to portfolio submitted · 9c8b3c4e
  Lisa Seeto authored Jan 24, 2019 and Cecilia Vela Gurovic committed Jan 24, 2019
```
When submitting a collection to an external site e.g. Moodle
When viewing Mahara as a site admin

behatnotneeded

Change-Id: I9bcdbedb235c838e87e208b17eee6a71bf1674d8
Signed-off-by: Lisa Seeto <lisaseeto@catalyst.net.nz>
(cherry picked from commit 30fdf368)
```
  9c8b3c4e
- Bug 1811163: Upgrade phpmailer to 6.0.6 · a8e83954
  Cecilia Vela Gurovic authored Jan 11, 2019 and Robert Lyon committed Jan 24, 2019
```
behatnotneeded

Change-Id: I459263cc0468639fd41b669efb750d6ac618cb5a
(cherry picked from commit 8400b75d)
```
  a8e83954
22 Jan, 2019 2 commits

Bug 1812260: Reverting mistake · 0c329ecb

Robert Lyon authored Jan 18, 2019 and

Cecilia Vela Gurovic committed Jan 22, 2019



From fix for Bug 1790543: Portfolio instructions-Import/Export
- where we tried to set the institution name as the view
description/instructions field

behatnotneeded

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

0c329ecb

Bug 1811034: Upgrade ADODB to 5.20.14 · 9cdc298b

Robert Lyon authored Jan 10, 2019 and

Cecilia Vela Gurovic committed Jan 22, 2019



behatnotneeded

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

9cdc298b

14 Jan, 2019 1 commit

Bug 1811282: upgrade simplesaml to 1.16.3 · b186a4fe

Robert Lyon authored Jan 15, 2019



Forgot to bump the version number for install

behatnotneeded

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

b186a4fe

11 Jan, 2019 2 commits
- Bug 1811282: upgrade simplesaml to 1.16.3 · 790c8fc3
  Cecilia Vela Gurovic authored Jan 11, 2019 and Robert Lyon committed Jan 11, 2019
```
behatnotneeded

Change-Id: I9925a6a5265cc768140c41015c63feed163e88ce
(cherry picked from commit 0080525a)
```
  790c8fc3
- Bug 1811144: Upgrade Marked lib to 0.6.0 · 26aa13c7
  Cecilia Vela Gurovic authored Jan 10, 2019 and Robert Lyon committed Jan 11, 2019
```
behatnotneeded

Change-Id: I983bc6e3a00e7da3f19937fe440f1bae322fca7a
```
  26aa13c7