Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update email notification subject line and contents for Group Messages (#8689) | Ugurcan Turkdogan | 2018-05-15 | 3 | -56/+171 |
| | | | | | | | | | | | Reordered notification strings MM-10335 Changed uppercase CHANNEL to Lowercase Channel, added @ sign before username on notifications Added @ sign in front of username in all email notifications. Capitalized Direct Message and Group Message in email notifications. Fixed the issue with long group message names. Removed executable bit | ||||
* | MM-10249 Adding plugin ability to intercept posts before they reach the DB. ↵ | Christopher Speller | 2018-05-15 | 13 | -299/+1100 |
| | | | | | | | | (#8791) * Adding plugin ability to intercept posts before they reach the DB. * s/envoked/invoked/ | ||||
* | Merge branch 'merge410rc5' | Derrick Anderson | 2018-05-15 | 28 | -1648/+1190 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/release-4.10' into merge410rc5 | Derrick Anderson | 2018-05-15 | 28 | -1648/+1190 |
|/| | |||||
| * | translations PR 20180511 (#8774) | Elias Nahum | 2018-05-14 | 14 | -380/+380 |
| | | | | | | | | | | | | * translations PR 20180511 * Fix bad translations | ||||
| * | Updating NOTICE.txt (#8732) | amyblais | 2018-05-14 | 1 | -1234/+464 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt | ||||
| * | drop 401s from info to debug (#8778) | Jesse Hallam | 2018-05-14 | 1 | -4/+8 |
| | | |||||
| * | [MM-9720] fix bugs when trying to change for a in use email and check the ↵ | Carlos Tadeu Panato Junior | 2018-05-11 | 2 | -1/+17 |
| | | | | | | | | number of parameters (#8772) | ||||
| * | add notification when @user, @here, @all and @channel has colon ":" at the ↵ | Saturnino Abril | 2018-05-11 | 2 | -6/+59 |
| | | | | | | | | end (#8760) | ||||
| * | fix mlog-ing before initialized (#8753) | Jesse Hallam | 2018-05-11 | 4 | -16/+210 |
| | | | | | | | | | | | | | | Dump mlog to STDOUT before initialized, to allow for logging failures that occur due to config parsing, etc. Fix file logging to honour logger.FileJson instead of copying the logger.ConsoleJson setting. | ||||
| * | More potential panic fixes (#8776) | Joram Wilander | 2018-05-11 | 1 | -6/+9 |
| | | |||||
| * | [MM-10458] Change system response to "Could not find the channel" - bug fix ↵ | Carlos Tadeu Panato Junior | 2018-05-11 | 4 | -1/+43 |
| | | | | | | | | | | | | | | | | (#8738) * [MM-10458] Change system response to "Could not find the channel" when trying to invite user to private channel you can't see * add another check to check if user have permission to add another in pvt channel | ||||
* | | MM-10201: querystring for get slash commands (#8779) | Jesse Hallam | 2018-05-14 | 2 | -60/+135 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pass GET slash command payloads through query string Previously, both GET and POST requests received the payload via the body, but this was incorrect for GET requests. Now, the payloads for GET requests is sent via the query string. * reorder tests for clarity * switch command tests to use httptest servers * restore original test command endpoints | ||||
* | | Move SAML endpoints out of api package (#8780) | Joram Wilander | 2018-05-14 | 5 | -136/+159 |
| | | |||||
* | | Refactor context out of API packages (#8755) | Joram Wilander | 2018-05-14 | 16 | -607/+704 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Refactor context out of API packages * Update function names per feedback * Move webhook handlers to web and fix web tests * Move more webhook tests out of api package * Fix static handler | ||||
* | | MM-9739: deprecate the now unused Channels.ExtraUpdateAt (#8762) | Jesse Hallam | 2018-05-14 | 4 | -81/+3 |
| | | |||||
* | | Merge branch 'merge410rc2' | Derrick Anderson | 2018-05-11 | 4 | -24/+300 |
|\ \ | |||||
| * | | add s3 test back in for master | Derrick Anderson | 2018-05-11 | 1 | -2/+2 |
| | | | |||||
| * | | Merge release-4.10 with master | Derrick Anderson | 2018-05-11 | 5 | -26/+302 |
|/| | | |/ | |||||
| * | Comment out problematic TestS3TestConnection test (#8770) | Joram Wilander | 2018-05-10 | 1 | -2/+2 |
| | | |||||
| * | Attempt to fix hub nil panic (#8766) | Joram Wilander | 2018-05-10 | 1 | -1/+1 |
| | | |||||
| * | Prevent divide by zero if there are no hubs (#8763) | Joram Wilander | 2018-05-10 | 1 | -2/+12 |
| | | |||||
| * | fix test and add new (#8758) | Carlos Tadeu Panato Junior | 2018-05-10 | 1 | -1/+6 |
| | | |||||
| * | MM-10495 Updated user agent detection to match output of previous library ↵ | Harrison Healey | 2018-05-09 | 3 | -21/+287 |
| | | | | | | | | | | | | | | | | (#8748) * MM-10495 Updated user agent detection to match output of previous library * Fixed missing license header | ||||
* | | MM-10188: expect io.Reader in FileBackend.WriteFile (#8765) | Jesse Hallam | 2018-05-10 | 10 | -51/+95 |
| | | | | | | | | This is a reworked set of changes originally from @josephGuo to begin reducing the duplicated memory required when uploading files. | ||||
* | | Add Ping Timeout Signal for WebSocket Client (#8666) | Daniel Schalla | 2018-05-10 | 1 | -10/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Import Order gofmt gofmt gofmt Renamed Const to make Unit more obvious Renamed Const to make Unit more obvious #2 | ||||
* | | MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ↵ | Christopher Speller | 2018-05-10 | 45 | -152/+149 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | without losing their account (#8756) * Adding LoginIdAttribute * Modifying LDAP to use loginIDAttribute. * Adding IDAttribute migration and AD objectGUID support. * Removing unused idea. * Fix typo. | ||||
* | | fix test and add new (#8759) | Carlos Tadeu Panato Junior | 2018-05-10 | 1 | -0/+12 |
| | | |||||
* | | Removing bad test. | Christopher Speller | 2018-05-09 | 1 | -7/+0 |
| | | |||||
* | | Fixes incorrect MiB size. (#8750) | Martin Kraft | 2018-05-09 | 1 | -1/+1 |
| | | |||||
* | | prep code for 5.0 (#8743) | Derrick Anderson | 2018-05-08 | 1 | -0/+9 |
| | | |||||
* | | Fix empty GOPATH behaviour in Makefile (#8724) | Jonathan Villemaire-Krajden | 2018-05-07 | 1 | -5/+5 |
|/ | |||||
* | Add IncrementClusterEventType function to metrics interface (#8728) | Joram Wilander | 2018-05-04 | 1 | -0/+1 |
| | |||||
* | Uncomment upgrade for 4.10 (#8727) | Derrick Anderson | 2018-05-04 | 2 | -8/+8 |
| | | | | | | | | * uncomment upgrade code * ping jenkins * add 4.10.0 to version.go | ||||
* | Added missing i18n strings for files and email batching (#8700) | Harrison Healey | 2018-05-04 | 2 | -17/+44 |
| | | | | | | * Added missing i18n strings for files and email batching * Added more fields to log messages | ||||
* | MM-10319: Use normalized email for Saml (migration) (#8711) | Jesús Espino | 2018-05-04 | 1 | -0/+1 |
| | |||||
* | update permission of converting a channel from public to private to allow ↵ | Saturnino Abril | 2018-05-05 | 2 | -9/+11 |
| | | | | team admin (#8723) | ||||
* | Removes .vscode dir. (#8721) | Martin Kraft | 2018-05-04 | 1 | -18/+0 |
| | |||||
* | respect image orientation before saving height and width of FileInfo (#8710) | Saturnino Abril | 2018-05-04 | 1 | -0/+8 |
| | |||||
* | MM-10393: Fix for tracking active vs inactive users. (#8706) | Martin Kraft | 2018-05-03 | 1 | -12/+12 |
| | |||||
* | MM-10189 Fixed inconsistency when using environment variables for ↵ | Harrison Healey | 2018-05-03 | 2 | -2/+35 |
| | | | | MessageExportSettings (#8705) | ||||
* | Fix TestSendNotifications test (#8712) | Jesús Espino | 2018-05-03 | 2 | -1/+10 |
| | |||||
* | MM-10424: Migrate PostEditTimeLimit config setting. (#8702) | George Goldberg | 2018-05-02 | 2 | -0/+36 |
| | |||||
* | Add inactive user count to analytics and fix client analytics function (#8695) | Joram Wilander | 2018-05-02 | 3 | -7/+30 |
| | |||||
* | [MM-10415] Reorder checks for command invite (#8701) | Carlos Tadeu Panato Junior | 2018-05-02 | 1 | -9/+7 |
| | |||||
* | Update zoom plugin to 0.1.6 (#8698) | Joram Wilander | 2018-05-01 | 3 | -6/+6 |
| | |||||
* | MM-8622: improved plugin error handling (#8692) | Jesse Hallam | 2018-05-01 | 15 | -57/+256 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * don't report an error on plugin activation if already active * improved plugin logging events Log an error when a plugin's ServeHTTP fails, or when it unexpectedly terminates. Restart a plugin at most three times, allowing its failure to later bubble up under the "failed to stay running" status. * clarified plugin activation/deactivation Avoid repeatedly activating when any configuration bit changes. Improved logging. * constrain plugin ids to ^[a-zA-Z0-9-_\.]+$ and enforce minimum length Previously, the plugin id was used unsanitized to relocate the plugin bundle, which allowed writing outside the `plugins/` directory by using an `id` containing `../`. Similarly, an empty string was accepted as an id and led to unexpected error messages. * remove plugins by manifest path, not id If the id within the manifest ever diverges from the actual plugin location, it becomes impossible to remove via the API. Instead, if the plugin is found by id, remove the path containing the manifest. * ignore plugins with nil manifests If a plugin was detected, but had a manifest that couldn't be parsed, it will be left nil but still be listed among the packages. Skip over these in most cases to avoid segfaults. * leverage mlog more effectively for plugins * build issues | ||||
* | translations PR 20180430 (#8696) | Elias Nahum | 2018-05-01 | 14 | -128/+180 |
| | |||||
* | Upgrading minio-go library to 6.0.0 (#8651) | Jesús Espino | 2018-04-30 | 54 | -2189/+4117 |
| | | | | | | * Upgrading minio-go library to 6.0.0 * Removing unnecesary Gopkg constraint | ||||
* | Revert "MM-9770: rewrite getParentsPosts to improve performance (#8467)" ↵ | Derrick Anderson | 2018-04-30 | 2 | -215/+118 |
| | | | | | (#8659) (#8694) This reverts commit 4b675b347b5241def7807fab5e01ce9b98531815. |