summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
* | MM-10020: avoid duplicating unique indexes (#8587)Jesse Hallam2018-04-1632-33/+220461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * unit test TestGet(Search)Replica This adds partial, testing-focused support for SQLite, as well as removing some translated log messages that required initializing i18n just for testing. * avoid returning master twice when no replicas are configured * remove duplicate indexes * unit test GetAllConns
* | Fix opengraph images not going through the image proxy. (#8627)Christopher Speller2018-04-161-0/+30
| |
* | Depenancy upgrades and movign to dep. (#8630)Christopher Speller2018-04-165354-1634873/+17171
| |
* | [MM-9904] Add /invite slash command to invite users to a channel (#8482)Carlos Tadeu Panato Junior2018-04-164-0/+272
| | | | | | | | | | | | * [MM-9904] Add /invite slash command to invite users to a channel * Update en.json
* | Merge remote-tracking branch 'origin/merge49rc5'Derrick Anderson2018-04-1313-321/+217
|\ \
| * | Merge remote-tracking branch 'origin/release-4.9' into merge49rc5Derrick Anderson2018-04-1313-321/+217
|/| | | |/
| * translations PR 20180411 (#8606)Elias Nahum2018-04-1213-321/+217
| |
* | Fixed the example text on CLI channel command (#8613)Jesús Espino2018-04-131-2/+2
| |
* | Fix error handling when requesting profile image for bad user ID (#8618)Joram Wilander2018-04-133-1/+9
| |
* | MM-9977: test config.SetDefaults leaves nothing nil (#8610)Jesse Hallam2018-04-134-1/+289
| | | | | | | | | | | | | | | | | | | | * MM-9977: test config.SetDefaults leaves nothing nil * clarify test default config test cases * comment re: allowing nil slice * extend config SetDefaults to handle partially initialized configs
* | Websocket custom dialer support (#8592)Guy B2018-04-121-3/+19
| | | | | | | | | | | | | | | | * added support for custom websocket dialers (to be able to skip system proxy for example) * removed newline * typoe, arguments order
* | Add Auto Responder handler (#8386)Stan Chan2018-04-1211-4/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WIP Out Of Office Return error for status command if user status is OOO Ignore notifications if Out Of Office Disable AutoResponder if status is set to online Add test for AutoResponder DisableAutoResponse when manually setting status Remove check on status slash command return early if user does not exists in SendAutoResponse method Add proper error handling Add a newline after error handling Revert back to err == nil in api4/status.go Remove a.Go when using a.Publish Add name consistency with the feature auto responder Last changes for name consistency, also fix failing test with auto_responder Fix names of functions in auto responder test Add ExperimentalEnableAutomaticReplies flag Auto Responder reply to a post
* | Add list command to teams command in CLI (#8612)Jesús Espino2018-04-122-0/+45
| | | | | | | | | | | | * Add list command to teams command in CLI * Using App instead of Store to get the teams
* | MM-8180 Improve error message for testing smtp connections (#8608)Joram Wilander2018-04-122-3/+7
| | | | | | | | | | | | * Improve error message for testing smtp connections * Update error message
* | Fix mute channel when not a member and adding unit tests (#8609)Elias Nahum2018-04-124-2/+223
| |
* | MM-10036 Ensured correct handling of capitalized special mentions (#8607)Harrison Healey2018-04-112-3/+27
| |
* | Merge branch 'jespino-merge-release-4.9'Derrick Anderson2018-04-107-21/+27
|\ \
| * | Merge remote-tracking branch 'origin/release-4.9' into merge-release-4.9Jesús Espino2018-04-107-21/+27
|/| | | |/
| * MM-8834: Changes separator between jobs message and details. (#8589)Martin Kraft2018-04-091-1/+1
| |
| * Adding minio-go for to the dependencies to temporary fix 2 minio-go bugs (#8577)Jesús Espino2018-04-064-12/+16
| |
| * fix out of channel mentions for mentioned word with valid punctuations (#8585)Saturnino Abril2018-04-062-8/+10
| |
| * update db code for release branch only (#8584)Derrick Anderson2018-04-052-11/+11
| |
* | MM-9849 Added tracking of which settings are set through environment ↵Harrison Healey2018-04-0915-55/+266
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables (#8586) * MM-9849 Added tracking of which settings are set through environment variables * Removed old version of viper * Added forked version of viper * Fixed unit tests * Fixed more unit tests * Removed copy from App.GetEnvironmentConfig
* | Added additional unit tests for IE11 and compatibility mode (#8573)Harrison Healey2018-04-091-1/+4
| |
* | MM-8678: add CUD support for channel members via plugins (#8565)Jesse Hallam2018-04-067-5/+250
| | | | | | | | | | | | | | | | | | | | | | | | * add CUD support for channel members via plugins This effectively exposes AddChannelMember, UpdateChannelMemberRoles, UpdateChannelMemberNotifyProps and LeaveChannel via the plugin API. It also modifies the semantics of AddChannelMember to explicitly allow for an empty user requestor, left as such for now via the plugin API. * change the signature of AddChannelMember to accept a channel id instead of a channel
* | MM-8400 Provide default config values to viper so that it reads all ↵Harrison Healey2018-04-062-41/+150
| | | | | | | | | | | | | | | | environment variables (#8581) * MM-8400 Provide default config values to viper so that it reads all environment variables * Added unit tests
* | uncomment 4.9 upgrade code (#8582)Derrick Anderson2018-04-052-10/+20
|/ | | | | | | | * set db to 4.9 * add prepatory code for 4.10 * bug from old example
* Remove problematic mute test (#8580)Joram Wilander2018-04-051-114/+0
|