1. 21 Sep, 2016 1 commit
  2. 16 Sep, 2016 1 commit
  3. 15 Sep, 2016 3 commits
  4. 14 Sep, 2016 5 commits
  5. 13 Sep, 2016 2 commits
  6. 12 Sep, 2016 5 commits
  7. 11 Sep, 2016 1 commit
  8. 10 Sep, 2016 2 commits
  9. 09 Sep, 2016 4 commits
  10. 08 Sep, 2016 2 commits
  11. 07 Sep, 2016 2 commits
  12. 05 Sep, 2016 4 commits
  13. 02 Sep, 2016 6 commits
    • Robert Lyon's avatar
      Updating the version number for master branch · 09ae0ce0
      Robert Lyon authored
      Change-Id: I4960f6f3102ea1386b1c6057a547edafdf0179b2
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      09ae0ce0
    • Robert Lyon's avatar
      Cahanges to README.md file · 564567b1
      Robert Lyon authored
      Change-Id: Ibc414a6b4a270c0a11b9e7c01526dee81e3e6bde
      Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      564567b1
    • Robert Lyon's avatar
      e590c7b1
    • Son Nguyen's avatar
      Enable more media formats. Bug #1564706 · a5cf7d59
      Son Nguyen authored
      - OGG
      - WEBM
      - 3GPP
      
      behatnotneeded
      
      Change-Id: I8a07f46ad11fd4b781679d9e0a76a653e0c60abb
      a5cf7d59
    • Kristina Hoeppner's avatar
      Bug 1619519: Fix minor lang string issues · 7f9c98c2
      Kristina Hoeppner authored
      behatnotneeded
      Change-Id: If88dd9ff55b232a2c6b694d64eeb4231918b0ca7
      7f9c98c2
    • Robert Lyon's avatar
      Merge changes from topic 'Smart evidence' · 673a2cc4
      Robert Lyon authored
      * changes:
        Bug 1409546: Styled smart evidence
        Bug 1409546: Fixes for issues found in the earlier patches
        Bug 1409546: Adding a 'framework_choices' table to db
        Bug 1409546: Adding an 'active' column to framework db
        Bug 1409546: More adjustments
        Bug 1409546: Altering matrix upload to a file upload field
        Bug 1409546: Restricting annotation assessment options
        Bug 1409546: Annotation feedback on form
        Bug 1409546: Alter annotation blocktype
        Bug 1409546: Add annotation to view via click on matrix point
        Bug 1409546: Allowing plugin page to show plugin name
        Bug 1409546: Adjusting collection navigation to include framework option
        Bug 1409546: Adding carousel type ability to matrix table
        Bug 1409546: Add framework option to add/edit collection form
        Bug 1409546: Adding smart evidence switch to institution config form
        Bug 1409546: Plugin config option to install a .maxtrix file
        Bug 1409546: Adding in the framework module
        Bug 1409546: Adding framework field to collection table
      673a2cc4
  14. 01 Sep, 2016 2 commits