1. 12 Jul, 2016 1 commit
  2. 11 Jul, 2016 4 commits
  3. 08 Jul, 2016 11 commits
  4. 07 Jul, 2016 5 commits
    • Robert Lyon's avatar
      Bug 1234615: Check that resized image files are viewable by user · aa31ba59
      Robert Lyon authored
      When exporting via Html export process - if not then ignore the file
      To test:
      1) Add an image block/file to a page and set a width value
      2) Go into db block_instance table and change the artefactid to an
      image that is owned by another user
      3) Reload the page - you should see the image block but not the
      attached image
      4) Export the page as HTML, either as full or standalone
      Before patch - you will end up with image file in the files/extra/
      After patch - you should not get the image in the files/extra/
      directory and you should get an info warning 'Unable to copy artefact
      file ***' on export page.
      Change-Id: Iaeb9404b3329c4eb3eac59354801b598f7cd5ba8
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
    • Robert Lyon's avatar
      Bug 1580399: Stop users logging in to suspended/expired institutions · c10a36bc
      Robert Lyon authored
      Moving the code from LiveUser->login() to
      ensure_user_account_is_active() so that internal and external logins
      can use the same code. This means the check now will fall after
      LiveUser->authenticate() so a user's lastlogin values will be updated.
      but that should be ok as the login was successful, it's just they
      can't go any further as their institution is not active.
      Change-Id: Ie78a60978d5936f78af5a962ca3efdcdee148b93
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
    • Cecilia Vela's avatar
      Bug 1566606: Added control to hide button · 7997eed7
      Cecilia Vela authored and Robert Lyon's avatar Robert Lyon committed
      For 'Add to watchlist and Report' options when the user is the author
      of the page.
      Needed to fix up behat test due to a user not being able to add their
      own page to watchlist anymore
      Change-Id: I3d76fadd1a15a03f71e6eede3bd4c7bab4629c44
    • Aaron Wells's avatar
      Bug 1599375: Hide portfolio page site template from "Edit Access" screen · 1bb7f3d5
      Aaron Wells authored
      Change-Id: I4a50b3b1adc7d2ffb8d26414ae05c08c137ecc50
      behatnotneeded: Test to come later
    • Aaron Wells's avatar
      Bug 1591052: remove dataroot/smarty directory · 128a0249
      Aaron Wells authored and Robert Lyon's avatar Robert Lyon committed
      Not in use since Mahara 1.2.
      Change-Id: I8aa24c11eb82a748465fc58eeadb4819061b8bcd
      behatnotneeded: Covered by existing tests
  5. 06 Jul, 2016 3 commits
  6. 05 Jul, 2016 4 commits
  7. 04 Jul, 2016 1 commit
  8. 03 Jul, 2016 2 commits
    • Robert Lyon's avatar
      Bug 1594579: Copy view artefacts only once · baac44f1
      Robert Lyon authored
      Rather than copy the same artefact once per page we should only copy
      it once per copy of page(s) transaction. Eg if we are to copy a
      collection of 5 pages and they all have a block pointing to the same
      image we should copy that image only once not 5 times.
      behatnotneeded - behat file to come
      Change-Id: Iecdde53515cdd9d5ee02918252b486aa0f662fab
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
    • Robert Lyon's avatar
      Bug 1594579: Allowing a group to be duplicated · 33b484bf
      Robert Lyon authored
      This patch does the copying of:
      - The group settings - and renames the group to a new unique name
      - Views/collections - the same way we copy them now so that copied files
        end up in 'viewfiles' folder.
      - The group homepage by copying the old homepage like a normal
      page then move the blocks from it to the new homepage and then deleting the
      duplicated homepage.
      - Adding copy buttons to the admin/groups list, the my groups list,
      and group homepage.
      Still to do:
      Make sure we don't duplicate more than one copy of a journal if the
      journal is within more than one page/block
      behatnotneeded - behat file to come later
      Change-Id: Ibd74d1bdf76c3488d4af3735dba9c7b5f773e2f7
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
  9. 02 Jul, 2016 4 commits
  10. 01 Jul, 2016 3 commits
  11. 28 Jun, 2016 2 commits