1. 15 Jun, 2015 5 commits
    • Naomi Guyer's avatar
      Change theme name to raw (bootstrap) · 97b73cc9
      Naomi Guyer authored and Aaron Wells's avatar Aaron Wells committed
      Bug 1465107: Use Bootstrap CSS Framework
      
      Change-Id: Iac927105e903a1f38fa92792b9a2c388cd29c9a2
      97b73cc9
    • Naomi Guyer's avatar
      BUG - general styling fixes · 4245c555
      Naomi Guyer authored and Aaron Wells's avatar Aaron Wells committed
      Bug 1465107: Use Bootstrap CSS Framework
      
      Change-Id: I754032b3288bf5ed743756019e6c1ff6d4c729bf
      4245c555
    • Pat Kira's avatar
      Plans and tasks (bootstrap) · cb93a0c4
      Pat Kira authored and Aaron Wells's avatar Aaron Wells committed
      Bug 1465107: Use Bootstrap CSS Framework
      Style plans and tasks pages
      Style resume pages excluding collapsible elements
      Style plans and tasks pages
      
      Change-Id: Ied782c101b231d919cf1dcd6b267a70d18d39c70
      cb93a0c4
    • Pat Kira's avatar
      Profile files, journals, and resumes (bootstrap) · 0d5637a6
      Pat Kira authored and Aaron Wells's avatar Aaron Wells committed
      Bug 1465107: Use Bootstrap CSS Framework
      Style profile file page
      Refinements
      Style profile file browser
      Style journal page
      Edit journal page (work in progrerss)
      Tidy up sideblock and blockinstances
      Style edit journal view (completed)
      Style resume introduction page
      
      Change-Id: I662d8120952c371f7dec57ecf7cd84978c5177d2
      0d5637a6
    • Pat Kira's avatar
      Style notifications pages and profile pages · 29c6d7ae
      Pat Kira authored and Aaron Wells's avatar Aaron Wells committed
      Bug 1465107: Use Bootstrap CSS Framework
      
      Change-Id: I8c11611c32f29ca461945332926d8fbe0431daef
      29c6d7ae
  2. 29 Apr, 2015 1 commit
  3. 15 Apr, 2015 1 commit
    • Robert Lyon's avatar
      Stopping SWF files XSS exploitation (Bug #1190788) · 8df9bdfa
      Robert Lyon authored
      By doing two things:
      
      1) Getting the embedded SWF object to set the
       allowscriptaccess = "never" and allownetworking = "never"
      
      2) By forcing a 'download file' link to actually download file
      - this goes for all files now that don't have embedded=1
      in their url.
      
      I've done it this way, having the embedded item have extra url param
      so that if a user tries to manipulate a url by removing params it
      will default to force download.
      
      I've merged the changes I'd done here https://reviews.mahara.org/#/c/3522/2
      
      
      and I've also cleaned up places where the download=1 was used as that is
      not needed now. Now if there are places where we need to embed rather
      than download we add the embedded=1 to the url.
      
      Change-Id: If5290a7c571d06d4178ef2ae5c4c09ed287403b4
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      8df9bdfa
  4. 26 Mar, 2015 1 commit
  5. 19 Mar, 2015 2 commits
  6. 18 Mar, 2015 2 commits
  7. 17 Mar, 2015 1 commit
  8. 16 Mar, 2015 1 commit
  9. 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
  10. 09 Mar, 2015 1 commit
  11. 08 Mar, 2015 6 commits
  12. 05 Mar, 2015 1 commit
  13. 26 Feb, 2015 2 commits
  14. 25 Feb, 2015 1 commit
  15. 05 Feb, 2015 1 commit
  16. 28 Jan, 2015 2 commits
  17. 15 Jan, 2015 1 commit
    • Amelia Cordwell's avatar
      Bug 1217827 fix-Plan Description on portfolio page · d1a73341
      Amelia Cordwell authored
      This patch makes plan description show up on a portfolio page which
      it is a part of. Previously the description would only show up on
      the content / plans page rather than on a page it was a part of.
      
      Change-Id: I7436d6c2384a5064780f7281968467d08ca60490
      d1a73341
  18. 12 Jan, 2015 1 commit
  19. 08 Jan, 2015 1 commit
  20. 04 Dec, 2014 1 commit
  21. 19 Nov, 2014 1 commit
    • Robert Lyon's avatar
      Always specify what base type we want returned from parseInt() · 3743dcf6
      Robert Lyon authored
      
      
      Bug 1394330
      
      In most places in mahara we specify that we want base 10 number
      returned (or base 16 in case of a hexidecimal css colour)
      
      But there are a few places where we don't specify the radix at all
      
      It's best practice to always include the radix because for older
      browsers it interprets leading 0 as octal by default.
      
      Also makes it clearer to developers what type of number is expected to
      be retrieved from the string.
      
      Change-Id: Iaecc85cbed875f85b313188c4e96cc1b77c77b31
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      3743dcf6
  22. 16 Nov, 2014 6 commits