1. 29 Apr, 2021 1 commit
  2. 22 Apr, 2021 1 commit
  3. 31 Mar, 2021 1 commit
    • Gold's avatar
      Bug 1730263 - Multiple sources for names in persondata · 9c370270
      Gold authored
      A partial export (just selected pages) does not include the persondata
      tags. When these are not present the first/last names are taken from the
      author tag.  I've added a 'source' parameter to the firstname/lastname
      fields that can be checked later in the process when the Import form is
      being presented.  If the source is the author tags we force the Ignore
      option on the decision field values.
      
      The Bug referenced 'personal information' so I have included the email
      field.
      
      Change-Id: Ifa173a88f497be994c5ab93e26376463442ab24b
      9c370270
  4. 01 Mar, 2021 1 commit
    • Gold's avatar
      Bug 1916833 - Annotation can be updated on a page · 690edccd
      Gold authored
      Config gear icon removed from the Annotation blocks.
      In order to still initially create these when added we needed to check
      if the Block was a new instance or not. To achieve that we are now
      passing the block instance into the has_instance_config() method.
      
      BlockInstance has been extended and will set a 'new' parameter if the ID
      in the constructor is 0.
      
      AuthPlugin* classes also have the has_instance_config(). These do not
      need the BlockInstance passed in.
      
      Change-Id: Ifac69fc1d48b45c079b6f66e610776cead3dee63
      690edccd
  5. 21 Sep, 2020 1 commit
  6. 17 Sep, 2020 1 commit
    • Evonne's avatar
      Bug 1845053 Font size and size variable · 1d324796
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Base font has been increased to 16px, and as a result, variables
      have had to be recalculated.
      
      Max browser width has been increased to 1440px to allow the
      larger font to have more characters in a line.
      
      As a part of accessibility, headings H1-H6 have had to be rejigged.
      Note that for elements such as popup/modals, the heading restarts
      at H1 again as advised by Julius.
      
      Page heading is H1, block heading is H2, everything else should be
      H3. Trying to attempt to reserve H4-H6 for user content, but it is
      still existing in some places as some things can't be changed.
      
      Attachment markups have been unified and added to styleguide.
      
      Removed H3/H4 from fieldset legends.
      
      behatnotneeded
      
      Change-Id: I69273c9775d658f03738c29be8d230b59c189790
      1d324796
  7. 01 Sep, 2020 1 commit
    • Robert Lyon's avatar
      Bug 1892794: Allowing custom profile fields have custom titles · 0ca96efc
      Robert Lyon authored
      
      
      Currently all profile fields title/label named via the artefacttype
      But if we want different titles in differnet contexts we can now do
      this by adding to our ArtefactTypeWhatever class something like
      
          public static function static_display_title() {
              if (... some condition ...) {
                  return get_string('altoption', 'artefact.internal');
              }
              return get_string('option', 'artefact.internal');
          }
      
      Change-Id: I32cfdc821442a7ba8729d76a18e6ddc1f7a62c95
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      0ca96efc
  8. 03 Aug, 2020 1 commit
  9. 15 Jun, 2020 1 commit
  10. 07 May, 2020 1 commit
  11. 24 Apr, 2020 1 commit
    • Rebecca Blundell's avatar
      Bug 1839411: Update Mahara to work with PHP7.3/7.4 · 4263848b
      Rebecca Blundell authored and Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic committed
      Fixed strpos error picked up by 7.3
      I haven't found any other 7.3 issues and none have been caught by behat
      
      For 7.4:
      -Fixed implode param order (glue, parts)
       Note that Mink has a reversed implode not fixed upstream:
       external/vendor/behat/mink/src/Selector/Xpath/Escaper.php:50
       I have added a function to copy the correct code over in the interim
       I also pushed a change to an HTMLPurifier file as it is not fixed upstream
      -Changed a variable read by fread to allow for false return type
      -Calling a non-array as an array now causes an error, meaning we need to
       confirm an array value before attempting to use a variable. An obvious
       case is in multi-record db calls the return value is either an array of
       results or false. E.g.
          $array = db_call();//returns false as no results
          //do sth with result
          $var = $array[0]//error, trying to access type false as array
          //instead we need to check the value before accessing:
          $var = !empty($array[0]) ? $a...
      4263848b
  12. 31 Mar, 2020 1 commit
  13. 30 Mar, 2020 1 commit
  14. 29 Mar, 2020 1 commit
  15. 14 Mar, 2020 1 commit
    • Rebecca Blundell's avatar
      Bug 1845228: Make Mahara work with mysql 8.0.17 · e48f88ce
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      -Add mysql reserved words 'array' and 'member'
      -Remove deprecated ||, &&, ! and replace with OR, AND, NOT
      Note: Use of || is deprecated unless the PIPES_AS_CONCAT SQL mode is
      enabled. In that case, || signifies the SQL-standard string
      concatenation operator
      -Quote uses of member in SQL queries
      Note: when passed in as a variable it is quoted on query construction
      
      behatnotneeded
      
      Change-Id: I860bac5c44dab206b70a78215a5784e6f1fe3928
      e48f88ce
  16. 02 Mar, 2020 1 commit
  17. 28 Feb, 2020 1 commit
  18. 30 Jan, 2020 1 commit
  19. 22 Jan, 2020 2 commits
  20. 29 Oct, 2019 1 commit
  21. 22 Oct, 2019 1 commit
  22. 17 Oct, 2019 1 commit
  23. 07 Oct, 2019 1 commit
  24. 06 Oct, 2019 1 commit
    • Evonne's avatar
      Bug 1845104 Various theme fixes part 1 · 65103626
      Evonne authored and Robert Lyon's avatar Robert Lyon committed
      Fixing some inconsistencies with user-icon sizes, on profile page,
      and recent forum posts, and taking out some redundant styles.
      
      behatnotneeded
      
      Change-Id: Ifef04d165a2257b6c89f007f82b33ef0b37edc3b
      65103626
  25. 04 Oct, 2019 1 commit
    • Cecilia Vela Gurovic's avatar
      Bug 1813987: block resizing to fit content · 565776fb
      Cecilia Vela Gurovic authored and Robert Lyon's avatar Robert Lyon committed
      should not resize blocks in view mode
      
      in view mode, if the content of the block is static,
      then the block dimensions should not change but the
      content of the block should be made smaller
      
      expand the height of a block only if the content is dynamic,
      like the 'Journal' block
      
      behatnotneeded
      
      Change-Id: Ie8183736580e7e592b24e36f4a16618b96a5bf4e
      565776fb
  26. 25 Sep, 2019 3 commits
    • Lisa Seeto's avatar
      Bug 1827811: Resume Icons · 953a5eab
      Lisa Seeto authored
      
      
      - get attachment comment counts for bh icons
      - display plain text for titles in editing mode
      - change the way the commentlink is targetted via js
      - add blockid's to resume attachments
      - for folder block: add comment count, change titles from
      	links to plain text when editing
      - change notes attachment file titles from links to plain
      	text when editing
      - get rid of the single artefact block title links for html exports
      ---------------------------------------------------------
      Add fixes:
      - blocks that have set types but no artefacts attached don't have modal links
      - pdf block is now using block header and comment count is loaded
      - block headers are above titles
      - tagged journals have icons when in full and matches recent posts styling
      - deleting all comments produces correct icon on block header
      - html exports should not hang on opening modal
      - get rid of warning error re: dock.show() when redirecting from &modal=1 style url
      - code review fixes for all previous patches + fix issue with folders block
      - added in viewdetailsfilter.json.php file to save details mode to user account prefs table
      - make the details btn mode "sticky" so it stays the save value over multiple pages etc...
      - Image Gallery blocks: if displaying a folder of images will get the bar block header and
      will have a the fancy box image preview displaying on image click
      
      Change-Id: I425cc5a634e176d580aacdb60a20f869f7cb7496
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      953a5eab
    • Lisa Seeto's avatar
      Bug 1827811: Notes block · 1885a18d
      Lisa Seeto authored
      
      
      do not show note contents when displayed in a modal.
      if comments not allowed but license metadata is on, display details link and open model with license data.
      make small change to setting of licensemetadata smarty variable
      get rid of comments/details links and use the new block header instead.
      
      Change-Id: I9183292278d06a3766ae08b0376237fda8d7206c
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      1885a18d
    • Lisa Seeto's avatar
      Bug 1827811: Move "Add comment" and "Details" into modal with "Comments" · be7af61f
      Lisa Seeto authored
      
      
      create modal using configureblock id, update various templates to use the modal for blocks:
      Image
      Note
      File(s) to download
      Journal/blogs
      add JS to open/close modal, add comments, delete comments, reply to comments, paginate comments.
      add JS to handle url that redirects to view/view.php with modal open and populated.
      Further changes to each block will be completed in child patches.
      Add segment headings to the modal. Fix display of comments to cover width of modal.
      Show comment removed msg in modal/page appropriately.
      Fix behat test to close modal before continuing.
      do not show existing comments if comments not allowed on artefact.
      add validation to modal for comments/attachments
      disable image as link when editing for image block
      trigger focus on modal for accessibility
      close modal on escape keydown event
      fix merge conflict in view/view.php
      fix merge conflict with master
      make configureblock modal play nicely when comment block is on the page
      update display of error messages to always show at top of modal so user doesn't have to scroll
      add accesibility to close modal on escape key down
      handle dock show/hide events for paginated pages in modal during validation
      create block-comments-details-header template file
      create details button and custom scss file with js to show and hide header
      update comment links to save add comment and details when commentcount == 0
      add active-block class to colour the block-header when active
      toggle the details-btn active css
      add _block-comments-details-header.scss to patch
      change class invisble to class d-none
      add block-comments-details-header.tpl to blocktypecontainerviewing.tpl
      code review changes
      add .no-modal class to links on group home page, dashboard and profile page.
      add block header to appear above the title
      change assessbtn from anchor tag to button to prevent scrolling.
      make all clickable links clickable on page load (ignore assess mode)
      fix js issues surrounding assessbtn move and show/hide blocks
      change cursor on dashboard, my profile page, group homepage to default when over disabled modal links
      update assessbtn to details btn
      create tooltip for hover over file download block titles
      fix containerElm console log error by not reattaching tinymce unneccessarily.
      fix null named attributes issues on e.target when span (icons) instead of anchor is clicked.
      
      Change-Id: I2e5218c040f8a9e252f785165ce9c566ecc2f56e
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      be7af61f
  27. 16 Sep, 2019 1 commit
    • Lisa Seeto's avatar
      Bug 1843149: Bulk import doesn't retain user details correctly · 9dc7cbc6
      Lisa Seeto authored and Robert Lyon's avatar Robert Lyon committed
      
      
      This change does the following:
      - Gets rid of the static cache that was created during run
      of the first record which would only save the first user's info.
      - when username is taken, append numbers and not underscores
      - get rid of the warning using count on globals var that were not
      previously set to array()s.
      - respects the email users about their accounts option
      
      behatnotneeded
      
      Change-Id: I57b1c5e4d401028defda0c35bfc8347149094eb2
      Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
      9dc7cbc6
  28. 12 Aug, 2019 1 commit
  29. 06 Aug, 2019 1 commit
    • Robert Lyon's avatar
      Bug 1838908: Email info out of sync · 0cd7ed99
      Robert Lyon authored
      
      
      When adding a non-primary email via:
       set_profile_field($userid, 'email', $email, TRUE);
      
      we shouldn't set email field in usr table to this new email address
      as the usr.email should be the primary address one
      
      Change-Id: Id8e780f3d7efa3baaae6383932e825a9cceb5e46
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      0cd7ed99
  30. 31 Jul, 2019 1 commit
    • Kristina Hoeppner's avatar
      Bug 1811904: Font Awesome icon adjustments · 0a9c9356
      Kristina Hoeppner authored and Robert Lyon's avatar Robert Lyon committed
      A few icons required adjusting to use only
      free icons. Additionally, icons in the
      card header in the "Primary School" theme
      were changed or added in the first place.
      
      Needed to update the card icons to use the correct font awesome family
      
      behatnotneeded
      
      Change-Id: Ief8f4b4393b1becfb18a8c39d3ef6b8966bbe9eb
      0a9c9356
  31. 05 Jul, 2019 1 commit
    • Doris Tam's avatar
      Bug 1714082: prevent users from emails being case sensitive. · 52ce6a21
      Doris Tam authored
      All emails are checked case-insensitively, but are kept in the db in
      the way user has typed
      - institution regisistrations are pending and don't appear in usr,
        artefact, or artefact_internal_profile_email, but in usr_registration
        so added additonal check
      - placed helper function inside user.php
      - putting in a special character before the @ will give single error
      - putting in a special char after the @ will flag a spam checker and out
        two errors
      
      behatnotneeded
      
      Change-Id: Iac1b740bc34878978ccf207d241f2399d7641040
      52ce6a21
  32. 25 Jun, 2019 2 commits
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - more name changes 2 · 4b16a73f
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      icon-envelope-o     -> icon-regular icon-envelope
      icon-exchange       -> icon-exchange-alt
      icon-file-image-o   -> icon-regular icon-file-image
      icon-id-badge       -> icon-regular icon-id-badge
      icon-id-card-o      -> icon-regular icon-id-card
      icon-clone          -> icon-regular icon-clone
      icon-sign-out       -> icon-sign-out-alt
      
      behatnotneeded
      
      Change-Id: I6f07f3b9c14184e98e44cd1b5568766d3fa9221a
      4b16a73f
    • Rebecca Blundell's avatar
      Bug 1811904: Fontawesome - Name changes · 7b952964
      Rebecca Blundell authored and Robert Lyon's avatar Robert Lyon committed
      new default for fontawesome is 'solid',
      where we are using a different class (regular or brand),
      we need to add these.
      
      also confirming that where the icon name has changed, we've
      picked that up.
      
      Where there's a choice of icon, I've kept it as close to what we
      currently have as possible.
      All free icons can be seen here:
      https://fontawesome.com/icons?d=gallery&m=free
      
      Name changes:
      icon-trash-alt      -> icon-trash
      icon-pencil         -> icon-pencil-alt
      icon-unlock-alt     -> icon-unlock
      icon-files-o        -> icon-regular icon-copy
      icon-pencil-square  -> icon-regular icon-edit
      icon-file-text      -> icon-file-alt || icon-regular icon-file-alt
      icon-image          -> icon-regular icon-image
      
      behatnotneeded
      
      Change-Id: I34646a6857f6cf54dc39572f5a66c07da4f4c0e2
      7b952964
  33. 24 Jun, 2019 1 commit
  34. 26 May, 2019 1 commit
    • Kevin Dibble's avatar
      Bug 1044878: Editing duplicated content · 62d8203a
      Kevin Dibble authored and Robert Lyon's avatar Robert Lyon committed
      Added a new feature that the user has to choose yes to
      start editing copy. This will force users to interact with the
      form before editing with the choice that they are editing
      all copies of this content.
      
      When selecting to use content from another note, the
      form will update based on their choice. The editor will
      remain open if yes has been selected. The editor will
      be hidden and only the content will show if 'Yes' has
      not be selected.
      
      This is a UI element only - no decision is saved to the
      DB as this is an editor based decision.
      
      behatnotneeded
      
      Change-Id: If44522c00672b296242893f0c876e7ff37561dd2
      62d8203a
  35. 01 May, 2019 1 commit
    • Kevin Dibble's avatar
      Bug 1044878: Editing duplicated content · 0df38c69
      Kevin Dibble authored and Robert Lyon's avatar Robert Lyon committed
      Added a new feature that the user has to choose yes to
      start editing copy. This will force users to interact with the
      form before editing with the choice that they are editing
      all copies of this content.
      
      When selecting to use content from another note, the
      form will update based on their choice. The editor will
      remain open if yes has been selected. The editor will
      be hidden and only the content will show if 'Yes' has
      not be selected.
      
      This is a UI element only - no decision is saved to the
      DB as this is an editor based decision.
      
      behatnotneeded
      
      Change-Id: Idb8d6736796a2350359bd59395393f6c7d742f96
      0df38c69
  36. 27 Mar, 2019 1 commit