GitLab

Bug 1250256

Change-Id: Iefd489adb4f7d458d1e8b45727fab5509c61398b

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

Robert Lyon authored Nov 08, 2013 and Aaron Wells committed Nov 08, 2013

Bug #1248318

This fixes a regression caused by https://reviews.mahara.org/#/c/2687



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

- items in group -> files not being found if they are not attached to
a view

- added code so that unattached group artefacts can be checked against
the artefact_access_role table (currently only used for group
artefacts) to see what roles they can be viewed by

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

- allow the feedback to display in a block.

Things to note:
1) The feedback block is only to display view's comments on the
view/view.php page and NOT on view/artefact.php page.

2) When in edit mode (view/blocks.php) the feedback block just
displays a 'holder' message

3) When feedback block is on page the feedback does not display at
base of page anymore and when one clicks the 'Place feedback' link the
feedback form pops up over everything similar to how editing a block
works.

4) As the feedback block only works/displays on the view page I have
not fully integrated all the stuff that feedback creates ie js/form
into the blocktype. I have left the view/view.php to do the js and
render form - and simply position the form on the page with js.

This means that if js is off the edit form will still be in it's
old place. I felt this was ok because if js is off and the form was
in the block it could mean things been too squashy if there was lots
of columns.

Change-Id: I1edaa886c5a0df1f6feb24bcdd6d8878a833d673

- also updated to view/artefact.php to allow it to repect the sortorder
chosen by the blocktype

- also got 'if artefact in view' to test the base parent artefact rather
than the subfolder artefact to see if it is allowed

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

Bug1247715: The mysqli driver doesn't support sending "hostname:port" but it and
the others do support setting a $db->port field manually.

Change-Id: I4f145d8a424717dbb9bed53f78cfc01f521c9dae

- the add_ok_msg, add_error_msg, and add_info_msg functions now take a
'placement' parameter. When set it will only display the message at that
location. Defaults to 'messages', the current place they are displayed.
eg:
$SESSION->add_ok_msg('hello world!', false, 'loginbox');

- to get the message to display at new location one needs to add to
the relevant template
 {dynamic}{insert_messages placement=[placement]}{/dynamic}
where [placement] = the placement parameter you are after
eg:
 {dynamic}{insert_messages placement='loginbox'}{/dynamic}

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

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

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

Access for 'all' is not getting found for groups.  Explicitly setting the 'member' and 'admin' access for the group.

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

Bug 1247722: This is the latest official download from the PEAR website.
For some reason the previous version we had in place, still had the
@version substitution variable in all the files instead of the actual
version number.

Change-Id: I6eeec5d69bfb61e3914af225c62061eb5b5de3a7

Bug 1247722

Change-Id: Ic94d8af0a39bbfeb35fc902f91e05c5122ed73ed

Bug 1247722: PEAR Image_Color is already at its most recent version. This commit
helps document that fact.

Change-Id: Ib0578f8c054f4187189fd5be75327489e6afe5ec

Bug 1247722

Change-Id: I643ab44bf603ecba72e555eb0b2d9f1e91e7f623

Bug 1247722: Note that the parts of the PEAR Base System that we use, haven't actually changed
any since 1.9.2.

Change-Id: I9e5dab9287907320d73ecbbe12c9e8f828f7d92e

Bug 1246576

Change-Id: I13b6499eae6697cd0341be73c133984ba61ffc1e

Bug 1246573

Change-Id: Ibe27bb64fefb2739214f1f00877a4b4a7a5a3e11

The message was being removed due to the changes in this bug:
https://bugs.launchpad.net/mahara/+bug/1081309



Where the new message was been included in the cleanup of
old messages.

To test: add a creative commons block to page
- then try and add another. you will get the error message at top that
quickly fades away

With patch: the message should stay until you try to add block for
third time and the earlier message fades away

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

- also tidied up license header to match new format used

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

- also fixed problem where the Artefact types hierarchy was not being
saved

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

Huzzah!

Change-Id: I22a3ef47ad3ffdc75df2ff75902a015128c23086