Skip to content
GitLab
Switch branch/tag
  1. 27 Feb, 2015 1 commit
    • Son Nguyen's avatar
      Fix embedded images in 'Text' block when copy and import. Bug 1425728 · 2b259a85
      Son Nguyen authored 
      - Add new method PluginBlocktype::rewrite_blockinstance_extra_config()
which enables blocktype to rewrite extra configuration when copying
block

- Implement rewrite_blockinstance_extra_config() for
PluginBlocktypeText to rewrite embedded image urls in the text block

- Rename the method rewrite_artefact_ids() to
rewrite_blockinstance_config() and add new code to allow blocktype
plugins rewrite extra config when import

- Add new method
PluginBlocktype::import_rewrite_blockinstance_extra_config_leap()

- Implement
PluginBlocktypeText::import_rewrite_blockinstance_extra_config_leap() to
rewrite embedded image urls in configdata['text']

Change-Id: Id5163817c676fb118edea02d152b7797111cb99f
      2b259a85
  3. 26 Feb, 2015 2 commits
  5. 25 Feb, 2015 2 commits
  7. 12 Feb, 2015 1 commit
  9. 11 Feb, 2015 2 commits
  11. 09 Feb, 2015 2 commits
  13. 08 Feb, 2015 1 commit
  15. 05 Feb, 2015 2 commits
  17. 04 Feb, 2015 1 commit
  19. 01 Feb, 2015 1 commit
  21. 30 Jan, 2015 1 commit
  23. 26 Jan, 2015 1 commit
  25. 15 Jan, 2015 1 commit
    • Aaron Wells's avatar
      Let "group pages" show pages by group members only · 469ef3c8
      Aaron Wells authored 
      Bug 1411004: This patch adds an option to the "group
pages" block, to limit the "pages shared with this
group" and "collections shared..." sections so that
they only show pages & collections authored by
current members of the group

Change-Id: I95185d61d384aa298fba065a96ccd635c3430ec5
      469ef3c8
  27. 11 Jan, 2015 1 commit
  29. 16 Dec, 2014 1 commit
    • Mike Kelly's avatar
      Implement TinyMCE imagebrowser plugin · 36bc9f7d
      Mike Kelly authored and Aaron Wells's avatar Aaron Wells committed 
      

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: default avatarMike Kelly <m.f.kelly@arts.ac.uk>
      36bc9f7d
  31. 08 Dec, 2014 1 commit
    • Robert Lyon's avatar
      Fixing up group homepage problem (Bug #1396565) · 7d6192f8
      Robert Lyon authored 
      

A mistake was made where a user was allowed to add more than one
"group pages" block to the group homepage. This wasn't a problem until
we added pagination to the "group pages" block.

This patch attempts to clean up that error and merge any existing
multiple block instances into one "group pages" block instance.

Change-Id: I38acada835a4c245c97f0008543519a9dd2072a3
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      7d6192f8
  33. 03 Dec, 2014 1 commit
  35. 11 Nov, 2014 1 commit
  37. 09 Nov, 2014 1 commit
  39. 22 Oct, 2014 1 commit
    • Aaron Wells's avatar
      Bug 1383995: Move plugin files into the /theme directory · 89e4609b
      Aaron Wells authored 
      Theme files for plugins can now live under the plugin's directory or under
the theme's directory. Moving the files for the core plugins to /theme
should make life easier for theme developers by putting them all in one place.

Change-Id: Icff863c46c80ed2d6be07cd49404bc0b7f5fc4c0
      89e4609b
  41. 15 Oct, 2014 2 commits
  43. 14 Oct, 2014 1 commit
  45. 05 Oct, 2014 1 commit
  47. 01 Oct, 2014 1 commit
  49. 25 Sep, 2014 1 commit
    • Robert Lyon's avatar
      Allowing the mygroups to paginate when cleanurls on (Bug #1374184) · 3fb65b89
      Robert Lyon authored 
      

To test:

1) Set up a few users all being members of many groups (I tested with 17
groups)

2) for each user edit their profile page and edit the 'My groups'
block and set the 'Maximum number of groups to display' value to
something less than the number of groups available
3) Then test if you can paginate on both logged-in users profile page and
other users profile pages

Test for both when clean urls are on and off

Change-Id: I26a247fc4a692b2e82b6c235d41172ff35fadeac
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      3fb65b89
  51. 22 Sep, 2014 1 commit
  53. 18 Sep, 2014 1 commit
    • Robert Lyon's avatar
      The archiving of submitted pages/collections from groups (Bug #1335670) · 5c57b565
      Robert Lyon authored 
      

This patch contains:
- The export queue system where pages/collections on release from
submission are added to the export queue table ready to be archived.
- The export queue admin page showing what is in the queue to be
exported. The cron runs every 6 minutes. Queue items failed to export
are also shown here.
- The archive list admin page, where one can download the generated
leap2a files for the archived submissions.

In this patch you should be able to add things to the export queue by
either releasing a sumbission on a group that has 'archive
submissions' option ticked. This will add the archive to that archived
submission page, or you can also run a leap2a export from portfolio
export which will add the export queue and send you an email once the
export is done.

Things to note:
- The is a server busy function that stops the export queue from
running but I'm not too sure if the threshold is too low/high
- The export queue tries to export the first 100 items each run but if
resources are fine in handling that easily then the number could be
higher but I'm not sure of what will be a good number.
- Currently there is alsoe infrastructure like table columns for dealing
with releasing submissions from external systems (eg moodle) but that
functuionality is yet to be built.
- The checking of server busy in MS windows untested - may need to
just let MS ignore server busy check as there doesn't seem to be
standard way to check this.

Change-Id: If4c1d272e9c5d46fbf16b2ff73ceb2687c06ffd4
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      5c57b565
  55. 16 Sep, 2014 1 commit
    • Nigel Cunningham's avatar
      (Bug548021) Add support for anonymising pages. · 9624d430
      Nigel Cunningham authored 
      

This patch adds support for anonymising pages.

It creates a site option in the General Settings section named 'Allow
anonymous pages' that must be checked for any page to be anonymised.

If the site option is enabled, a new 'Anonymise' setting in the
'Edit title and description' tab of pages is enabled, allowing the owner
to request that this page be anonymised.

When both settings are enabled and a user views a page, two things may
happen to the author's information.

First, if the user is not logged in or does not have admin, staff or
owner privileges for the page, the author's name is replaced by the
anonymous text (defaulting to "(Author's name hidden)") in both the
body of the page and the metadata author field.

If the user does have admin, staff or owner privileges for the page,
the author's name is anonymised as above except that the text displayed
is made into a link. When this link is clicked, the anonymous author
text is replaced by the normal author information for the page.

Anonymous pages displayed in the 'Latest pages' block and shared with
a group are also anonymised by this patch.

Change-Id: I2e2c92f641329a1a305cf58a5c5d47bf95436a8b
Signed-off-by: default avatarNigel Cunningham <nigelc@catalyst-au.net>
      9624d430
  57. 02 Sep, 2014 1 commit
  59. 01 Sep, 2014 1 commit
  61. 31 Aug, 2014 1 commit
  63. 25 Aug, 2014 1 commit
  65. 13 Aug, 2014 1 commit
  67. 28 Jul, 2014 1 commit
    • Robert Lyon's avatar
      Checking to make sure artefact/block library still exist (Bug #1319634) · 0f7251b3
      Robert Lyon authored 
      

Sometimes views will have artefacts/block instances on them but the
plugin has been deleted. This should not stop a user being deleted.

To test:
Add a plugin to the site (eg openbadgesdisplayer block plugin, or cpds
artefact plugin) and install it.
Add a page and add a block to the page.
Delete the dir from the site for the plugin
Try to bulk delete the user

Change-Id: Ib23ad79d9f1ffa0bca56ad7ccb6083333527e64c
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      0f7251b3