summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Expose user.Props through REST API (#7661)Joram Wilander2017-10-202-2/+7
|
* Update v4 POST log endpoint to match v3 permissions (#7653)Joram Wilander2017-10-202-5/+29
|
* [PLT-7362] Option to add user to channel if mentioned user is not currently ↵Saturnino Abril2017-10-217-8/+185
| | | | | | | | | | | | | | | | in the channel (#7619) * Option to add user to channel if mentioned user is not currently in the channel * instead of link from server, just add component on client side to add channel member * change implementation using post.props * do clean up and add test * sanitize post.props['add_channel_member'] on post creation * move sanitize to app.CreatePost and also apply to app.UpdatePost
* PLT-7740 Update encoding of filename in file headers (#7552)Joram Wilander2017-10-191-2/+4
| | | | | | * Remove URL escaping of filename in file headers * Add encoding for filename
* Remove unrelated v3 reference from websocket debug logs (#7662)Joram Wilander2017-10-201-4/+4
|
* [PLT-6712/PLT-7182] /remove and /kick slash command: Remove a member from ↵Carlos Tadeu Panato Junior2017-10-192-0/+150
| | | | the channel (#7523)
* [PLT-7794] Add user access token enable/disable endpoints (#7630)Nick Frazier2017-10-199-5/+348
| | | | | | | | | | | | * Add column to UserAccessTokens table * PLT-7794 Add user access token enable/disable endpoints * replaced eliminated global variable * updates to user_access_token_store and upgrade.go * style fix and cleanup
* Reduce utils.Cfg references (#7650)Chris2017-10-1891-1276/+1390
| | | | | | | | | | | | * app.UpdateConfig method * test fix * another test fix * the config override option as-was is just error prone, remove it for now * derp
* use webapp build from cache when possible (#7646)Chris2017-10-181-1/+1
|
* fix email race condition (#7656)Chris2017-10-182-3/+9
|
* Fix teams create example (#7655)Ema Panz2017-10-181-1/+1
| | | Fix the "team create" command wrongly shows a `teams create` example, where an extra "s" is appended to the command name.
* fix job test race condition (#7647)Chris2017-10-181-3/+4
|
* fix preference test races (#7645)Chris2017-10-181-0/+8
|
* PLT-7862: Support batched live indexing. (#7640)George Goldberg2017-10-183-1/+25
|
* PLT-7193: Regression - Custom slash commands don't work in direct or group ↵Jonathan2017-10-174-8/+165
| | | | | | | | message channels (#7635) * No longer overriding specified team id for DMs/GMs, as these types of channels don't belong to a team, and doing so breaks slash commands for them * Ensured user is on specified team in case of GM/DM, extended test suite
* Merge branch 'release-4.3'Christopher Brown2017-10-1631-186/+1415
|\
| * Fix SessionIdleTimeoutInMinutes in default.jsonJoramWilander2017-10-161-1/+1
| |
| * workaround for go smtp bug (#7620)Chris2017-10-121-3/+21
| |
| * fix race condition in tests (#7609)Chris2017-10-112-0/+32
| |
| * Fixing LDAP and SAML settings detection (#7605)Christopher Speller2017-10-111-6/+6
| |
| * translations PR 20171009 (#7598)enahum2017-10-1014-131/+235
| |
| * PLT-7811 Standardized team sanitization flow (#7586)Harrison Healey2017-10-0944-3304/+1686
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * post-4.3 commit (#7581) * reduce store boiler plate (#7585) * fix GetPostsByIds error (#7591) * PLT-7811 Standardized team sanitization flow * Fixed TestGetAllTeamListings * Stopped sanitizing teams for team admins * Removed debug logging * Added TearDown to sanitization tests that needed it
| * PLT-7818 Updates to post type (#7579)Joram Wilander2017-10-097-6/+58
| | | | | | | | | | | | * Updates to post type * Update tests
| * PLT-7826: Don't fetch posts from store if ES returns none. (#7596)George Goldberg2017-10-091-6/+8
| |
* | [PLT-7396] Add the ability to revoke user sessions in System Console > Users ↵Rick Batka2017-10-163-0/+75
| | | | | | | | | | | | | | | | #7493 (#7623) * add endpoint and tests for revoking all sessions for a user * fix failing test build
* | Add two missing diagnostics entries (#7634)Jason Blais2017-10-162-1/+3
| | | | | | | | | | | | | | | | * Update diagnostics.go * Fix config setting name SessionIdleTimeoutInMinutes * Update diagnostics.go
* | Fix webconn shutdown race (#7631)Chris2017-10-163-7/+31
| | | | | | | | | | | | | | | | | | | | * fix webconn shutdown race * make sure writePump returns promptly if readPump returns first * fix app shutdown race * minor improvement
* | PLT-7809: Add support for Kopano Webmeetings WebRTC server (#7590)Simon Eisenmann2017-10-164-9/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for Kopano Webmeetings WebRTC server Add an option to select which WebRTC server to use and add support to use Kopano Webmeetings as backend instead of Janus. If the new configuration is not set, WebRTC assumes Janus is used as backend. * Fixup: remove redundant case. default to janus * Fixup: use GatewayAdminUrl as direct prefix to admin URL entry point * Fixup: consumeAndClose
* | parallel tests (#7629)Chris2017-10-1615-61/+302
| |
* | Ignored gogland project files (#7625)Jonathan2017-10-131-0/+3
| |
* | Use tmpfs containers for api/api4 tests, move and speed up CLI tests (#7606)Chris2017-10-1210-434/+508
| | | | | | | | | | | | | | | | | | | | | | | | * use tmpfs containers for api/api4, move and speed up cli tests * minor optimizations * add missing files, fix pre-existing race condition * add . to TestMain check * add requested log message
* | Minor link fixes (#7614)Conor O'Callaghan2017-10-121-3/+3
| | | | | | | | | | | | | | | | | | | | * Minor link fixes Fixed several links to move to new URL (instead of redirecting via another page), modified link for help wanted issues. * Changes to reflect comments on PR Updated URL as per comments on PR
* | Add User To Channel api route returns a 400 error when trying to add users ↵Santos Solorzano2017-10-121-0/+5
| | | | | | | | to a DM or GM channel (#7587)
* | PLT-7883: Fix database race in bulk importer in GetByUsername. (#7611)George Goldberg2017-10-121-19/+20
| |
* | Make test execution not take quadratic compilation time (#7610)Chris2017-10-122-27/+18
| | | | | | | | | | | | | | | | | | | | | | | | * make test execution not take quadratic compilation time * add -p flag. we can only test one package at a time (for now) * cd to mattermost-server for enterprise * whoops * let's go ahead and make the coverage profiles ready for concurrent test
* | Add back consumeAndClose functionality. (#7608)Christopher Speller2017-10-127-10/+17
| | | | | | | | | | | | | | * consume bodies for action button integrations, webrtc gateway, oauth endpoint * Fixing a couple more places, switching to io.Copy to ioutil.Discard, adding a comment to help prevent future performance regressions
* | [PLT-7764] Fix in:channel search when channel name/displayname includes `-` ↵Saturnino Abril2017-10-113-47/+159
| | | | | | | | | | | | | | | | | | | | (#7603) * fix in:channel search when channel name/displayname includes `-` * fix failing test in PostgreSQL * add lowercase indexes of channel's name and displayname to postgresql, and add unit tests
* | remove go 1.8 ipc workaround (#7604)Chris2017-10-103-224/+1
| |
* | Remove duplicate post edit WS event and cache invalidation (#7576)Joram Wilander2017-10-091-3/+0
| |
* | Miscellaneous app cleanup (#7594)Chris2017-10-0922-169/+168
| | | | | | | | | | | | | | | | | | | | | | | | * app cleanup * whoops, forgot a file * some minor cleanup * longer container deadline * defensive checks
* | store/sqlstore cleanup and postgres tests (#7595)Chris2017-10-0922-118/+333
| | | | | | | | | | | | | | | | | | | | * sqlstore cleanup / postgres tests * remove stopped containers * cmd/platform compile fix * remove test-postgres target from makefile
* | store/storetest package (#7588)Chris2017-10-0646-11071/+11095
| | | | | | | | | | | | * prerequisites * storetest package
* | Do not require server restart when enabling/disabling plugins (#7592)Joram Wilander2017-10-062-2/+18
| |
* | fix GetPostsByIds error (#7591)Chris2017-10-061-1/+1
| |
* | reduce store boiler plate (#7585)Chris2017-10-0635-3269/+589
| |
* | post-4.3 commit (#7581)Chris2017-10-051-0/+9
|/
* fix websocket deadlock (#7577)Chris2017-10-041-4/+16
|
* 4.3 pre-cut (#7569)Chris2017-10-042-4/+5
| | | | | | * 4.3 pre-cut * fix
* Fix races / finally remove global app for good (#7570)Chris2017-10-0423-67/+139
| | | | | | | | | | | | * finally remove global app for good * test compilation fixes * fix races * fix deadlock * wake up write pump so it doesn't take forever to clean up
* Parameterized post ids to avoid possible sql injection (#7575)Jonathan2017-10-041-3/+14
|