Граф коммитов

415 Коммитов

Автор SHA1 Сообщение Дата
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
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
Chris
1adfd0e9be app type transition (#7167) 2017-09-06 17:12:54 -05:00
Alex Moon
06a959e19e [GH-7260] Add check for verified email when required by server settings (#7275)
* Add check for verified email when required by server settings

* remove debug and simplify logic with continue
2017-09-06 16:43:48 -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
David Meza
1605fa5102 Configs for themes in Display Settings: hide themes options, hide custom themes, specific list of themes (#7173)
* Add configuration to enable or disable choosing themes in Display Settings. Only for Licensed servers.

* Add configuration to enable or disable choosing custom themes in Display Settings. Only for Licensed servers.

* Add configuration to enable or disable a specific list of themes to choose in Display Settings. Only for Licensed servers.

* Added config value and logic for "DefaultTheme"

* Fix problem with undefined values when the server is not licensed
2017-09-05 19:28:46 -05:00
Chris
7cee7b3342 PLT-7300: Add use_user_icon prop to allow bots to just use their user icon (#7381)
* add use_user_icon prop to allow bots to just use their user icon

* revert unintentional change
2017-09-05 19:20:47 -05:00
Harrison Healey
6ca443a255 PLT-7522 Cleaned up translation of templates (#7351)
* PLT-7522 Cleaned up translation of templates

* Added unit tests

* Changed TranslateAsHtml to not be variadic
2017-09-05 17:39:45 -04:00
Jonathan
016b5daa1c PLT-7444: If there is activity in Mattermost before the email batch is sent, do not send the email (#7342)
* Changed email batching short-circuit logic to look at last viewed at timestamp in channel member struct instead of in user's status struct, since the latter is only updated if the user's status is set to online

* Fixed unit tests

* Reduced right-hand drift

* Reduced total number of store calls by loading all channel member objects for user exactly once per team that the user received notifications for
2017-09-05 16:39:07 -04:00
Saturnino Abril
8d680cf64e [PLT-7475] Add S3 region to system console and add S3 validation (#7373)
* add S3 region to system console and add S3 validation

* update translation message

* add bool as return value to Validate* functions

* update Validate* functions to be pure
2017-09-06 03:42:18 +08:00
Harrison Healey
09f8267751 PLT-7517 Added setting to enable tracing of Amazon S3 connections (#7349)
* PLT-7517 Added setting to enable tracing of Amazon S3 connections

* Removed unnecessary placeholders on boolean settings

* Added AmazonS3Trace to diagnostics

* Updated AmazonS3Trace setting name in system console

* Removing extra colon
2017-09-05 15:24:21 -04:00
Harrison Healey
575864c917 PLT-7474 Stopped requiring confirmation for mentions in code blocks (#7375)
* PLT-7474 Stopped requiring confirmation for mentions in code blocks

* Stopped mentioning people from code blocks using ~~~
2017-09-06 00:39:07 +08:00
Corey Hulen
d6383643cb PLT-6226 fixing race in IsAuth (#7296)
* Fixing race in isAuth function

* PLT-6226 fixing race in IsAuth

* Moving int64 to top so it's aligned

* Adding comment and fixing asymmetric call
2017-09-05 07:58:47 -07:00
Corey Hulen
7843dc3cfa Fixing leader election (#7267) 2017-09-05 07:58:30 -07:00
Joram Wilander
4c522155da Temporarily place plugins into E20 (#7370) 2017-09-05 11:35:07 +01:00
George Goldberg
ba2868775d PLT-7216: CLI Command to move channels between teams. (#7149)
* PLT-7216: CLI Command to move channels between teams.

* Add comment
2017-09-04 18:54:24 +01:00
Harrison Healey
98bb4c31a1 PLT-7473 Ignore text surrounded by multiple backquotes when parsing mentions (#7347) 2017-09-04 21:31:20 +08:00