GitLab

Bug #1266317

Change-Id: Ief7c8c5d2aef455d61e78feb5d3c7571d517c830
Signed-off-by: Mike Kelly <m.f.kelly@arts.ac.uk>

Bug #1266317

when reading from and writing to usr_custom_layout table

Change-Id: I27d83d9a7e76f250cfc903198567d2341168cacc
Signed-off-by: Mike Kelly <m.f.kelly@arts.ac.uk>

Mike Kelly authored Nov 19, 2013 and Robert Lyon committed Jan 06, 2014

Bug #1266317

Group pages, site and institution pages were set as having usr = 0 in
usr_custom_layout because the view owner is null.

Fix by adding group column to table, foreign keyed to group table.

usr column and group column have to be changed to allow null values, and
to have null as default values.

When saving a custom layout, check context, then set usr and group
values accordingly. 
e.g. 
usr = 5, group = null 
usr = null, group = 321
In the case of site and institution pages:
usr = null, group = null

Change-Id: Id42ebcc543d29ee2455aef73227b57c569171385
Signed-off-by: Mike Kelly <m.f.kelly@arts.ac.uk>

Bug 1249123

Change-Id: I959a291d13a32132aa1cd791f1b8f094c8bfd5c4

This reverts commit 35a6a62a.

Change-Id: I5902b77157fdb8df7c73dba27921c832c69b338b

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

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

there was code for this already but the check was not working

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

Seen as the 3 column layout is the default one the embed pdf view
should fit within it.

Currently if you have a browser windo open fully, a 3 column layout,
and a pdf embedded you get a horizontal scrollbar on the embed pdf.

A slight adjustment of the min-width and it goes away.

The scrollbar will be there for 4 or 5 column widths but that is ok as
they are quite thin columns.

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

Change-Id: I871eaa5043cf601020c6891fd45be32d6bfe75ea

Change-Id: I881fe178075edb61633e6a4b3dca27419fc4fae4

Change-Id: Ic554b94fa20f5978108b0c828c70834246c9c9c9
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

Bug 1250256

Change-Id: Iefd489adb4f7d458d1e8b45727fab5509c61398b

Currently we only hide links to artefact when we 'hide' them on the
extensions page rather than have them not accessible.

This patch will check to see if artefact is active and if it isn't
will display a access denied message.

note for testing: when hiding an artefact plugin it turns off the blocktypes
associated with it - but when you re-enable the artefact it does not
re-enable the blocktypes

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

Sean Brennan authored Nov 12, 2013 and Robert Lyon committed Nov 13, 2013

An old patch that didn't get added to gerrit - not sure if it got
overlooked or is not needed anymore - so I'd thought I'd add
it and let others decide.

It adds a link on the Content -> Profile page to go directly to
Portfolio editing of your profile page.

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

to test - add both image and non image files to a 'files to download'
block.
On view page click on the 'details' link.
- Non image files go directly to a page showing meta information and
download link.

- Image files go to same page but show just the image + another
'details' link that takes you to the metadata page

Patch changes the initial link name from 'details' to 'view' for image
artefacts.

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

Change-Id: Ie9389e1d061e720dc82f335f043dadee29459b27

The skins and dropdownmenu institution variables don't exist when
saving the config form for 'no institution' so we need to check they
exist.

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

was checkoing on $viewskin var rather than the $skin var set if allowed to
have skin on page

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

Merge "Bug1246553: When cleaning the query, replace the special characters with a space. This separates the tokens instead of concatenating them."

if it is activated in config.php

The skins setting is added to Site config page as well

Change-Id: I4464867db90dc9fd34220b1d865fb5b3527ef168
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

Bug1075760: reporting objectional material with no message doesn't get sent to admin with digest emails

Email digest table has a not null contraint for the message field:
1. Force the user to enter something in the objectionable comment.
2. Other areas: if a user enteres a message (i.e. in a forum)
which is made up of html (i.e. a smiley face),
the message gets 'cleaned' by stripping html tags.
This leaves it empty and fails when trying to insert into the
email digest table.
Clean the message with html2text instead of str_shorten_html.
3. As a last resort, before inserting into the email digest table,
make sure there is at least a space in the message field (if it's empty).

Change-Id: I05a77e0682017839b34e74241eefb98fb788eab5
Signed-off-by: Ghada El-Zoghbi <ghada@catalyst-au.net>

Change-Id: Ia606ff452d027882c1f4bd9acb969c6105948207
Signed-off-by: Son Nguyen <son.nguyen@catalyst.net.nz>

Bug 1248318
Changing it from an info message to an error message (since the documentation
already calls it the "Login error message". And putting it up above the login
form instead of below.

Change-Id: I2e4906ef6010c447e5f9a00fe06bd5249020f11a

Bug 1248318

Change-Id: If9a93ec7d946cff336acc7359b9f3cfd19c4f322