Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-15 | 29 | -902/+1300 | |
|\| | | ||||||
| * | | 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-9728: Online migration for advanced permissions phase 2 (#8744) | George Goldberg | 2018-05-14 | 28 | -4/+1586 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-9728: Online migration for advanced permissions phase 2 * Add unit tests for new store functions. * Move migration specific code to own file. * Add migration state function test. * Style fixes. * Add i18n strings. * Fix mocks. * Add TestMain to migrations package tests. * Fix typo. * Fix review comments. * Fix up the "Check if migration is done" check to actually work. | |||||
* | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-11 | 55 | -213/+289 | |
|\| | | ||||||
| * | | 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. | |||||
* | | | Merge branch 'master' into advanced-permissions-phase-2 | George Goldberg | 2018-05-10 | 2 | -2/+7 | |
|\| | | ||||||
| * | | 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 | |
| | | | ||||||
* | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-09 | 20 | -98/+214 | |
|\| | | ||||||
| * | | 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 | |
| | | ||||||
* | | MM-10140: API Implementation for Schemes related Endpoints (#8615) | George Goldberg | 2018-05-03 | 22 | -5/+1303 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement basic scheme CRUD endpoints. * Get All Schemes (Paged) Endpoint and store plumbing. * Add get teams/channels for schemes. * Fix unit tests. * Review fixes. * More review fixes. | |||||
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-02 | 87 | -2595/+4677 | |
|\| | ||||||
| * | 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. | |||||
* | | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680) | Martin Kraft | 2018-05-02 | 11 | -0/+370 | |
| | | | | | | | | | | | | | | | | | | | | | | | | * MM-10183: Adds channel scheme API endpoint. MM-10182: Adds team scheme API endpoint. MM-10182_3: Switch from scheme_id in path to body. * MM-10182/MM-10183: Changes path from 'schemes' to 'scheme'. * MM-10182: Fix merge error. | |||||
* | | Merge branch 'advanced-permissions-phase-2' of ↵ | Martin Kraft | 2018-05-01 | 3 | -6/+6 | |
|\ \ | | | | | | | | | | github.com:mattermost/mattermost-server into advanced-permissions-phase-2 | |||||
| * | | Fixing structured logging conflicts. | Christopher Speller | 2018-04-27 | 2 | -4/+4 | |
| | | | ||||||
| * | | Merge branch 'master' into advanced-permissions-phase-2 | Christopher Speller | 2018-04-27 | 206 | -2489/+9496 | |
| |\ \ | ||||||
* | \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-01 | 261 | -3075/+168113 | |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| |