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,286 Commits 845 Branches 1,202 Tags
7b1fb3c2c77a435a86a1886b279ace7c981a8cff
Commit Graph

435 Commits

Author SHA1 Message Date
Christopher Brown
39cc237269 Merge branch 'release-4.3' 2017-10-16 23:10:45 -05: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
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
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
George Goldberg
fe41022353 PLT-7883: Fix database race in bulk importer in GetByUsername. (#7611) 2017-10-12 10:00:05 -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
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
Joram Wilander
d1958bdc49 Do not require server restart when enabling/disabling plugins (#7592) 2017-10-06 10:58:23 -07:00
Chris
2a76eeeeee fix websocket deadlock (#7577) 2017-10-04 22:48:14 -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
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
Joram Wilander
fadd9514f6 PLT-7718 Patch for files (#7564) 
* Patch for files

* Fix merge

* Fix tests

* Fix another test
 2017-10-04 11:42:38 -04:00
Joram Wilander
f94b807f39 PLT-7782 Fix for OAuth (#7566) 
* Fix for oauth

* Fix test
 2017-10-04 11:05:36 -04:00
Joram Wilander
affd35071e Updates to session revoking in v4 (#7565) 2017-10-04 11:04:17 -04:00
Chris
5e69ce099f Goroutine wranglin (#7556) 
* goroutine wranglin

* synchronize WebConn.WritePump
 2017-10-03 10:53:53 -05:00
George Goldberg
76bd1bb212 PLT-7705: API to get data retention policy. (#7539) 
* PLT-7705: API to get data retention policy.

* Fix review comments.
 2017-10-02 12:43:21 +01:00
Chris
9bc7af0c57 Don't use global app for api / api4 tests (#7528) 
* don't use global app for api / api4 tests

* put sleep back. we're gonna have to do some goroutine wrangling

* fix oauth test config assumptions

* jobs package, i'm comin' for you next

* app test fix

* try increasing sleep a little
 2017-10-02 09:50:56 +01:00
Joram Wilander
8b9dbb8613 PLT-7404 Return viewed at times in view channel API response (#7428) 
* Return viewed at times in view channel API response

* Updated transaction to read and write once

* Remove transaction and only update if new value greater than older
 2017-09-29 08:45:59 -07:00
George Goldberg
5e50d3f461 PLT-7712: Add data retention settings to diagnostics. (#7534) 2017-09-29 17:54:59 +08:00
Chris
4e79d2d4d0 remove jobs.Srv and other jobs-related globals (#7535) 2017-09-29 10:29:29 +01:00
Chris
cb33179998 PLT-7758: jira url fix (#7536) 
* jira url fix

* whoops, forgot a file (the test file)
 2017-09-28 16:31:23 -04:00
Joram Wilander
f263d2b951 PLT-7684 Add support to outgoing webhooks and slash commands to set post type and props (#7531) 
* Add support to outgoing webhooks and slash commands to set post type and props

* Fix nil access
 2017-09-28 09:08:16 -07:00
Joram Wilander
884cf494cb Only check LDAP attributes if auth data set (#7530) 2017-09-28 09:06:05 -07:00
Joram Wilander
15b361094a PLT-7633 (E20) Add session idle timeout config setting (#7524) 
* Add session idle timeout config setting

* Modify config setting name to SessionIdleTimeoutInMinutes

* Small re-org of if statement

* Merge with latest master
 2017-09-28 14:04:52 +01:00
Chris
8c80cdde38 remove remaining Global() calls (outside of tests) (#7521) 2017-09-28 00:52:34 +08:00
Corey Hulen
81c18a01bd PLT-7542 Converting LDAP sync to the job server (#7452) 
* PLT-7542 Converting LDAP sync to the job server

* Fixing minor issues

* Fixing build failure

* Translate error message

* Translate error message

* Translate error message

* Translate error message

* Fixing merge

* Fixing bad merge
 2017-09-25 13:30:33 -07:00
Chris
49fe5fbf3d Move sql store code into store/sqlstore package (#7502) 
* move sql store code into store/sqlstore package

* move non-sql constants back up to store

* fix api test

* derp
 2017-09-25 10:11:25 -04:00
George Goldberg
d6b5b681ae Finally do away with NewLocAppError function. (#7498) 
This cleans up the few NewLocAppError calls that crept in since the main
bulk of them were removed, and finally removes the NewLocAppError
function altogether.
 2017-09-25 08:25:43 -04:00
Chris
e525383c52 plugin CRUD operations for users, posts, channels, and teams (#7479) 2017-09-21 14:00:14 -05:00
Chris
266ff86702 remove more global refs (#7480) 2017-09-21 10:13:34 +01:00
Jesús Espino
62e5e2fda8 PLT-7508: Add settings to disable wide mention confirmation (#7416) 2017-09-20 11:38:27 -04:00
Chris
ac74066f0e remove einterface gets (#7455) 2017-09-19 18:31:35 -05:00
Chris
7e4ff6adcc allow ephemeral command responses without text (#7478) 2017-09-19 17:13:59 -05:00
n1aba
5a855e1ca1 Implement update OAuthApp endpoint for APIv4, add test (#7413) 2017-09-18 07:40:41 -04:00
Joram Wilander
2628022275 PLT-7622 Improvements to server handling of webapp plugins (#7445) 
* Improvements to server handling of webapp plugins

* Fix newline

* Update manifest function names
 2017-09-15 08:51:46 -04:00
Harrison Healey
2a6cd44f23 PLT-7509 Stopped processing special mentions for change of header/purpose messages (#7410) 2017-09-15 08:37:29 -04:00
Joram Wilander
600beb5af3 Add some checking of channel ID before sending websocket event (#7431) 2017-09-15 11:56:08 +01:00
Chris
b6fb98a431 remove more global references (#7442) 2017-09-14 13:01:44 -04:00
Saturnino Abril
af81f7e48b [PLT-7573] Make deactivated user not counted in Town Square member count (#7421) 
* make deactivated user not counted in Town Square member count

* update app
 2017-09-15 00:22:23 +08:00
Joram Wilander
23e64ec9aa Invalidate webhook cache after updating webhook (#7430) 2017-09-14 11:47:34 -04:00
Corey Hulen
3e9bd30b00 PLT-7502 fixing clearing of push notifications for iOS (#7429) 
* PLT-7502 fixing clearing of push notificaitons for iOS

* PLT-7502 fixing clearing of push notificaitons for iOS
 2017-09-12 17:49:42 -07:00