- 22 Jan, 2015 1 commit
-
-
Mike Kelly authored
Previous fix didn't work when page was viewed by third parties. The subdomain address for the iframe needs to be derived from the page author, not the current user. Change-Id: Ic3669dd01fbe600ed2e9cf74b939ef96a84addca Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
- 21 Jan, 2015 1 commit
-
-
and add the behat test Change-Id: Icfefdee0143f77a04d240f33b6c989ab12352f99
-
- 19 Jan, 2015 1 commit
-
-
Aaron Wells authored
Bug 1387511: Also making the "Sent messages" screen into the default return screen regardless of how you got to the Compose screen. Change-Id: Ifa3d48fa4cc1cd15a6ae3218915f336216cc6473
-
- 15 Jan, 2015 2 commits
-
-
Doris Tam authored
Change-Id: If7e77e237db1262522fd6dace684cf4c2b60f291
-
Amelia Cordwell authored
This patch makes plan description show up on a portfolio page which it is a part of. Previously the description would only show up on the content / plans page rather than on a page it was a part of. Change-Id: I7436d6c2384a5064780f7281968467d08ca60490
-
- 13 Jan, 2015 1 commit
-
-
Patrick O'Keeffe authored
Change-Id: I8d10aa5ea35e9a7b3fd58ef2fb2c9ec6041d73b5
-
- 12 Jan, 2015 2 commits
-
-
Patrick O'Keeffe authored
Change-Id: Ibad76d6ddafe7a7f78f075679acb3d115beaf5ba
-
- Filter out draft posts when editing the blogpost block - Don't display the post's content if it is unpublished Change-Id: Iaaf92f29383e2f3997e214b052dd116005a971dd Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 08 Jan, 2015 2 commits
-
-
Mike Kelly authored
X-Frame SAMEORIGIN error is thrown when viewing an embedded PDF on a user's View, if Mahara is set up to use subdomains. This is because the current page url has the subdomain part, but the PDF iframe does not. Group views and page editing interface are not affected. This patch adds the subdomain part to the iframe url, and the PDF url, as required. Change-Id: I7e5856d8cfcd6ac7e2df71859c1b18d3f561bfd1 Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Son Nguyen authored
- Use render_self() in full detail option - Remove calls of $artefact->get() in template file Change-Id: I6be321adfda07c7f3e7cb3ac4026894b081e131f Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 07 Jan, 2015 1 commit
-
-
Son Nguyen authored
Change-Id: I7e7919fc6ed7cd0d7d8283736c151254e232c5f2 Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 16 Dec, 2014 3 commits
-
-
Mike Kelly authored
Change-Id: Iae6b20134f7426c006dcfe0200e46b2cd52279ff Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
Mike Kelly authored
Change-Id: I177f3a2eec67609181337ed4bca01fb7c40d7e8a Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
This is a TinyMCE plugin which allows for browsing and embedding of Mahara-hosted images as well as the embedding of external web-hosted images. This makes adding inline images to WYSIWYG text boxes more user-friendly. Viewing permissions for these embedded files is set by adding references to them to a new database table, artefact_file_embedded, then checking for the existence of the references in the table when serving the files via artefact/file/download.php. For content blocks in views, such as text and textboxes, any embedded images are saved as view artefacts, and viewing permission is granted for those files accordingly via previously existing checks in artefact/file/download.php. This patch is designed to allow image embedding in all WYSIWYG text boxes throughout Mahara, hence the table structure, with resourcetype and resourceid providing the context for checking the validity of the image file to be served. Change-Id: Idcc5ab3495eed44eea6ced171d670ba4c73884f6 Signed-off-by:
Mike Kelly <m.f.kelly@arts.ac.uk>
-
- 11 Dec, 2014 1 commit
-
-
Aaron Wells authored
Bug 1400524: On a large site, the database queries to retrieve all records from the artefact table can take too long to execute and cause the PHP script to time out. This optimization attempts to fix that by filling in the paths with an iterative series of UPDATE queries instead. Change-Id: I46c13cc97bac8a6d2bc626e3b2dc8e4cdeecd2bb
-
- 08 Dec, 2014 2 commits
-
-
Robert Lyon authored
To test: checkout master - try and add a comment to a page on page reload you should get an error With patch - adding/viewing comments should work again Change-Id: Ic32a5f7daf273385b745c57622abac369e388197 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Yuliya Bozhko authored
Change-Id: I63c4c566504492abb947202f8cf3ba5838770c9f Signed-off-by:
Yuliya Bozhko <yuliya.bozhko@totaralms.com>
-
- 04 Dec, 2014 2 commits
-
-
Son Nguyen authored
1. Data generator 2. Config manager 3. Form fixtures 4. Some sample test features Add shell script for running Behat Moving core feature files to 'test' folder outside the docroot Fix Mysql bugs Change-Id: I00f3558c178541ae7f81ce9fb1ce6226e7a9654e Signed-off-by:
Aaron Barnes <aaronb@catalyst.net.nz> Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
Darren James Harkness authored
Requires https now - used to work with http but no longer Change-Id: I4aae1d36c532dcdfc96b5a4a673910b654ea9a2c Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 03 Dec, 2014 2 commits
-
-
Son Nguyen authored
Change-Id: I7a1f7d42d9739a9ab1507d56aaf3a51ee0e7ef1a
-
... in order to silence all the E_ALL notices Change-Id: I0fdc9fc68ae7ffd2fa2dffe68dfbd79ee9599c06
-
- 20 Nov, 2014 1 commit
-
-
Robert Lyon authored
Change-Id: I252c5f763ccc83d846f5dcc7fd086d723b31e2e6 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 19 Nov, 2014 1 commit
-
-
Robert Lyon authored
Bug 1394330 In most places in mahara we specify that we want base 10 number returned (or base 16 in case of a hexidecimal css colour) But there are a few places where we don't specify the radix at all It's best practice to always include the radix because for older browsers it interprets leading 0 as octal by default. Also makes it clearer to developers what type of number is expected to be retrieved from the string. Change-Id: Iaecc85cbed875f85b313188c4e96cc1b77c77b31 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 18 Nov, 2014 1 commit
-
-
Robert Lyon authored
See bug for testing details Change-Id: Ide0cd9b8e304d8b75af1af86829f9be31ed8ca84 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 16 Nov, 2014 15 commits
-
-
Robert Lyon authored
Getting the user's institution comment sort order to sort the comments for the artefacts on the view page. So that the expand out comment areas are sorted either earliest -> latest or visa versa. Change-Id: I13b37b0a42c818ccc21147e4a0469015a020dd80 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
This allows for artefact comments on the view page to be ordered by either 'earliest' or 'latest' Change-Id: I50f2b2091618109be1579a53308a2bb169a199f0 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
If the taggedblog block is set to display full entries then comments also show Change-Id: Iea4f6c3df3f61d0b58e8f7b0b06c1fb3713fedd8 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
To handle the fact that blog blocks have more than one blogpost and therefore more than one comment link I've passed the artefact id and block id in together and appended a '0' to the front of the id so that the artefact id + block id does not clash with another block of the same id. Change-Id: Iddd4dab7afe70e8926a8556cdb55ea8d4dceda06 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Getting the rendering of the blogpost comment count to be done by the block instance in a similar fashion as the other artefact blocks. Change-Id: I67805ac33a9850c1fded17b32873e5ad90c7489f Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
This is only for the displaying of a folder as a gallery in either the thumbs, square thumbs, or slideshow. The allow comments is based on the allowing the folder to have comments so this means any folder comments will display whether they have been added following the link in gallery block or the folder block as both end up at the same artefact on artefact/artefact.php page Change-Id: I787a730861823ef3f731fb5209bf3470b00a7ed3 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Change-Id: I50a5cd56ca87b9625dcf59462db822c222fc0a24 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Change-Id: I85dd598e7cce09ec3fd3edaa6e6c946008cc81c8 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Change-Id: I2ca1392ca92c248ce1c752cda640b2ce39e89367 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Can use safe in template as the html has been thru clean_html() before being sent to template. Change-Id: Idbcee9b943a394c32ce762b54c8cdb61f404b121 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
- similar to the changes done for textbox Change-Id: I7419a50b6790d11ee5e4d48b2d1bbd2b134f2126 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
The comments will be displayed (or hidden) below the block by clicking on the 'Comments (x)' link. There is also a 'close' link at the bottom of the comment list as well to close them. Change-Id: Ie4328872d861879975f6a6d86c8832892b8a37dd Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
Currently we are only trying to get the artefact comment list to show as a 'read only' situation. Any editing/adding/deleting to be done on the artefact/artefact.php page Change-Id: I366cc181d9c5c217173842258a02fa814c7279bd Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
As I'm adding in some new options and I notice that Bug #1326425 will also be adding options to get_comments so I thought it would be useful to make a default opbject of variables that one can call and alter with specific variables where needed rather than having to work out where in the function call list things need to go as that list would grow up to 10 options. Change-Id: I7111559c4d12a8de128b9526930729728a36555e Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
The blog and textbox (notes) blocks return incorrect comment count if there are private comments and the user is not allowed to see the private comment. Change-Id: I20f7f51ec2e948d37a09c5447340aab3bef31a13 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 11 Nov, 2014 1 commit
-
-
Bug 1390339: Before, we had hard-coded the "image" and "text" blocks into the top of the block picker. With this change, a block developer can just give their blocktype the category "shortcut" and it will show up there. Change-Id: Ibaafc481745dd290442aa125b637394084705b00
-