1. 28 May, 2012 1 commit
  2. 24 May, 2012 1 commit
  3. 23 May, 2012 4 commits
  4. 21 May, 2012 1 commit
  5. 18 May, 2012 1 commit
    • Son Nguyen's avatar
      Be flexible in the number to results shown on a page Bug#781989 · f3162f80
      Son Nguyen authored
      
      
      1. Added a new feature to build_pagination:
       - setlimit: enable=true/disable=false choosing limit values
       from the array limitoptions
       - the array limitoptions (page sizes) has been hardcoded
      inside build_pagination function.
      
      2. Enable this feature to group member search and porfolio pages search
      Note: The default number of pages in Porfolio/Pages has been changed to
      20
      
      To enable this feature
      1. pass 'setlimit' => true to build_pagination function
      2. $js = "addLoadEvent(function() {p = {$pagination['javascript']}});";
      3. $smarty->assign('INLINEJAVASCRIPT', $js);
      
      Change-Id: Ib44b28d50895c6ea604bb1aedaebae3a3f1bfc1a
      Signed-off-by: default avatarSon Nguyen <son.nguyen@catalyst.net.nz>
      f3162f80
  6. 17 May, 2012 1 commit
  7. 15 May, 2012 3 commits
  8. 14 May, 2012 2 commits
  9. 11 May, 2012 1 commit
  10. 09 May, 2012 1 commit
  11. 07 May, 2012 2 commits
  12. 04 May, 2012 2 commits
  13. 03 May, 2012 1 commit
  14. 02 May, 2012 1 commit
  15. 01 May, 2012 2 commits
  16. 30 Apr, 2012 3 commits
  17. 27 Apr, 2012 2 commits
  18. 26 Apr, 2012 2 commits
    • Son Nguyen's avatar
      Missing text about how many pages can be displayed Bug#969794 · 3c839c77
      Son Nguyen authored
      
      
      + Add text description: "Between 1 and 100" in configuration of
      'watchlist', 'recent journal entries', and 'tagged journal entries'
      + Add rule for checking the number of items to be displayed min=1,
      max=100
      
      Change-Id: Ia1016bc1cd084c855b16b7264136e83bc7a6959f
      Signed-off-by: default avatarSon Nguyen <son.nguyen@catalyst.net.nz>
      3c839c77
    • Richard Mansfield's avatar
      Change version of safe iframe sources upgrade (bug #971282) · ab160d78
      Richard Mansfield authored
      
      
      We have just committed to master a database upgrade with a version
      number less than the current version number of the 1.5 branch.  This
      means that an upgrade from the current 1.5 to master will not add the
      safeiframe tables.
      
      This patch changes the version number on master to ensure the upgrade
      is applied.
      
      This occurred because the 1.5_STABLE branch's version leapfrogged over
      the master version during the release candidate stage.  This will be
      fixed in the release script (see bug #988682).
      
      Change-Id: Ic2929fa9f17719a6068494ab63e7f00558c2fdcc
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      ab160d78
  19. 24 Apr, 2012 2 commits
  20. 20 Apr, 2012 1 commit
    • Richard Mansfield's avatar
      Use MySQL database collation for string literals (bug #985608) · ddc69cb0
      Richard Mansfield authored
      
      
      In MySQL, the collation for string literals in SQL expressions is
      defined by the connection collation, which can be different from the
      column collations inside the database.  When comparing string literals
      to values selected from the database, this can result in an "Illegal
      mix of collations" error, even if both the connection and the database
      use the same character set.
      
      Mahara already requires the column and connection character sets to be
      utf8, but doesn't care about the collations, so we can fix this with
      the MySQL "SET CHARACTER SET" statement, which sets the connection
      collation to match the database collation.
      
      Change-Id: Ied6fcf7062fae5aa315a43ec9ce80883e6ef5b2e
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      ddc69cb0
  21. 15 Apr, 2012 1 commit
  22. 13 Apr, 2012 1 commit
  23. 12 Apr, 2012 4 commits
    • Richard Mansfield's avatar
      Make download.php publicly accessible (bug #979538) · 72ed0b00
      Richard Mansfield authored
      In commit 647a99fd
      
       (see bug #914490),
      the sitemaps were made available from the download.php script, but
      this script is not publicly accessible, so crawlers would not be able
      to download them.
      
      Making the script public is okay here, because whenever a non-sitemap
      file is requested, there is already an exception thrown if the user is
      not logged in.
      
      Change-Id: Ia9c62940ee7dada05f4f1b448ead0c146171535c
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      72ed0b00
    • Richard Mansfield's avatar
      Use htmlpurifier in external media block (bug #971289) · c5753d29
      Richard Mansfield authored
      Now that SafeEmbed and SafeIframe options of htmlpurifier are enabled,
      the external media block can make use of them, rather than always
      trying to parse and generate iframe and embed code for the supported
      sites.
      
      Any html pasted into the block configuration form is now allowed to
      fall through to be sanitised by htmlpurfier, so the site-wide list of
      allowed iframe sites will be used rather than the existing list of
      supported sites in the external media block.
      
      Valid URLs pasted into the configuration form are still processed by
      the various media_sources regular expressions in
      blocktype/externalvideo/media_sources/*/mediasource.php, but the
      regexes that were previously designed to operate on embed/iframe code
      have been removed, and the remaining ones have been modified to match
      at the beginning of a url only.
      
      When a URL is entered, and the block saved, the embed/iframe code to
      be used when rendering the block is generated immediately, and
      subsequent edits of the block will reveal only the generated
      embed/iframe html.  The render_instance function will still generate
      the required embed code for old blocks that haven't been reconfigured
      yet.
      
      The glogster scraping code is also tightened slightly to ensure that a
      URL is returned.
      
      See https://wiki.mahara.org/index.php/Developer_Area/Specifications_in_Development/External_media_block_extension
      
      
      
      Change-Id: I7024ab946f8a6965e78730eb1daa3441f220a10b
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      c5753d29
    • Richard Mansfield's avatar
      Remove unused function and debugging from voki mediasources · e14a5c1b
      Richard Mansfield authored
      
      
      Change-Id: If3d1fe26f6baebb6f2939c8eeb0c8d2a69e622d2
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      e14a5c1b
    • Richard Mansfield's avatar
      Admin page to manage SafeIframe sites (bug #971282) · f3182dd6
      Richard Mansfield authored
      
      
      Adds a new page for Site admins to manage the list of sites for which
      iframes are allowed by htmlpurifier.  Whenever an item is added,
      edited, or deleted, the regex used by HTMLPurifier is updated.  Sites
      are identified by favicon, and by a string entered by the Admin to be
      used as the alt/title text for the favicon image.  The source of the
      favicon image can be modified in config.php, but the google service is
      used by default.
      
      Change-Id: I4117de82691a002bf250ea71622eccfad4d5f8df
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      f3182dd6