1. 07 May, 2020 2 commits
  2. 02 May, 2020 1 commit
  3. 23 Apr, 2020 1 commit
  4. 22 Apr, 2020 1 commit
  5. 18 Apr, 2020 1 commit
  6. 15 Apr, 2020 1 commit
  7. 14 Apr, 2020 1 commit
  8. 13 Apr, 2020 1 commit
  9. 07 Apr, 2020 2 commits
  10. 03 Apr, 2020 1 commit
  11. 02 Apr, 2020 2 commits
  12. 01 Apr, 2020 3 commits
  13. 30 Mar, 2020 1 commit
  14. 26 Mar, 2020 2 commits
  15. 25 Mar, 2020 2 commits
  16. 23 Mar, 2020 3 commits
    • Jesse Hallam's avatar
      MM-21343: Recognize multi-line slash commands without requiring trailing space... · a427611b
      Jesse Hallam authored
      MM-21343: Recognize multi-line slash commands without requiring trailing space after trigger word (#13646) (#14129)
      
      Automatic Merge
      a427611b
    • Martin Kraft's avatar
      MM-22212 & MM-22208: Read from the higher-scoped scheme if the permission is... · a07aedfb
      Martin Kraft authored
      MM-22212 & MM-22208: Read from the higher-scoped scheme if the permission is non-moderated. (#13813)
      
      * MM-22212: Read non-moderated permissions from higher-scoped scheme.
      
      * MM-2212: Corrects test count in comment.
      
      * MM-22212: Adds godoc comment.
      
      * MM-2212: Switches to the channel roles check in a few more places.
      
      * MM-22212: Refactors and fixes.
      
      * MM-22212: Reverts change, no longer required.
      
      * MM-22212: Removes translation.
      
      * MM-22212: Un-comments merged new permission.
      
      * MM-22212: Un-comments merged new permission.
      
      * MM-22212: Performance tweak.
      
      * MM-22212: Fixes some fmting.
      
      * MM-22212: Add unit test for newly-added store methods.
      
      * MM-22212: Renames app method.
      
      * MM-22212: Re-uses existing function to find string in slice.
      
      * MM-22212: Keeps 'higher-scoped' terminology for consistency.
      
      * MM-22212: Refactors based on PR feedback.
      
      * MM-22212: Fix for some bad merging.
      
      * MM-22212: Renamed some things.
      
      * MM-22212: Use an 'else' instead of a 'continue' for readability.
      
      * MM-22212: Caches (*SqlRoleStore).ChannelRolesUnderTeamRole.
      
      * MM-22212: Adds mock to new cache store.
      
      * MM-22212: Adds missing open tracing app layer methods.
      
      * MM-22212: Adds migration to add moderated permissions to channel_admin if present on channel_user.
      
      * MM-22212: Migrates team schemes. Removes unused AppError.
      
      * MM-22212: Fix for for if.
      
      * MM-22212: Fixes iterator.
      
      * MM-22212: Updates open tracing generated methods.
      
      * MM-22212: Fix mocks.
      
      * MM-22212: Change migration key name.
      
      * MM-22212: Switched to data structure from other branch.
      
      * MM-22212: Fixes tests after adding 'use_channel_mentions' to the channel_admin role.
      
      * MM-22212: Adds tracking of channel moderation.
      
      * Revert "MM-22212: Adds tracking of channel moderation."
      
      This reverts commit 23689efa22c112e4ba37f6a212535dd7ebfb63db.
      
      * MM-22212: Switch some functions to methods and vice versa.
      
      * MM-22212: Fix for refactor bug not notifiying websocket about changed role.
      
      * MM-22212: Adds test for public/private 'manage_members' handling.
      
      * MM-22122 Fix manage channel members edge case for public and private channels (#14049)
      
      * MM-22212: Adds moderated permission to team_admin.
      
      * MM-22212: Updates migration.
      
      * MM-22212: Revert unnecessary update to default roles.
      
      * Add channel scheme updated event when channel scheme is deleted or created (#14057)
      
      * MM-22212: Adds newline.
      
      * MM-22212: Migration fix.
      
      * MM-22212: Fix for migration.
      
      * MM-22212: Test fix.
      Co-authored-by: default avatarFarhan Munshi <3207297+fm2munsh@users.noreply.github.com>
      a07aedfb
    • Sven Hüster's avatar
      add support for exporting and importing props (#14034) (#14127) · 2c14ff9d
      Sven Hüster authored
      * add support for exporting and importing props
      
      * merge master
      
      * add export test for post props
      
      * add check if postData exists
      
      * add import tests for post props
      
      * fix ci bot issues
      Co-Authored-By: default avatarBot from GolangCI <42910462+golangcibot@users.noreply.github.com>
      
      * fix gofmt errors
      
      * remove test comment and add name instead
      
      * remove uneccessary changes
      Co-authored-by: default avatarBot from GolangCI <42910462+golangcibot@users.noreply.github.com>
      Co-authored-by: default avatarBot from GolangCI <42910462+golangcibot@users.noreply.github.com>
      2c14ff9d
  17. 19 Mar, 2020 2 commits
  18. 18 Mar, 2020 2 commits
  19. 17 Mar, 2020 8 commits
  20. 16 Mar, 2020 3 commits