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,291 Commits 845 Branches 1,202 Tags
34a87fa8f47b1447b73e3ae56866b654801b3eee
Commit Graph

315 Commits

Author SHA1 Message Date
Chris
0a508133d5 fix email race condition (#7656) 2017-10-18 14:13:14 -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
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
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
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
Chris
aa2b82727f fix race condition in tests (#7609) 2017-10-11 12:16:04 -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
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
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
Jonathan
fa80cb10a8 PLT-7785: Slash commands can be issued to a channel in a team without it (#7567) 
* Ensured that specified channel is a part of specified team

* Simplified approach to just infer team id from specified channel id to eliminate the attack vector entirely
 2017-10-04 08:12:13 -07:00
Joram Wilander
e05edf85cf PLT-7781 Some more OAuth fixes (#7568) 
* Some other oauth fixes

* Fix unit test
 2017-10-04 11:04:56 -04:00
Joram Wilander
affd35071e Updates to session revoking in v4 (#7565) 2017-10-04 11:04:17 -04:00
Joram Wilander
3e144f82e2 Only update session activity on specific endpoints (#7549) 2017-10-03 11:16:33 -07:00
Chris
5e69ce099f Goroutine wranglin (#7556) 
* goroutine wranglin

* synchronize WebConn.WritePump
 2017-10-03 10:53:53 -05:00
Joram Wilander
605ac2a10c Fix bad merge (#7553) 2017-10-02 13:25:33 -07: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
Chris
4e79d2d4d0 remove jobs.Srv and other jobs-related globals (#7535) 2017-09-29 10:29:29 +01: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
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
George Goldberg
e8ca3d64f4 PLT-7470: Add metrics for searches. (#7507) 2017-09-25 13:44:44 -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
Chris
dcf9e96a0b remove global refs from api/api4 (#7496) 2017-09-22 13:54:27 -04:00
Chris
266ff86702 remove more global refs (#7480) 2017-09-21 10:13:34 +01:00
Chris
2d322a4174 fix error message escaping (#7467) 2017-09-20 09:34:30 -04:00
Chris
ac74066f0e remove einterface gets (#7455) 2017-09-19 18:31:35 -05:00
Corey Hulen
99b7d65504 Fixing profile image tag (#7435) 
* Fixing profile image tag

* Fixing unit test

* Fixing unit test
 2017-09-19 16:34:39 -04:00
Saturnino Abril
0643bf5159 generate web error when opening an invalid public file link (#7475) 2017-09-19 08:58:20 -04: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
George Goldberg
2be5577b88 Model: NewLocAppError -> NewAppError (#7450) 2017-09-15 08:32:11 -04:00
Joram Wilander
23e64ec9aa Invalidate webhook cache after updating webhook (#7430) 2017-09-14 11:47:34 -04:00
Chris
4731b8f9b9 fix plugin test (#7436) 
* fix plugin test

* ugh. global state

* Fix plugin test

* Fix TestDeleteChannel

* Remove plugin config listener when shutting down
 2017-09-12 15:12:29 -04:00
Chris
b066b6df13 Remove global app references (#7433) 
* remove global app references

* test fix

* fix api4 test compilation
 2017-09-12 09:19:52 -05:00
Chris
402491b7e5 PLT-7407: Back-end plugins (#7409) 
* tie back-end plugins together

* fix comment typo

* add tests and a bit of polish

* tests and polish

* add test, don't let backend executable paths escape the plugin directory
 2017-09-11 10:02:02 -05:00
Christopher Speller
29fca51821 Renaming repo 2017-09-06 23:11:59 -07:00
Christopher Speller
7bc8e9a08d Adding jenkinsfile for new build server. 2017-09-06 23:11:58 -07:00
Christopher Speller
77709ccdda Merge release-4.2 2017-09-06 20:43:18 -07:00
Chris
1adfd0e9be app type transition (#7167) 2017-09-06 17:12:54 -05:00
JoramWilander
d38328976e Various patches 2017-09-06 16:24:34 -04:00
Saturnino Abril
f968c56890 Revert "[PLT-7475] Add S3 region to system console and add S3 validation (#7373)" (#7387) 
This reverts commit 8d680cf64e.

Move to 4.3.
Will discuss more if validation is necessary.
 2017-09-06 11:02:42 -05:00
Harrison Healey
e30e4cfe3d PLT-7468 Moved more error pages to use predefined error types (#7378) 
* PLT-7468 Moved more errors to use error types

* PLT-7468 Moved 404 error page to use error types

* Made helper function for rendering external links on error page
 2017-09-05 17:40:35 -04:00