IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,493 Commits 845 Branches 1,202 Tags
v4.6.0-rc4
Commit Graph

9493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Frazier
7fa4913f90 [PLT-7794] Add user access token enable/disable endpoints (#7630) 
* 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
 2017-10-19 08:10:29 -04:00
Chris
8e19ba029f Reduce utils.Cfg references (#7650) 
* app.UpdateConfig method

* test fix

* another test fix

* the config override option as-was is just error prone, remove it for now

* derp
 2017-10-18 15:36:43 -07:00
Chris
34a87fa8f4 use webapp build from cache when possible (#7646) 2017-10-18 14:40:17 -07:00
Chris
0a508133d5 fix email race condition (#7656) 2017-10-18 14:13:14 -07:00
Ema Panz
897d83fdf9 Fix teams create example (#7655) 
Fix the "team create" command wrongly shows a `teams create` example, where an extra "s" is appended to the command name.
 2017-10-18 13:22:51 -07:00
Chris
7409d9f217 fix job test race condition (#7647) 2017-10-18 12:23:41 -04:00
Chris
3c0ccaafe7 fix preference test races (#7645) 2017-10-18 12:21:28 -04:00
George Goldberg
7b1fb3c2c7 PLT-7862: Support batched live indexing. (#7640) 2017-10-18 11:43:10 +01:00
Jonathan
b884c8c410 PLT-7193: Regression - Custom slash commands don't work in direct or group 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
 2017-10-17 10:21:12 -07:00
Christopher Brown
39cc237269 Merge branch 'release-4.3' 2017-10-16 23:10:45 -05:00
Rick Batka
89dc3cb126 [PLT-7396] Add the ability to revoke user sessions in System Console > Users #7493 (#7623) 
* add endpoint and tests for revoking all sessions for a user

* fix failing test build
 2017-10-16 20:50:31 -07:00
Jason Blais
a649602fc3 Add two missing diagnostics entries (#7634) 
* Update diagnostics.go

* Fix config setting name SessionIdleTimeoutInMinutes

* Update diagnostics.go
 2017-10-16 18:17:12 -04:00
JoramWilander
8bf47c1211 Fix SessionIdleTimeoutInMinutes in default.json 2017-10-16 18:10:30 -04:00
Chris
ce314425d1 Fix webconn shutdown race (#7631) 
* fix webconn shutdown race

* make sure writePump returns promptly if readPump returns first

* fix app shutdown race

* minor improvement
 2017-10-16 14:02:33 -07:00
Simon Eisenmann
868bd76f40 PLT-7809: Add support for Kopano Webmeetings WebRTC server (#7590) 
* 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
 2017-10-16 16:11:03 +01:00
Chris
34285d8cca parallel tests (#7629) 2017-10-16 11:09:43 -04:00
Jonathan
adb2b1d6ed Ignored gogland project files (#7625) 2017-10-13 08:49:03 -07:00
Chris
8966452d11 workaround for go smtp bug (#7620) v4.3.0 v4.3.0-rc4 v4.3.0-rc3 2017-10-12 15:23:33 -07:00
Chris
917e4789c2 Use tmpfs containers for api/api4 tests, move and speed up CLI tests (#7606) 
* 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
 2017-10-12 12:24:54 -07:00
Conor O'Callaghan
86a0e16035 Minor link fixes (#7614) 
* 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
 2017-10-12 13:55:20 -04:00
Santos Solorzano
a7afadec3a Add User To Channel api route returns a 400 error when trying to add users to a DM or GM channel (#7587) 2017-10-12 13:54:37 -04:00
George Goldberg
fe41022353 PLT-7883: Fix database race in bulk importer in GetByUsername. (#7611) 2017-10-12 10:00:05 -07:00
Chris
785cc06f6e Make test execution not take quadratic compilation time (#7610) 
* 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
 2017-10-12 08:35:19 -07:00
Christopher Speller
3461a7b207 Add back consumeAndClose functionality. (#7608) 
* 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
 2017-10-12 08:00:53 -07:00
Chris
aa2b82727f fix race condition in tests (#7609) v4.3.0-rc2 2017-10-11 12:16:04 -07:00
Christopher Speller
675f13c808 Fixing LDAP and SAML settings detection (#7605) 2017-10-11 09:47:59 -07:00
Saturnino Abril
521e27f4ac [PLT-7764] Fix in:channel search when channel name/displayname includes - (#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
 2017-10-11 17:20:27 +08:00
Chris
66b07a72ce remove go 1.8 ipc workaround (#7604) 2017-10-10 14:50:45 -07:00
enahum
7c4e338a56 translations PR 20171009 (#7598) 2017-10-10 11:50:26 -07:00
Joram Wilander
f799738613 Remove duplicate post edit WS event and cache invalidation (#7576) 2017-10-09 19:40:50 -07:00
Chris
bff2b5e735 Miscellaneous app cleanup (#7594) 
* app cleanup

* whoops, forgot a file

* some minor cleanup

* longer container deadline

* defensive checks
 2017-10-09 14:59:48 -07:00
Harrison Healey
e522a1c2e4 PLT-7811 Standardized team sanitization flow (#7586) 
* 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
 2017-10-09 10:30:59 -07:00
Joram Wilander
9adaf53e11 PLT-7818 Updates to post type (#7579) 
* Updates to post type

* Update tests
 2017-10-09 10:30:48 -07:00
Chris
0f66b6e726 store/sqlstore cleanup and postgres tests (#7595) 
* sqlstore cleanup / postgres tests

* remove stopped containers

* cmd/platform compile fix

* remove test-postgres target from makefile
 2017-10-09 13:16:14 -04:00
George Goldberg
0da0cf1a21 PLT-7826: Don't fetch posts from store if ES returns none. (#7596) 2017-10-09 10:14:27 -07:00
Chris
70e5f00241 store/storetest package (#7588) 
* prerequisites

* storetest package
 2017-10-06 11:08:59 -07:00
Joram Wilander
d1958bdc49 Do not require server restart when enabling/disabling plugins (#7592) 2017-10-06 10:58:23 -07:00
Chris
6097e3f02b fix GetPostsByIds error (#7591) 2017-10-06 12:18:26 -04:00
Chris
363568b4eb reduce store boiler plate (#7585) 2017-10-06 11:12:10 -04:00
Chris
12501673d0 post-4.3 commit (#7581) 2017-10-05 14:50:49 -04:00
Chris
2a76eeeeee fix websocket deadlock (#7577) v4.3.0-rc1 2017-10-04 22:48:14 -07:00
Chris
da368539e3 4.3 pre-cut (#7569) 
* 4.3 pre-cut

* fix
 2017-10-04 13:10:16 -07:00
Chris
07777f5ff9 Fix races / finally remove global app for good (#7570) 
* 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
 2017-10-04 13:09:41 -07:00
Jonathan
dc9b1a1d6a Parameterized post ids to avoid possible sql injection (#7575) 2017-10-04 12:54:42 -07:00
lindalumitchell
87e816da23 Remove duplicate Nature section (#7571) 2017-10-04 12:01:26 -07:00
George Goldberg
f3fc6d11fa PLT-7218: CLI to move slash commands between teams. (#7574) 2017-10-04 11:08:59 -07:00
George Goldberg
e16bdf8d1d PLT-7789: Fix raciness on Aurora with importing team members. (#7573) 
* PLT-7789: Fix raciness on Aurora with importing team members.

* Fix and document return values.
 2017-10-04 10:17:58 -07:00
Carlos Tadeu Panato Junior
35d56821ff [PLT-7787] remove an extra ephemeral message posted for slash commands (#7572) 2017-10-04 09:11:08 -07:00
enahum
31eda663b4 translations PR 20171002 (#7555) 2017-10-04 09:10:15 -07:00
amyblais
e648fac0be Update NOTICE.txt (#7550) 
* Update NOTICE.txt

* Update NOTICE.txt
 2017-10-04 09:10:03 -07:00