1. 09 Oct, 2011 1 commit
  2. 07 Oct, 2011 2 commits
  3. 06 Oct, 2011 6 commits
  4. 05 Oct, 2011 4 commits
    • Richard Mansfield's avatar
      Merge changes... · 9b48e8c4
      Richard Mansfield authored
      Merge changes I308cf44f,I21f8636e,I5214c5b0,I81b44928,I8725e566,I3ec7d13d,I3ec49f59,Ia1611a6a,I3f8a15de,I7e5e5ff8,Id2ef0453
      
      * changes:
        Allow update of group note permissions (bug #736665)
        Show artefact owner when selecting html artefacts (bug #736665)
        When configuring a read-only textbox, allow copying (bug #736665)
        Display textbox notes as read-only in config form (bug #736665)
        Return sanitised copy of description from artefactchooser (bug #736665)
        Get editable status along with artefactchooser artefacts (bug #736665)
        Stop users from editing note text in the wrong context (bug #736665)
        Allow editing of a textbox block when artefact not found (bug #736665)
        User can_publish_artefact method too restrictive (bug #865911)
        Use artefact method to get user's edit/publish permissions
        Allow use of group_user_access when logged out
      9b48e8c4
    • Richard Mansfield's avatar
    • Richard Mansfield's avatar
    • Richard Mansfield's avatar
      Allow update of group note permissions (bug #736665) · ee14f8f5
      Richard Mansfield authored
      
      
      Previously the only group artefacts were files, and group file permissions
      can be updated within the filebrowser elements.  Now that there are group
      notes, the permissions need to be able to be modified.  Done as a pieform
      element in case other group artefact types are added in future.
      
      Change-Id: I308cf44f95d29a4d13722726c9f007e248ee81fe
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      ee14f8f5
  5. 04 Oct, 2011 16 commits
  6. 03 Oct, 2011 2 commits
  7. 02 Oct, 2011 2 commits
  8. 30 Sep, 2011 4 commits
  9. 29 Sep, 2011 3 commits
    • Piers Harding's avatar
      Simplesaml config change - auth/saml (bug #862875) · 4eac5847
      Piers Harding authored
      
      
      auth/saml: Fixed session store check inline with new
      config structure that ssphp has.
      
      Change-Id: I94dacd84fea8e5b30ae2cf0c99427b4a063a6e5d
      Signed-off-by: default avatarPiers Harding <piers@catalyst.net.nz>
      4eac5847
    • Richard Mansfield's avatar
      Fixes for adding users with friendscontrol set to 'auto' (bug #861985) · 6efd41bc
      Richard Mansfield authored
      
      
      Adding users who automatically accept friends failed when the page
      from which the form was submitted was out of date.  This change fixes
      the case where a user adds a friend who has changed their friendscontrol
      setting since the page was loaded.  If they have turned friendscontrol
      back to 'auth', the submission will fail with an error; if they have in
      the meantime added a friend request to the user who's submitting the
      form, it will succeed, and if a user with an open friend request somehow
      submits the 'addfriend' form, the friend request will be removed.
      
      Change-Id: I3ab5c1cf4dd263126abb7d2a34490d18b69b4439
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      6efd41bc
    • Richard Mansfield's avatar
      Fix acceptance of outdated friendship requests (bug #861985) · c0325823
      Richard Mansfield authored
      
      
      If you submit an accept friendship form from the my friends or find
      friends page, but the request has disappeared in the time since you
      loaded the page, the user receives no feedback.  This patch ensures
      that the form is actually submitted and validated, and provides an
      appropriate message if the request has been denied or accepted.
      
      This patch also ensures that friend acceptance is saved when the
      submitted form appears on the second (or later) page of results.
      
      Change-Id: I0bdc8fb370670a8ddb1c41c7db2f3e37c9d70d11
      Signed-off-by: default avatarRichard Mansfield <richard.mansfield@catalyst.net.nz>
      c0325823