1. 01 Feb, 2012 2 commits
  2. 31 Jan, 2012 3 commits
  3. 29 Jan, 2012 1 commit
  4. 27 Jan, 2012 2 commits
  5. 26 Jan, 2012 9 commits
  6. 25 Jan, 2012 1 commit
  7. 20 Jan, 2012 2 commits
  8. 19 Jan, 2012 2 commits
    • Jono Mingard's avatar
      include link to accounts page (Bug 901558) · d022b6fe
      Jono Mingard authored
      
      
      Changed string 'noblogfound' to 'nodefaultblogfound'
      to add link '<a href="%saccount/">account settings</a>'
      
      Changed htdocs/artefact/blog/view/index.php to use
      'die_info' instead of 'ArtefactNotFoundException'
      so that the account settings link is not escaped
      
      Change-Id: I517aeabba59373ccb19a1cd618a988af689ce0f2
      Signed-off-by: default avatarJono Mingard <reason.koan@gmail.com>
      d022b6fe
    • Jono Mingard's avatar
      Added tagging help to file edit form (Bug 897532) · 3cb578f3
      Jono Mingard authored
      
      
      When editing a file the text "Enter comma separated
      tags for this item. Items tagged with 'profile' are
      displayed in your sidebar." now displays under the
      tag textbox.
      
      Added a new table row with the language string
      'tagsdescprofile' to artefact/file/theme/raw/form/editfile.tpl
      
      Change-Id: I2d3a0f92f989fca2bb990c9888a79ce090342cb3
      Signed-off-by: default avatarJono Mingard <reason.koan@gmail.com>
      3cb578f3
  9. 17 Jan, 2012 1 commit
    • Richard Mansfield's avatar
      Check for authinstances in use when deleting institutions (bug #917873) · d1310840
      Richard Mansfield authored
      
      
      When you delete an institution, and one of the institution's
      authinstances is still in use by some users, you get an sql error and
      a nonrecoverable error screen. (This can only happen when the users
      still using the authinstance are not institution members, because
      there is already a check to stop deletion of institutions with
      members).
      
      This patch allows the institution to be deleted anyway, reassigning
      the offending users to a 'default' authinstance.  If we can't find a
      sensible default authinstance, it will at least display a more helpful
      error message.
      
      Also, when attempting to delete an institution with members, set an
      error on the form rather than throwing a ConfigException.
      
      Change-Id: I9c85a3c8c80411e3cf526767b9142efb12907e5c
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      d1310840
  10. 16 Jan, 2012 3 commits
    • Richard Mansfield's avatar
      Use type=profileiconbyid in more requests for thumb.php · 011c5039
      Richard Mansfield authored
      
      
      This can help to reduce the overall number of requests for thumb.php
      because the 'profileiconbyid' urls are cached for longer by the
      browser.
      
      (Where the profile_icon_url function can be used, we also avoid the
      need to generate additional requests for users without profileicons,
      when remote avatars are disabled.  But because profile_icon_url relies
      on the nouserphoto icon being available in the requested size, we
      can't use it everywhere until we either generate the nouserphoto icon
      in more sizes, or change all those pages to use standard sizes.)
      
      Change-Id: I81c5c5f4b7f9136bf9b6a6f711e55a4bceb6fa14
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      011c5039
    • Richard Mansfield's avatar
      Fetch profileicon id info along with users in more places · 56240fa6
      Richard Mansfield authored
      
      
      On the admin notifications page, and in the wall and recent forum
      posts blocks, we are fetching user information from the database and
      then subsequently generating new requests for their profile icons.
      
      By fetching the profileicon and email address along with the rest of
      the user information, we will be able to avoid the need for these
      additional requests in many cases.
      
      Change-Id: I82cbf378ace2e663d0958529aeb2f3b123364caa
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      56240fa6
    • Richard Mansfield's avatar
      Fix sql error in bulk user deletion (bug #916998) · 9bc9d15c
      Richard Mansfield authored
      
      
      When a user is deleted, deletion of notification_internal_activity
      records can fail with a foreign key error when another row in
      notification_internal_activity has a parent field pointing to one of
      the records we are trying to delete.  This is fixed by setting the
      parent fields to null before deletion.
      
      The handle_event('deleteuser') call in delete_user is also moved
      inside the transaction, to ensure that deleted users will have their
      notifications deleted correctly.  Other subscribers to the deleteuser
      event in core should be unaffected.
      
      Change-Id: Ibc0a695e986bb175a00441f02d3e40abf38cbcde
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      9bc9d15c
  11. 15 Jan, 2012 3 commits
    • Richard Mansfield's avatar
      Use file_mime_type when creating audio/video artefacts · efeb94fb
      Richard Mansfield authored
      
      
      Audio and video artefacts are created according to the mimetype
      claimed by the browser: no checking is currently performed on the
      file's content.  This doesn't really matter because these artefact
      types are only used to display special audio/video icons in the files
      area, but we may want to use them for other purposes later.  Until we
      can ensure these files are valid, and that Mahara can play them, we
      should at least use the slightly more accurate detection provided by
      file_mime_type.
      
      This patch also renames the new_<artefacttype> artefact type detection
      functions so that they are consistent for audio, video, and archive
      artefacts.  It also removes the unnecessary archive_from_file()
      function in the archive class, combining it into the detection
      function.
      
      Change-Id: I6ec5ae0c18a3fae4c6cdb609097173432ca0c57f
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      efeb94fb
    • Richard Mansfield's avatar
      Ensure filetype is set when creating new file artefacts (bug #914574) · c7e99a9f
      Richard Mansfield authored
      
      
      When a new file artefact is created from a file that wasn't uploaded
      by a browser, the filetype property is not always set.  This causes
      warnings when extracting files from archives.  Moving the call to
      file_mime_type right before construction of the new artefact type
      fixes the problem and allows us to remove some other calls to
      file_mime_type during import and upload.
      
      Change-Id: I8e644bfc1e6bc0fbaa90f1e6637288997b0d028c
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      c7e99a9f
    • Christopher Tombleson's avatar
      Fixed New Entry button display. · d1e4d2f5
      Christopher Tombleson authored
      
      
      Added class to bloglist.tpl and css to style.css
      to prevent the new entry button from being squashed and not displaying on one line.
      
      Bug#874002
      
      Change-Id: Id1e7029d2593cb247a425a2cde363ae580d9b240
      Signed-off-by: default avatarChristopher Tombleson <christopher@catalyst.net.nz>
      d1e4d2f5
  12. 12 Jan, 2012 4 commits
  13. 11 Jan, 2012 7 commits