GitLab

Currently we have a mahara_log function that logs page visits
So I decided we also need a mahara_touch_record($table, $id) function
that updates the 'atime' for a record when called

behatnotneeded

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

Robert Lyon authored Nov 24, 2017 and Cecilia Vela Gurovic committed Nov 29, 2017

The USER object will have id = 0 when a user is logged out

It should never end up in the usr_session table. This patch stops that
from happening and also ignores usr = 0 insession table with setting
up auth as well.

behatnotneeded

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

Cecilia Vela Gurovic authored Nov 09, 2017 and Robert Lyon committed Nov 14, 2017

behatnotneeded

Change-Id: I4b466290c468ed4122b5b850ceb1f1aa2ec223b2
(cherry picked from commit dcf1f848)

Cecilia Vela Gurovic authored Nov 06, 2017 and Robert Lyon committed Nov 10, 2017

similar to bug 1486763

behatnotneeded

Change-Id: Iaa6e337434996303208a0445099825797e65ae3e
(cherry picked from commit 9f98b2d7)

behatnotneeded

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

behatnotneeded

Change-Id: I9be88740d6e93297a7895156012b37314d706b75

Cecilia Vela Gurovic authored Aug 10, 2017 and Robert Lyon committed Oct 31, 2017

Fix for error when searching for a note in Note block

behatnotneeded

Change-Id: I95d420a596fd1b118dbc90bb43d645a63e8cf0c6
(cherry picked from commit 2ff8a83b)

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

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

Merge "Bug 1720034: Journal/Journal post title not being escaped in delete button" into 17.04_STABLE

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

1. when a user logs in it clears any obsolete
   usr_session cookies for the user
2. recording the user-agent of the session
   and if it changes to prompt the user to
   login again
3. when self adding / editing email address(es)
   send 2 emails
	- one to the new email address asking user to confirm address
	- and one to the primary email address to alert user
	that a new email is being added to their account and
	if this is bad how to contact their admin about the problem.

behatnotneeded
Change-Id: Ia44b66cf831abd553b72aa8b1d58d2a2634863b8

Which is only the user's name

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

to avoid having problems when the user emails another user

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

behatnotneeded

Change-Id: I6f0c82a74e0d60614230aac1d4fc3884eae387a5
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit c367be4d)
(cherry picked from commit 465b7df2)

Before displaying it to screen

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

an oversight from commit dde8e52b



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

behatnotneeded

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

It only shows if there are existing connection objects

So will split out the add form from the objects list

behatnotneeded

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

behatnotneeded

Change-Id: Ibea0816e9823c0a790564a39fd5b12455aa28339
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 836e37d9)
(cherry picked from commit 2d601f66)

In webservices / csv upload we deal with the variable 'submitpages' in
relation to if one can submit pages to group. But the group
create/update functions and db table expect 'submittableto'.

The csv upload function converts this as expected but the webservices
didn't.

Have made adjustemets to webservices to suit

behatnotneeded

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

behatnotneeded

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

As part of the db upgrade process. This allows us to turn the triggers
off while updating a certain table and turning them on again afterwards.

behatnotneeded

Change-Id: I5d6f2f7fb7075fca5fe8c811820abe87d92790b3
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 6e9321c7)
(cherry picked from commit 87c2f7ed)

Rather than fetching by array now that we have multiple extensions
using the 'video/mp4' mimetype.

This would cause problems for older sites where the file was correctly
saved as 'video' artefacttype but where the fetching from db of the
mimetypes to compare would associate a different extension to
'video/mp4', eg 'm4v'.

This also meant that videos uploaded after commit
a5cf7d59

 could end up being saved as
atefacttype 'file' rather than 'video'

This patch fetches mimetypes as array and tidies things up for video

behatnotneeded

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

This was broken in 17.04 and then fixed in 17.10 via patch
https://reviews.mahara.org/#/c/7913/



Backporting the fix to 17.04

behatnotneeded

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

Administrator is spelled adminstrator

behatnotneeded

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

Cecilia Vela Gurovic authored Aug 28, 2017 and Robert Lyon committed Sep 24, 2017

behatnotneeded

Change-Id: If1e267fb551faff3be2537b14a6b8917b263dddd

Cecilia Vela Gurovic authored Sep 19, 2017 and Robert Lyon committed Sep 22, 2017

Added permissions to use json in public views
that include myviews blocktype, so the pagination
won't break when the block has more than 10 views

behatnotneeded

Change-Id: I8b96020729cc5cd0f3a34be7013155e2965c3ec2
(cherry picked from commit 35f3d2dc)

behatnotneeded

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

Rather than in core lang file to allow thirdparty lang strings to work

behatnotneeded

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