- 05 Mar, 2015 2 commits
-
-
Change-Id: I0a369a0ae0a710570992b6e368b55c62732c49c6 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
In the Content -> files section Change-Id: I178b7e79490e50bc35337efee2a43ea663214003 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 26 Feb, 2015 4 commits
-
-
1. Note blocktype: lang string 'title1' is causing issues with the admin/stats/pages. It is expecting 'title'. 2. Resume blocktype: same as above. Change-Id: I4967d13405031303d25e6728baaccb9eb4d0443f
-
aceMa authored
I've taken what aceMa provided in bug report and made it a replacement for the square thumbs option rather than a new option as we don't need two square thumb options. I've tweaked it a bit more and hopefully have got the padding/ratio stuff more consistent and not using hardcoded numbers so much And getting it to show descriptions/captions below frame Change-Id: Iafc0ec8a8132d1bef5401b3ebd49e3df013fddc3 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Son Nguyen authored
Using the path column to avoid recursive queries Change-Id: I51eab6ce248c5f0d199487d85d9a56f8ffa3e001
-
Robert Lyon authored
And getting it to work in a block configuration form - see the image block's configuration form Includes reverting these commits db7f4520 9e0c498c and altering this commit to not use the switchbutton jquery plugin 901df0a5 Change-Id: I818c296cdcf573ede63b1783defb1b528d93ae2d Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 25 Feb, 2015 1 commit
-
-
Son Nguyen authored
This will update - the block content which have links to these embedded images - the tables 'artefact_file_embedded' and 'view_artefact' in database Change-Id: I7b97e0828fd89609f9bd43e786c5ff5ad3e53156 Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 24 Feb, 2015 1 commit
-
-
Son Nguyen authored
Bug 1390833 This will update all attachments to the artefact Change-Id: Idc06d5ce35b2427575b44d53f4aa56dfc7b01cf8 Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 12 Feb, 2015 1 commit
-
-
Nigel Cunningham authored
The configure dialog for blocks is currently set to a fixed width via Javascript, but there is no handler for browser resizing and it results in the dialogue being very wide for the sake of just one line when a license agreement is enabled. Fix this issue by making all dimensions percentages, and using a combination of max-width: 90% and width: max-content. In addition, make the dialog fixed position with its own scrollbars as needed (the body's scrollbar is disabled when the dialog is shown). Contextual help's width code and CSS is also adjusted so that it wraps within dialog boxes rather than pushing the width out. Change-Id: If2a40739f1510cedcf9a6133ccfb8f0a18257356
-
- 09 Feb, 2015 1 commit
-
-
Avoid the query for an existing artefact record when we know it doesn't exist (because we're being called from create_user). This shaves approximately 40% off the time for creating a user. Change-Id: I81697dfd0916e4a2933dfe5d1389bdc649e6e856 Signed-off-by:
Nigel Cunningham <nigelc@catalyst-au.net>
-
- 08 Feb, 2015 3 commits
-
-
Aaron Wells authored
Bug 1419547 Change-Id: I2419b6443ad66992ca40d47263690c62ad5d9576
-
Aaron Wells authored
Bug 1419539 Change-Id: Id0ce0e028a504b5284e13a2f01e71e7ca1f07c1d
-
Aaron Wells authored
Bug 1419399 Change-Id: Ia22577980bb67862f540a2ffc76dba54fc824aa5
-
- 05 Feb, 2015 1 commit
-
-
Change-Id: I448b74850bb387c8d9569a3df72da3927ca691d9
-
- 04 Feb, 2015 1 commit
-
-
Robert Lyon authored
- Currently ordered as per this comment https://bugs.launchpad.net/mahara/+bug/1236102/comments/1 Change-Id: I95b5eac314dcbf2fef58e8b16836d4a6822b8b40 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 01 Feb, 2015 1 commit
-
-
Bug 1236102. Also sorting the "text" and "image" blocks while I'm at it. Change-Id: I09c3a1bec1ec9a7ddf0b3f1cfca735759dd2bbbe
-
- 30 Jan, 2015 1 commit
-
-
Aaron Wells authored
Bug 1401210. The get_artefacts() method is used by the Blogpost artefact to find all the blocks that use a particular blogpost, for storing in the view_artefacts table. I needed to add a table, blocktype_taggedposts_tags, to store the tags in a manner that was easier to query than a serialized blockconfig. Change-Id: Ieef58715e404689d95848e32ccd4132ea3fbcdc5
-
- 28 Jan, 2015 7 commits
-
-
Aaron Wells authored
Bug 1401210. The get_artefacts() method is used by the Blogpost artefact to find all the blocks that use a particular blogpost, for storing in the view_artefacts table. Change-Id: I53d8fd5924ae2ce4d56866efa655424a75f662f7
-
Aaron Wells authored
Bug 1401210. The get_artefacts() method is used by the Blogpost artefact to find all the blocks that use a particular blogpost, for storing in the view_artefacts table. This one was skipping the blogposts themselves, and it was including content from unpublished blog entries. Change-Id: I4248be998ba4082722648a1ddbcf1c9334672409
-
Aaron Wells authored
Bug 1401210. In order for a newly published blog entry (using the "publish" button) to be able to trigger a watchlist notification, it needs to fire a saveartefact event, and update the view_artefact table, the same as the standard route for editing/creating a blog entry. So the best way to do that is to use the same commit() method. Change-Id: I35b93d6f7415ae69ed8eede3e10306b712ea1b68
-
Aaron Wells authored
Bug 1401210. In order for watchlists to properly handle blog blocks, we need to give the Blog artefact a chance to update the view_artefacts table before the "saveartefact" event gets fired at the bottom of ArtefactType::commit(). So I'm adding a postcommit_hook() method which gets called in the middle of commit(), and shifting ArtefactType's commit() method into there. Change-Id: I23986597fd411fa8f93da7cdbfa8d0b577de66fc
-
Aaron Wells authored
Change-Id: I4349d8c2816a1bec3b01121a6f2ae165add4477c
-
Robert Lyon authored
This was causing some problems with tagged posts - also hiding the 'add comment' link on page edit screen. And making the comments info show when no comments were on item and allow comments for artefact was enabled. This is an issue with newer versions of php. Also placing some of the template files in the new correct location Change-Id: I599e16b0899559a3ebcdf68cff53220b1d83f2d6 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
Robert Lyon authored
To include and/or exclude certain tags - has two pools of tags; those that are 'in' and those that are 'out'. To exclude a tag begin your search with a minus sign. Change-Id: I32a3b3d3f244d08bd0547d72db25b8189642fc0e Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 26 Jan, 2015 1 commit
-
-
Robert Lyon authored
Also got the subject to pre-populate the compose message form Change-Id: Id9e7a1af1f4516c145fa91a09fa12fd4175a7e41 Signed-off-by:
Robert Lyon <robertl@catalyst.net.nz>
-
- 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
-
- 20 Jan, 2015 1 commit
-
-
Son Nguyen authored
Change-Id: I58635b1a878c18f6626acadcc1a5974f6fd3d40f Signed-off-by:
Son Nguyen <son.nguyen@catalyst.net.nz>
-
- 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>
-