- 14 Nov, 2013 5 commits
-
-
Son Nguyen authored
-
Son Nguyen authored
-
Son Nguyen authored
-
Son Nguyen authored
-
Son Nguyen authored
-
- 13 Nov, 2013 6 commits
-
-
Robert Lyon authored
Change-Id: I62e2669fb55c8504a08a13a8f559f2d471de2a7b Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
there was code for this already but the check was not working Change-Id: I40b2563d60a4b45531e3d1e5078fb37b14c22311 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
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>
-
Aaron Wells authored
Change-Id: I871eaa5043cf601020c6891fd45be32d6bfe75ea
-
Aaron Wells authored
Change-Id: I881fe178075edb61633e6a4b3dca27419fc4fae4
-
Son Nguyen authored
Change-Id: Ic554b94fa20f5978108b0c828c70834246c9c9c9 Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 12 Nov, 2013 3 commits
-
-
Aaron Wells authored
Bug 1250256 Change-Id: Iefd489adb4f7d458d1e8b45727fab5509c61398b
-
Robert Lyon authored
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>
-
Robert Lyon authored
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>
-
- 11 Nov, 2013 11 commits
-
-
Aaron Wells authored
Change-Id: Ie9389e1d061e720dc82f335f043dadee29459b27
-
Son Nguyen authored
-
Son Nguyen authored
-
Robert Lyon authored
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>
-
Robert Lyon authored
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>
-
Robert Lyon authored
-
Robert Lyon authored
Merge "Bug1246553: When cleaning the query, replace the special characters with a space. This separates the tokens instead of concatenating them."
-
Son Nguyen authored
-
Son Nguyen authored
-
Son Nguyen authored
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>
-
Ghada El-Zoghbi authored
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>
-
- 10 Nov, 2013 3 commits
-
-
Robert Lyon authored
-
Son Nguyen authored
Change-Id: Ia606ff452d027882c1f4bd9acb969c6105948207 Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
Robert Lyon authored
-
- 08 Nov, 2013 2 commits
-
-
Son Nguyen authored
-
Aaron Wells authored
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
-
- 07 Nov, 2013 2 commits
-
-
Aaron Wells authored
Bug 1248318 Change-Id: If9a93ec7d946cff336acc7359b9f3cfd19c4f322
-
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>
-
- 06 Nov, 2013 7 commits
-
-
Robert Lyon authored
- 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>
-
Son Nguyen authored
-
Robert Lyon authored
- 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
-
Robert Lyon authored
- 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>
-
Son Nguyen authored
-
Aaron Wells authored
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
-
Son Nguyen authored
-
- 05 Nov, 2013 1 commit
-
-
Son Nguyen authored
-