summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MM-10495 Updated user agent detection to match output of previous library ↵Harrison Healey2018-05-093-21/+287
| | | | | | | | (#8748) * MM-10495 Updated user agent detection to match output of previous library * Fixed missing license header
* Add IncrementClusterEventType function to metrics interface (#8728)Joram Wilander2018-05-041-0/+1
|
* Uncomment upgrade for 4.10 (#8727)Derrick Anderson2018-05-042-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 Healey2018-05-042-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 Espino2018-05-041-0/+1
|
* update permission of converting a channel from public to private to allow ↵Saturnino Abril2018-05-052-9/+11
| | | | team admin (#8723)
* Removes .vscode dir. (#8721)Martin Kraft2018-05-041-18/+0
|
* 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
|
* MM-10189 Fixed inconsistency when using environment variables for ↵Harrison Healey2018-05-032-2/+35
| | | | MessageExportSettings (#8705)
* Fix TestSendNotifications test (#8712)Jesús Espino2018-05-032-1/+10
|
* 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-023-7/+30
|
* [MM-10415] Reorder checks for command invite (#8701)Carlos Tadeu Panato Junior2018-05-021-9/+7
|
* Update zoom plugin to 0.1.6 (#8698)Joram Wilander2018-05-013-6/+6
|
* MM-8622: improved plugin error handling (#8692)Jesse Hallam2018-05-0115-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 Nahum2018-05-0114-128/+180
|
* Upgrading minio-go library to 6.0.0 (#8651)Jesús Espino2018-04-3054-2189/+4117
| | | | | | * Upgrading minio-go library to 6.0.0 * Removing unnecesary Gopkg constraint
* Revert "MM-9770: rewrite getParentsPosts to improve performance (#8467)" ↵Derrick Anderson2018-04-302-215/+118
| | | | | (#8659) (#8694) This reverts commit 4b675b347b5241def7807fab5e01ce9b98531815.
* MM-9072/MM-10185 Force-convert the encoding of OpenGraph metadata to UTF-8 ↵Hyeseong Kim2018-04-3038-2/+157135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#8631) * Force-convert non-UTF8 HTML to UTF8 before opengraph processing * Split the force-encoding function * Add benchmark Test for the forceHTMLEncodingToUTF8() ``` Running tool: /home/comet/go-v1.9.2/bin/go test -benchmem -run=^$ github.com/mattermost/mattermost-server/app -bench ^BenchmarkForceHTMLEncodingToUTF8$ [03:32:58 KST 2018/04/21] [INFO] (github.com/mattermost/mattermost-server/app.TestMain:28) -test.run used, not creating temporary containers goos: linux goarch: amd64 pkg: github.com/mattermost/mattermost-server/app BenchmarkForceHTMLEncodingToUTF8/with_converting-4 100000 11201 ns/op 18704 B/op 32 allocs/op BenchmarkForceHTMLEncodingToUTF8/without_converting-4 300000 3931 ns/op 4632 B/op 13 allocs/op PASS ok github.com/mattermost/mattermost-server/app 2.703s Success: Benchmarks passed. ``` * Remove an unnecessary constraint * Add pre-check if content-type header is already utf-8 * Move the checking for utf-8 into forceHTMLEncodingToUTF8() for testing * Revert df3f347213faa0d023c26d201fa6531f46391086..HEAD, without Gopkg.lock
* Add stdlog interpreter. (#8691)Christopher Speller2018-04-303-1/+117
|
* Add missing diagnostics for 4.10 (#8675)Jason Blais2018-04-301-0/+1
| | | | | | * Add missing diagnostics for 4.10 * Add missing ":"
* translations PR 20180424 (#8662)Elias Nahum2018-04-3014-529/+1205
|
* [MM-10354] Add feature to remove team icon (#8684)Saturnino Abril2018-04-306-55/+148
| | | | | | | | * set team.LastTeamIconUpdate to 0 when removing team icon * add APIv4 for removing team icon * removed comment and updated typo on AppError
* Fixing some merge conflicts with structured logging. (#8685)Christopher Speller2018-04-272-10/+2
|
* Structured logging (#8673)Christopher Speller2018-04-27205-2487/+9479
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implementing structured logging * Changes to en.json to allow refactor to run. * Fixing global logger * Structured logger initalization. * Add caller. * Do some log redirection. * Auto refactor * Cleaning up l4g reference and removing dependancy. * Removing junk. * Copyright headers. * Fixing tests * Revert "Changes to en.json to allow refactor to run." This reverts commit fd8249e99bcad0231e6ea65cd77c32aae9a54026. * Fixing some auto refactor strangeness and typo. * Making keys more human readable.
* MM-10375 Fixing connected socket count (#8682)Corey Hulen2018-04-272-0/+23
| | | | | | * Fixing connected socket count * Adding unit test
* modestly extend SQLite support (#8677)Jesse Hallam2018-04-271-0/+31
| | | | | This is primarily to unblock the advanced permissions merge. There's still more work to do if we wanted this to be mainstream, but as it's mainly for unit tests, I'm just focussing on the minimum.
* MM-10232, MM-10259: Improve error handling from invalid json (#8668)Jesse Hallam2018-04-2612-109/+487
| | | | | | | | | | | | | | * MM-10232: improve error handling from malformed slash command responses Switch to json.Unmarshal, which doesn't obscure JSON parse failures like json.Decode. The latter is primarily designed for streams of JSON, not necessarily unmarshalling just a single object. * rework HumanizedJsonError to expose Line and Character discretely * MM-10259: pinpoint line and character where json config error occurs * tweak HumanizeJsonError to accept err first
* Update ISSUE_TEMPLATE.md (#8292)james-mm2018-04-251-2/+6
| | | | | | | | | | * Update ISSUE_TEMPLATE.md Customer wanted us to be more explicit on this page about searching for existing tickets in JIRA vs Github before proceeding to submit a new ticket. * Update ISSUE_TEMPLATE.md * Shorten proposed text
* add api to convert a channel from public to private and restrict that to ↵Saturnino Abril2018-04-235-47/+99
| | | | system_admin (#8655)
* Properly implement session deep copy (#8602)Joram Wilander2018-04-202-2/+45
|
* MM-10007 Send an admin and regular WS events when a user is updated (#8588)Joram Wilander2018-04-209-5/+197
| | | | | | | | * Add user.DeepCopy() function * Add omit admins/non-admins to WS broadcast and use for updating users * Updates per feedback and adding unit test for ShouldSendEvent
* MM-10133 Suppress confusing personal access token message in invalid session ↵Joram Wilander2018-04-201-1/+7
| | | | | | | | error (#8645) * Suppress confusing personal access token message in invalid session error * Updates per feedback
* Fix panics caused by race in notification code (#8652)Joram Wilander2018-04-192-0/+14
|
* MM-10122: Adds a mention for added-to-channel messages even when 'username ↵Martin Kraft2018-04-193-8/+20
| | | | mentions' are disabled. (#8648)
* Removing user cache clear from SessionHasPermissionsTo (#8624)Christopher Speller2018-04-180-0/+0
|
* MM-9779: Incorporate a Token into the invitations system (#8604)Jesús Espino2018-04-1815-172/+351
| | | | | | | | | | | | | | | | | | | | * Incorporate a Token into the invitations system * Adding unit tests * Fixing some api4 client tests * Removing unnecesary hash validation * Change the Hash concept on invitations with tokenId * Not send invitation if it wasn't able to create the Token * Fixing some naming problems * Changing the hash query params received from the client side * Removed unneded data param in the token usage
* MM-10121: CLI command to reset permissions system to default state. (#8637)George Goldberg2018-04-1817-15/+320
| | | | | | * MM-10121: CLI command to reset permissions system to default state. * Review comment.
* Ignore rolled log files (#8644)Joram Wilander2018-04-181-1/+1
|
* Handle app errors in user autocomplete endpoint (#8643)Joram Wilander2018-04-171-3/+17
|
* add app shutdown to make sure the goroutines finish and all process are ↵Carlos Tadeu Panato Junior2018-04-1712-4/+47
| | | | | | | | closed (#8629) * run the send email verification as goroutine as well * add app shutdown to make sure all go routines finish
* MM-9918: Trim trailing / from push proxy URL. (#8635)George Goldberg2018-04-171-1/+1
|
* Merge branch 'merge49final'Derrick Anderson2018-04-173-12/+15
|\
| * Add MM9720 changes back in for master mergeDerrick Anderson2018-04-172-0/+68
| |
| * Merge remote-tracking branch 'origin/release-4.9' into merge49finalDerrick Anderson2018-04-175-80/+15
|/|
| * revert changes from MM9720Derrick Anderson2018-04-132-68/+0
| |
| * Prevent disabling or modifying l4g logging filters (#8628)Jesse Hallam2018-04-132-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The underlying l4g library is not resilient to filter modifications in the presence of concurrent goroutines. In particular, it's not safe to call Close() on filters which might be actively held by a goroutine for logging. This change disables all modifications to existing filters once initialized by the App layer. In practice, we might be able to get away with some modifications to the existing filters (i.e. changing levels), but the [golang memory model](https://golang.org/ref/mem) makes no guarantees that it is safe to do so: > Programs that modify data being simultaneously accessed by multiple goroutines must serialize such access. We can solve this holistically by introducing the requisite locking within our fork of the l4g library. For now, we just disable all modifications.
| * Removing user cache clear from SessionHasPermissionsTo (#8625)Christopher Speller2018-04-131-6/+1
| |
* | Initial Commit of Ephemeral Message Support for System Admins (#8611)Daniel Schalla2018-04-177-0/+106
| | | | | | | | | | | | | | | | | | Fixed Permission Test Fixed and extended ephemeral message tests; Removed Online/Activity Updates Set Create Time to current time gofmt