1. 30 Jul, 2015 1 commit
  2. 15 Jun, 2015 1 commit
  3. 07 May, 2015 1 commit
  4. 14 Mar, 2015 1 commit
  5. 16 Dec, 2014 1 commit
    • Mike Kelly's avatar
      Implement TinyMCE imagebrowser plugin · 36bc9f7d
      Mike Kelly authored
      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
  6. 16 Oct, 2014 1 commit
    • Aaron Wells's avatar
      Restore "toggle" button to TinyMCEs with "tinymceconfig" param · 886a7463
      Aaron Wells authored
      Bug 1381738. All the TinyMCE instances that use the "maharaimage" plugin are providing
      their own tinymceconfig param which redefines the whole list of plugins in use. So they
      didn't get the message when "tooltoggle" became one of the standard plugins.
      
      This fix is a bit of a hack. A more robust fix would provide a way for a TinyMCE to
      *add* to the list of plugins, or just specifically say it wants to use maharaimage
      instead of image.
      
      Change-Id: Ia8128e5d70bd4be1e5d4b45efae368a88174c4c5
      886a7463
  7. 22 Apr, 2014 1 commit
  8. 11 Mar, 2014 1 commit
    • Robert Lyon's avatar
      Displaying textbox attachments to view/artefact.php page (Bug #1279943) · 766ef005
      Robert Lyon authored
      - and getting the notes page to display the attachment count
      
      -- now cherry-picked on earlier expander fixing patches and having the
      new html format
      
      - also fixed bugs:
      -- where expander was not closing after editing block on view/blocks.php page
      -- where block edit was not keeping attached the attachments that
      were attached when adding attacments via notes page.
      -- where block edit was dropping attachments from all textbox
      instances of the same artefact if one selected to 'use content from
      another text box' - now the editor should auto 'select' the attachments
      related to the textbox chosen.
      
      Change-Id: I97101c2065a4daff22f82bb472c37d46d60e4c08
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      766ef005
  9. 14 Jan, 2014 1 commit
  10. 14 Oct, 2013 1 commit
  11. 25 Sep, 2013 1 commit
  12. 27 Jun, 2013 1 commit
  13. 18 May, 2013 1 commit
  14. 14 Feb, 2013 1 commit
  15. 01 Aug, 2012 1 commit
  16. 05 Oct, 2011 1 commit
  17. 26 Sep, 2011 1 commit
    • Richard Mansfield's avatar
      Don't update html artefact title with textbox title (bug #736665) · 047be290
      Richard Mansfield authored
      Whenever a textbox block title was changed, the html artefact inside
      it also had its title changed.  That was confusing, so instead we're
      going to set the html artefact's title once, when the textbox is first
      created (generating a title for it if the block has no title).  Once
      the html artefact has been created, the title can no longer be modified
      from the view editor again.  However, the ability to update the artefact
      title from the notes area is added, so that the user can keep the title
      in sync with the block titles if they want to.
      
      Change-Id: I98e2529e7c81759c9b22130da355e227c8f3d577
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      047be290
  18. 15 Aug, 2011 2 commits