summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-246-42/+306
|\
| * MM-8622: Improved plugin error reporting (#8737)Jesse Hallam2018-05-235-38/+305
| * remove license check when enforcing password requirements (#8840)Saturnino Abril2018-05-231-4/+1
* | Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-222-0/+5
|\|
| * add EnablePreviewModeBanner in config (#8834)Saturnino Abril2018-05-221-0/+1
| * MM-10352: Add locking incoming webhooks to a single channel. (#8835)George Goldberg2018-05-221-0/+4
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-226-11/+13
|\|
| * Skip cluster send when getting non-cached statuses (#8824)Joram Wilander2018-05-181-2/+2
| * Fixing TE login. (#8826)Christopher Speller2018-05-181-3/+5
| * MM-10640 Set EnableUserCreation to true by default (#8815)Balasankar C2018-05-184-6/+6
* | Refactors migrations check. (#8814)Martin Kraft2018-05-212-0/+19
* | MM-10264: Adds CLI command to import and export permissions. (#8787)Martin Kraft2018-05-174-1/+445
* | MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-171-0/+15
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-179-58/+99
|\|
| * MM-8708 Remove api package (#8784)Joram Wilander2018-05-169-58/+99
* | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812)George Goldberg2018-05-171-1/+30
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-168-63/+280
|\|
| * Update email notification subject line and contents for Group Messages (#8689)Ugurcan Turkdogan2018-05-152-50/+141
| * MM-10249 Adding plugin ability to intercept posts before they reach the DB. (...Christopher Speller2018-05-152-0/+32
| * Merge remote-tracking branch 'origin/release-4.10' into merge410rc5Derrick Anderson2018-05-156-13/+107
| |\
| | * add notification when @user, @here, @all and @channel has colon ":" at the en...Saturnino Abril2018-05-112-6/+59
| | * More potential panic fixes (#8776)Joram Wilander2018-05-111-6/+9
| | * [MM-10458] Change system response to "Could not find the channel" - bug fix (...Carlos Tadeu Panato Junior2018-05-113-1/+39
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-155-27/+305
|\| |
| * | MM-10201: querystring for get slash commands (#8779)Jesse Hallam2018-05-141-3/+5
| * | Merge release-4.10 with masterDerrick Anderson2018-05-114-24/+300
| |\|
| | * Attempt to fix hub nil panic (#8766)Joram Wilander2018-05-101-1/+1
| | * Prevent divide by zero if there are no hubs (#8763)Joram Wilander2018-05-101-2/+12
| | * MM-10495 Updated user agent detection to match output of previous library (#8...Harrison Healey2018-05-093-21/+287
* | | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-142-2/+16
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-116-71/+63
|\| |
| * | MM-10188: expect io.Reader in FileBackend.WriteFile (#8765)Jesse Hallam2018-05-104-12/+14
| * | MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ...Christopher Speller2018-05-103-59/+49
* | | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-05-101-1/+1
|\| |
| * | Fixes incorrect MiB size. (#8750)Martin Kraft2018-05-091-1/+1
| |/
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-098-41/+124
|\|
| * Added missing i18n strings for files and email batching (#8700)Harrison Healey2018-05-042-17/+44
| * respect image orientation before saving height and width of FileInfo (#8710)Saturnino Abril2018-05-041-0/+8
| * MM-10393: Fix for tracking active vs inactive users. (#8706)Martin Kraft2018-05-031-12/+12
| * Fix TestSendNotifications test (#8712)Jesús Espino2018-05-031-1/+1
| * MM-10424: Migrate PostEditTimeLimit config setting. (#8702)George Goldberg2018-05-022-0/+36
| * Add inactive user count to analytics and fix client analytics function (#8695)Joram Wilander2018-05-021-2/+16
| * [MM-10415] Reorder checks for command invite (#8701)Carlos Tadeu Panato Junior2018-05-021-9/+7
* | MM-10140: API Implementation for Schemes related Endpoints (#8615)George Goldberg2018-05-031-0/+101
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-024-43/+42
|\|
| * Update zoom plugin to 0.1.6 (#8698)Joram Wilander2018-05-013-6/+6
| * MM-8622: improved plugin error handling (#8692)Jesse Hallam2018-05-011-37/+36
* | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)Martin Kraft2018-05-024-0/+71
* | Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermo...Martin Kraft2018-05-011-2/+2
|\ \
| * \ Merge branch 'master' into advanced-permissions-phase-2Christopher Speller2018-04-2746-389/+422
| |\ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-05-23 13:24:07 +0000