1. 15 Jun, 2015 11 commits
  2. 03 May, 2015 1 commit
  3. 29 Apr, 2015 1 commit
  4. 07 Apr, 2015 1 commit
  5. 01 Apr, 2015 1 commit
  6. 31 Mar, 2015 1 commit
  7. 26 Mar, 2015 1 commit
  8. 23 Mar, 2015 2 commits
  9. 18 Mar, 2015 2 commits
  10. 17 Mar, 2015 1 commit
  11. 16 Mar, 2015 1 commit
  12. 13 Mar, 2015 1 commit
    • Ghada El-Zoghbi's avatar
      Annotation artefact: Bug 1397759 · 389df353
      Ghada El-Zoghbi authored
      A new artefact similar to the comment artefact but with less
      functionality (i.e. no attached files, etc).
      It's an explenation of why a particular evidence meets a
      particular standard.
      
      If an annotation is created and added to a page, when the user
      deletes it from the page, the instance is deleted along with the
      annotation and its feedback.
      
      TODO:
      
      1. Imports seem to be working.
      Can get all comments to import and display.
      Needs some serious testing.
      
      2. Made changes for broken images but another bug was reported and is
      currently being worked on. So, may not need the fixes in here. Changes in:
      - htdocs/artefact/file/download.php
      
      To completely fix the broken images for all artefacts, changes are also required
      in htdocs/lib/embeddedimage.php to delete based on resourceid instead of fileid.
      
      Change-Id: Ibdb2e1c6500862645bac741bf61cff37e5a5b35c
      389df353
  13. 08 Mar, 2015 2 commits
  14. 03 Mar, 2015 1 commit
    • Nigel Cunningham's avatar
      (Bug1352028) Add a JSON progress bar for bulk operations. · 55a8deb8
      Nigel Cunningham authored
      
      
      This patch adds a JSON progress meter (I'll call it that to avoid confusion
      with progress bars) to the bulk uploading of users, groups and group
      memberships and the bulk export and import of users (LEAP), so the user can see
      the progress of the operation and not just the submit button changed to
      'Processing..' and whatever indication their browser gives while waiting for
      content.
      
      The bulk export and import are minor rewrites, replacing the old iframe based
      progress bar and the associated multiple pages and additional template file in
      the case of the bulk export, and the recursive redirect-to-self of the bulk
      import.
      
      To accomplish the display of the progress bar during the operation, we make the
      PHP session be closed (read only) except when changes need to be made. This is
      for the most part a straightforward change in session.php as it's the only
      direct accessor. In other places, we replace direct accessing of the session
      variable ($_SESSION) with use of the session class ($SESSION) so that it can
      reopen the session, make the change and close the session again.
      
      There is one more aspect to all of this: with previous behaviour, multiple
      requests for the same session would queue, taking the session lock in turn.
      After this patch is applied, they can proceed in parallel, allowing greater
      throughput. There is no additional locking requirement because the issues are
      the same as those already dealt with in allowing multiple PHP threads to
      process requests from different sessions at the same time.
      
      I have sought to make the progress meter nice and generic, so it can be used in
      the other bulk imports and exports too.
      
      Paradoxically, these changes don't just make the import seem to be faster, it
      actually is.. at least in the case of users and groups.
      
      Times for importing 1000 users, groups and memberships, averaged over 3 runs
      each (Wall time, not CPU time - but the relationship is the same).
      
                      Without Progress     With Progress
      Users                166s               155s
      Groups                85s                78s
      Memberships           20s                19s
      
      Change-Id: Iec15c57db32c77994edb80c71d65591de51a95e4
      Signed-off-by: default avatarNigel Cunningham <nigelc@catalyst-au.net>
      55a8deb8
  15. 26 Feb, 2015 1 commit
  16. 12 Feb, 2015 1 commit
    • Nigel Cunningham's avatar
      Bug1051844: Fix block configure dialog width. · 141ee71b
      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
      141ee71b
  17. 28 Jan, 2015 1 commit
  18. 13 Jan, 2015 1 commit
  19. 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
  20. 15 Dec, 2014 1 commit
  21. 12 Dec, 2014 1 commit
  22. 09 Dec, 2014 3 commits
  23. 16 Nov, 2014 3 commits