1. 09 Sep, 2016 1 commit
  2. 05 Sep, 2016 2 commits
  3. 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>
    • 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>
    • Robert Lyon's avatar
    • Son Nguyen's avatar
      Enable more media formats. Bug #1564706 · a5cf7d59
      Son Nguyen authored
      - OGG
      - WEBM
      - 3GPP
      Change-Id: I8a07f46ad11fd4b781679d9e0a76a653e0c60abb
    • Kristina Hoeppner's avatar
      Bug 1619519: Fix minor lang string issues · 7f9c98c2
      Kristina Hoeppner authored
      Change-Id: If88dd9ff55b232a2c6b694d64eeb4231918b0ca7
    • 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
  4. 01 Sep, 2016 25 commits
  5. 31 Aug, 2016 4 commits
  6. 30 Aug, 2016 2 commits
    • Aaron Wells's avatar
      Bug 1600099: Cleanup of the webservice admin page · ce1a97ac
      Aaron Wells authored
      This patch does a few things:
      1. Renames "webservice_enabled" config to "webservice_provider_enabled",
      to indicate that this config only controls Mahara's actions as
      a webservice provider, *not* a webservice client.
      2. Renames all the "webservice_<protocol>_enabled" configs to
      "webservice_provider_<protocol>_enabled" to indicate that they only
      control whether Mahara will provide webservices via that protocol,
      and not whether Mahara will use that protocol as a client.
      3. Renames "webservice_connections_enabled" config to
      "webservice_requester_enabled", to clarify that this config
      controls whether Mahara is allowed to request webservices
      from external sources.
      4. Updates language strings to make these changes clearer.
      5. Rearranges and renames the form methods in
      webservice/admin/index.php to make the flow of control more
      obvious. Now the main form method is first, followed in order
      by the methods that generate its subforms and each of their
      submit handlers.
      behatnotneeded: Covered by existing tests
      Change-Id: I58dadb352d1f1542ca67a104ebfd702b4ca90fc9
    • Son Nguyen's avatar
      Bug 1597117: Fix form validate for required inputs for MS Edge · dd7212a8
      Son Nguyen authored
      Change-Id: Ifa3503d5192f3454c56c24825d51c9b63acd2ea4