1. 31 Aug, 2018 1 commit
  2. 23 Aug, 2018 1 commit
  3. 09 Aug, 2018 2 commits
    • Robert Lyon's avatar
      Bug 1785938: Fixing gallery and changing slimbox2 to fancybox3 · 66e7468a
      Robert Lyon authored
      
      
      Things done with this patch:
      
      1) Changed the 'Use photo frame' option from being a plugin variable
         to being an instance config variable
      
      2) Added back in the css for the giving the gallery images photo frame
         borders
      
      3) Get the non-square thumbs to render correctly spaced on load
      
      4) Swapped the slimbox2 to fancybox3 and allowed the block itself to
      control when to put content into head data
      
      behatnotneeded
      
      Change-Id: I397be45f2347588988b663b25b560d8ab876afe1
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      66e7468a
    • Gregor Anzelj's avatar
      Bug 1743870: Moderate portfolios of regular users · 4e5e0aae
      Gregor Anzelj authored and Robert Lyon's avatar Robert Lyon committed
      Allow institution admins and site admins to immediately remove all
      sharing options from a page (or collection if the page is within
      a collection) that is deemed objectionable.
      
      behatnotneeded
      
      Change-Id: I23de7ed5c4678afe8a65e51b2aec06126948c637
      4e5e0aae
  4. 08 Aug, 2018 2 commits
    • Kevin Dibble's avatar
      Bug 1781844: Lock blocks on pages · 3e76e38e
      Kevin Dibble authored and Robert Lyon's avatar Robert Lyon committed
      A lot of users in Mahara create (Template) pages to share out to users.
      This reduces the setup a new user will have to do to. There is an issue
      that on their personal copy, the blocks that were so carefully setup can
      be deleted.
      
      This functionality creates a new column in the database called
      "lockblocks" that can be enabled/disabled on the share page.
      
      When the user copies the page, this setting is copied over and the
      "delete" icon is hidden from view should the lockblocks setting be
      enabled. This only happens on normal portfolio pages.
      
      To unset - the user can edit the page settings and
      disable the lock blocks feature to enable the deletion of the blocks as
      per normal.
      
      behatnotneeded
      Change-Id: I7a2062f77431d6371f95d7f55bedcc499dd7caa2
      3e76e38e
    • Robert Lyon's avatar
      Bug 1785928: Update min upgrade version values · 14412ff7
      Robert Lyon authored
      
      
      behatnotneeded
      
      Change-Id: I8df12c5b2ec35a9c92231de8bfa90f1909af6afc
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      14412ff7
  5. 07 Aug, 2018 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1784781: adding peer & manager roles for user access to a view · 2ad167e5
      Cecilia Vela Gurovic authored
      - creating the role table
      - selecting the role when editing view access
      - fix: for already saved user and group access rules, show all roles
      in the dropdown to make it possible to change the value
      
      to do: display content depending on role
      
      behatnotneeded : will be added later
      
      Change-Id: Ie83e0ca84704182b40bcc2fa4a678da099a1793d
      2ad167e5
  6. 19 Jul, 2018 1 commit
    • Rebecca Blundell's avatar
      Bug 1760732: Add warning for upgrade of configurable themes · 8cac996b
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      Add 'customthemeupdate' flags for any institution to the
      institution_config table if:
      - the upgrade is from 16.10 or before
      - and the institution is using a configurable theme
      
      If there are institutions with 'customthemeupdate' set we add a warning
      that the institution settings need to be re-saved.
      
      Once the settings for an institution have been re-saved we clear the
      flag for that institution
      
      Steps to test:
      1) Have a 16.04 version site
      2) Create three institutions, two with a configurable themes
      3) Checkout the patch and run upgrade
      4) On clicking 'Continue' you should see the warning message
      5) On going to Admin dashboard you should see message there also
      6) Edit / save one of the institions
      7) Confirm that institution is not listed
      8) Do for the other and see warning now gone
      
      behatnotneeded
      
      Change-Id: I844d8e8bcb9be81a29f36cb101da1c61b41b10a9
      8cac996b
  7. 19 Jun, 2018 2 commits
  8. 17 Jun, 2018 1 commit
  9. 15 Jun, 2018 1 commit
  10. 20 May, 2018 1 commit
    • Robert Lyon's avatar
      Bug 1763163: record who has been given what page for one time copy · 1dcaef85
      Robert Lyon authored
      
      
      This changes the parent patch a bit. Instead of recording on the view
      table if a page is able to be copied to existing group members we
      insetad record in a new existing copy table if a group page/collection
      has been copied to a member and if not make the copy.
      
      We've also made the switch a slide switch, eg when switching it to
      'Yes' it does the task on save and then switches back to 'No'.
      
      This means at a later time if set to 'Yes' again it will do the copying
      again and give any newer members a copy of all pages/collections as
      well as give older members copies of any newer pages / collections /
      collection pages since the previous switching to 'No'
      
      Note: Currently adding new collection pages to older members will only
      add the pages as singular pages to their portfolio.
      
      behatnotneeded
      
      Change-Id: Ia22d8138d80ec5fdb5a401de7289b256f9e5fc69
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      1dcaef85
  11. 16 May, 2018 1 commit
    • Robert Scally's avatar
      Bug 1763163: Copy group portfolios automatically to existing group members · 01af3dab
      Robert Scally authored and Robert Lyon's avatar Robert Lyon committed
      A portfolio shall be copied automatically to existing regular group 
      members, i.e. excluding group tutors and administrators, when
      setting up the sharing permissions for the portfolio and selecting the
      copying option in "Advanced options".
      
      When new people are added to the group, the portfolio is not automatically
      copied to their accounts as they were not in the group when the copying
      was turned on.
      
      behatnotneeded
      
      Change-Id: I5f706056e3c53f1edc8bcb86cfd41bad1df0185b
      01af3dab
  12. 18 Apr, 2018 1 commit
    • Maria Sorica's avatar
      Bug 1723961: Allow plan blocktypes to display more than one plan · bc40a45f
      Maria Sorica authored and Robert Lyon's avatar Robert Lyon committed
      1. Added a details link for each plan in the blocktype as well.
      2. On site update, the existing plan blocktypes will be updated
      to be able to contain more than plan.
      3. Made task pagination work on blocktypes with
      multiple plans.
      
      behatnotneeded
      
      Change-Id: I4b462f447489eb16d43fd40cfa552825c5178a47
      bc40a45f
  13. 22 Mar, 2018 1 commit
  14. 19 Mar, 2018 1 commit
  15. 07 Mar, 2018 1 commit
  16. 05 Mar, 2018 1 commit
  17. 02 Mar, 2018 1 commit
    • Robert Lyon's avatar
      Bug 1443284: Allow an unsubscribe link for watchlist emails · 17131a35
      Robert Lyon authored
      
      
      This patch:
      - adds an 'unsubscribetoken' column to usr_watchlist_view table
       (if we want to unsubscribe other messages we'd need to add an
      'unsubscribetoken' to the relevant table)
      - records the token when one watches the view
      - sends email with unsubscribe link with message type and token to
      avoid exposing any user data
      - link goes to unsubscribe.php page and either unsubscribes user or
      gives generic warning
      
      Currently only working for watchlist notifications being sent via
      email/email digest
      
      Change-Id: I823249108f521faaefe3435f03b84ddf73e2d360
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      17131a35
  18. 01 Mar, 2018 1 commit
    • Maria Sorica's avatar
      Bug1751931: For institutions, keep just custom T&C/PS on update · 94b48502
      Maria Sorica authored and Robert Lyon's avatar Robert Lyon committed
      If an institution uses the site T&C and/or privacy statement
      as it's own, when the site is upgraded to the 18.04 version,
      the institution no longer has any T&C/PS.
      
      If an institution uses its own T&C and/or privacy statement,
      when the site is upgraded to the 18.04 version, the custom
      items are not deleted but remain the current T&C/PS
      for that institution.
      
      Note: If the institution had custom T&C/PS but switched
      back to using the site T&C/PS, when the upgrade is done
      the custom T&C and/or PS are deleted form the DB.
      
      behatnotneeded
      
      Change-Id: Ib54c39bd8e4cf0b238268387a78f7a056a24a856
      94b48502
  19. 23 Feb, 2018 1 commit
    • Glenn Walbran's avatar
      Bug 1729079: Create a mechanism to build manual links · dbf1ef2b
      Glenn Walbran authored and Robert Lyon's avatar Robert Lyon committed
      This commits adds a mechanism that will build links to the manual pages
      such that:
      
      - user's language is used if manual exists in that language, else en
      - the manual for this mahara/series is used
      
      The key -> manual page map will need to be populated and these links added to
      pages.
      
      Change-Id: Id7871395821dce660841341dda200f231e75de16
      dbf1ef2b
  20. 22 Feb, 2018 3 commits
  21. 16 Feb, 2018 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1734178: allow user to delete own account · 9837f182
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      added settings
      
      - institution level: reviewselfdeletion
          0 if the institution does not require approval
            from an admin to delete an account
          1 if the institution requires an admin to approve
            account deletion requests from users
          if not set, it takes the value from the site's
          default
      
      - site level: defaultreviewselfdeletion
        (Site options->User Settings -> Review account before self-deletion)
          1 if the site's default is requiring approval
          null otherwise
      
      Account deletion by a user
      
      when a user accesses to the account settings, a
      'Delete account' button is displayed.
      
      This will:
      - If the user belongs to an institution that requires
        approval (or does not have the settings but the site
        requires approval by default)
          then a notification will be sent to the admins
          of the institutions that require approval that
          the user belongs to
      - if the user belongs to institutions and none of them
        require approval (or does not have the setting
        but the site does not require approval by default)
          then the account is deleted
      - if the user does not belong to any institution
          then the action will depend on the setting of
          the 'mahara' institution or sites default if
          'mahara' doesn't have the setting
      
      Approval by institution admins
      
      An institution admin can see the pending deletion
      requests in Admin menu-> Institution -> Pending deletions
      After approving/denying a request, the user
      that requested the account deletion will receive
      a notification
      
      behatnotneeded
      Change-Id: I4ccd9c798cab065ec557eaddf7dfc3a51920b6d0
      9837f182
  22. 15 Feb, 2018 1 commit
  23. 12 Feb, 2018 1 commit
  24. 05 Feb, 2018 1 commit
    • Maria Sorica's avatar
      Bug 1734174: Add the after login privacy page · 44a6284e
      Maria Sorica authored
      Upon login, if the user has not yet agreed to the most
      recent Privacy statement versions, he will be redirected
      to this page.
      
      On install admin user accepts default privacy
      
      behatnotneeded
      
      Change-Id: I6afc3d4d4db0676782a8b1501a962862108eab6b
      44a6284e
  25. 24 Jan, 2018 1 commit
  26. 19 Jan, 2018 1 commit
  27. 09 Jan, 2018 3 commits
  28. 03 Jan, 2018 1 commit
  29. 14 Dec, 2017 1 commit
  30. 11 Dec, 2017 1 commit
  31. 07 Dec, 2017 1 commit
  32. 04 Dec, 2017 1 commit
    • Ghada El-Zoghbi's avatar
      Bug#1735072: Upgrade error with event_log updated columns · a7acb6a5
      Ghada El-Zoghbi authored
      Several issues resolved:
      1. The event_log.time column has been removed
      and replaced by ctime. The handl_event() call is using
      the new column even though the new column has
      not been created yet in the upgrade script.
      Therefore, include both columns in the event handling.
      
      2. The 'deleteartefacts' event stores multiple
      artefact IDs in the one event_log record. Therefore,
      there is not a one-to-one relationship when converting the
      record to the new format. Ignore the record when setting
      the resourceid and resourcetype.
      
      3. In the 'saveartefact' and 'deleteartefact' events,
      not all of the event_log records have 'id' and 'artefact'.
      Ignore setting the resourceid and resourcetype fields
      when the data is not available.
      
      4. For newer versions of Postgres and MySql, utilise
      the json dattype to convert the data held in the
      event_log.data column. This will speed up the
      processing of the table for sites with large data
      in the event_log table.
      
      Sponsored by Australian National University
      
      behatnotneeded
      
      Change-Id: If068dac825b9cef6301cd970f0a368124a67b3f1
      a7acb6a5
  33. 16 Nov, 2017 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1572825: added Voki html filter for embed code · 207889a5
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      Added new html custom filter to allow
      voki embed code with javascript tags.
      
      issue with the creation/edition of blocks:
      
      Voki embed code its a javascript code that loads
      js functions from a remote file and makes a call to a
      AC_Voki_Embed() function
      
      parameters:
      
      function AC_Voki_Embed (width, height, chsm, sc,
      transparent, bgcolor, returnFlag, playerType)
      
      The number of parameter makes the difference between
      old and new voki code. The old one will have only 7,
      the new one will have one more.
      
      The new embed code will have playerType = 1
      The function uses an XMLHttpRequest to obtain the
      new embed code. When we are loading the page,
      there is no problem. But when we are editing or
      creating the block, the the connection with the object
      gets lost and the embed code is never loaded.
      Solution found: reload the page after editing or adding
      a block with new voki code.
      
      The old voki code can have
      returnFlag = 1 will return a string with the code
      returnFlag = 0 will load the embed code in the page (by default)
      In this last case, after the function creates the embed code,
      it will call document.write('embed code')
      if we are loading a page with the embed code, we have no problem
      but if we have the page already loaded and we are editing the block
      or creating it, the document.write will replace all the html
      with the embed code.
      Solution found: change parameter of the function so it returns
      the code instead, then manually add it in the correct place
      of the html.
      
      behatnotneeded
      
      Change-Id: Ieed00b6c6887715b707b8123082a1312f3db1d9c
      207889a5