Skip to content
GitLab
Switch branch/tag
  1. 22 Jan, 2015 1 commit
  3. 08 Jan, 2015 1 commit
    • Mike Kelly's avatar
      Fix PDFs SAMEORIGIN error when using subdomains (Bug #1399246) · 31e63c63
      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: default avatarMike Kelly <m.f.kelly@arts.ac.uk>
      31e63c63
  5. 16 Dec, 2014 2 commits
    • Mike Kelly's avatar
      Fix tabs and whitespace formatting · 0c875692
      Mike Kelly authored 
      

Change-Id: Iae6b20134f7426c006dcfe0200e46b2cd52279ff
Signed-off-by: default avatarMike Kelly <m.f.kelly@arts.ac.uk>
      0c875692
    • 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
  7. 04 Dec, 2014 1 commit
  9. 03 Dec, 2014 1 commit
  11. 20 Nov, 2014 1 commit
  13. 19 Nov, 2014 1 commit
    • Robert Lyon's avatar
      Always specify what base type we want returned from parseInt() · 3743dcf6
      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's avatarRobert Lyon <robertl@catalyst.net.nz>
      3743dcf6
  15. 18 Nov, 2014 1 commit
  17. 16 Nov, 2014 6 commits
  19. 11 Nov, 2014 1 commit
  21. 09 Nov, 2014 1 commit
  23. 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
  25. 13 Oct, 2014 1 commit
  27. 12 Oct, 2014 1 commit
  29. 09 Oct, 2014 1 commit
  31. 06 Oct, 2014 1 commit
  33. 01 Oct, 2014 1 commit
  35. 29 Sep, 2014 1 commit
  37. 24 Sep, 2014 1 commit
  39. 22 Sep, 2014 1 commit
  41. 12 Sep, 2014 1 commit
  43. 09 Sep, 2014 1 commit
  45. 02 Sep, 2014 1 commit
  47. 01 Sep, 2014 1 commit
  49. 29 Jul, 2014 1 commit
    • Robert Lyon's avatar
      Getting IE to behave as Chrome/FF when clicking file icon (Bug #1348595) · 4bc089e7
      Robert Lyon authored 
      

Currently in IE/FF/Chrome if you tab through a list of files on
artefact/file.index.php and hit space when on the icon you are given a list of places
you can move the file to. (Note: have some files and some folders when
testing).

But when you click on the icon you only get the list when in FF/Chrome.

This patch should allow the clicking to also work in IE 10

Change-Id: I958d52220912169f1fc0198a47428e077aa6ed3e
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      4bc089e7
  51. 24 Jul, 2014 1 commit
  53. 15 Jul, 2014 1 commit
  55. 14 Jul, 2014 1 commit
  57. 19 Jun, 2014 1 commit
  59. 12 Jun, 2014 1 commit
  61. 05 Jun, 2014 3 commits
  63. 04 Jun, 2014 1 commit