Commit Graph

620 Commits

Author SHA1 Message Date
Derrick Anderson
c209e44574 revert master changes 2018-02-12 16:01:02 -05:00
Chris
1ae680aefa Merge branch 'master' into release-4.7 2018-02-12 12:02:54 -06:00
Jonathan
9707ac3aaf Added invite_id field to email invite url, along with validation of this field on the server (#8235) 2018-02-12 09:16:17 -05:00
Derrick Anderson
f28ee8d7c8 Merge branch 'release-4.7' 2018-02-08 09:08:16 -05:00
enahum
654fc2f749 translations PR 20180205 (#8200) 2018-02-07 14:08:42 -05:00
Vordimous
7bd298ceaa PLT-7537: Move channel CLI command posts system message to channel. (#8161)
* [PTL-7537] implement feature and test

* [PTL-7537] Update feature to post the the room requiring a username flag to be used

* [PTL-7537] update tests with username

* update test to remove changes to the test helper struct

* use the basic team and user
2018-02-07 14:17:18 +00:00
Jonathan
d3e934d07a XYZ-35: Added Support for GlobalRelay Compliance Export Format
* Added username to ChannelMemberHistory struct in anticipation of supporting GlobalRelay in Compliance Export
* Removed translation from debug output - this makes it complicated to use utils functions from tests in the enterprise repo
* Added an advanced email function that allows for greater control over message details. Updated MessageExport config to support GlobalRelay. Added attachment support to InBucket unit tests
* Moving templates in from enterprise to solve test issues
* Added export format to diagnostics
* Changed email attachment code to use FileBackend so that S3 storage is properly supported
2018-02-07 09:02:46 -05:00
Harrison Healey
9a73f99885 ICU-715 Change ExperimentalGroupUnreadChannels setting to allow for default on/off (#8211) 2018-02-06 18:45:14 -05:00
enahum
8ca8e71fdd translations PR 20180129 (#8164) 2018-01-30 10:07:05 -03:00
Harrison Healey
8d66523ba7 Used a consistent tense for system messages (#8079) 2018-01-26 13:35:50 -05:00
Martin Kraft
540dd9ae94 XYZ-32: Increases size of position to 128 characters. (#8148)
* XYZ-32: Changes type of 'position' column on 'users' table.

* XYZ-32: Uncomment to run on CI and pre-release.

* XYZ-32: Reverts translation changes.

* XYZ-32: Fix for gofmt.
2018-01-26 08:37:12 -05:00
der-test
3da2dad989 Fixed spelling error (#8153) 2018-01-26 08:36:41 -05:00
Harrison Healey
195ad56204 Merge branch 'release-4.6' 2018-01-23 15:07:31 -05:00
Chris
599991ea73 PLT-3383: image proxy support (#7991)
* image proxy support

* go vet fix, remove mistakenly added coverage file

* fix test compile error

* add validation to config settings and documentation to model functions

* add message_source field to post
2018-01-22 15:32:50 -06:00
enahum
2bdd44cce9 translations PR 20180115 (#8107) 2018-01-21 18:27:59 -03:00
Evgeniy
9d6a9ff4be Post a system message to the affected channel by CLI command (#7877) (#7968) 2018-01-18 16:05:00 -05:00
enahum
58defb7424 translations PR 20180109 (#8069)
* translations PR 20180109

* Fix french translation
2018-01-12 14:08:34 -05:00
Adrian Carolli
b1d13a2d89 [PLT-7793] Add /users/tokens/search endpoint (#8088)
* Add /users/tokens/search endpoint + tests

* Fix check-style

* Unnecessary deletion
2018-01-11 16:30:55 -05:00
Jesús Espino
6990d052d5 [XYZ-6] Add sampledata platform command (#8027)
* Add fake dependency

* [XYZ-6] Add sampledata platform command

* Creating EMOJI_NAME_MAX_LENGTH as a constant and using it where needed
2018-01-11 10:57:47 -05:00
Adrian Carolli
fd3fa8f8dc [PLT-7793] Added /users/tokens endpoint (#8038)
* Added /users/tokens/all endpoint

- UserAccessStore now has getAll method
- Added tests
- Added route
- Added handler

* Remove space fix check-style

* Remove blank space check-style

* Fixes for make check-style

* Remove extra code that is un-needed in user_test.go

* Rename endpoint + grammar

- Renamed /users/tokens/all to /users/tokens
- Renamed getUserAccessTokens to getUserAccessTokensForUser
- Renamed getAllUserAccessTokens to getUserAccessTokens
- Minor Grammar changes

* Add localization for sql_user_access_token.get_all

* Fix minor plural spelling
2018-01-05 14:46:48 -05:00
Jesse Hallam
e5dad3cf68 [PLT-8173] Strip the post_ prefix on incoming webhook overrides. (#8019) 2018-01-03 10:35:36 -05:00
Jesse Hallam
e9fe9f50dd [PLT-8173] Add username and profile picture to webhook set up pages (#8002) 2018-01-02 08:41:23 -08:00
enahum
b902e4eea9 translations PR 20180101 (#8015) 2018-01-02 08:40:13 -08:00
enahum
afe8fbe2d2 translations PR 20171225 (#8006) 2018-01-02 08:39:59 -08:00
Jesse Hallam
5e5168f5cd fix i18n identifier (#8009) 2018-01-02 08:39:45 -08:00
enahum
522f21e698 translations PR 20171218 (#7983) 2017-12-21 11:35:36 -03:00
Christopher Speller
917e2417cf Merge branch 'release-4.5' 2017-12-18 09:15:18 -08:00
enahum
e57a7667ef translations PR 20171211 (#7966) 2017-12-12 08:13:20 -08:00
Chris
4c17bdff1b Add plugin slash command support (#7941)
* add plugin slash command support

* remove unused string

* rebase
2017-12-08 13:55:41 -06:00
Tsilavina Razafinirina
0cdf969ac7 PLT-6217-bis Fixes system message posted to Town Square when a user joins a team #7863 (#7864)
* Adds new string post message when a user has joined a team (#6483)

* Simplifies long if statement in post.go (#6483)
2017-12-08 11:15:33 -08:00
Joram Wilander
7cefef6d21 Hash key for plugin store and limit id length (#7933) 2017-12-05 15:19:33 -08:00
Jonathan
c171872472 PLT-8233: Purge ChannelMemberHistory Data when Data Retention Job runs (#7937)
* Changed the channel member history purge function to match pattern established by other data retention purge methods

* Simplifying the channel member history store and associated tests

* Regenerating mocks

* Using a constant
2017-12-05 16:32:23 -05:00
Christopher Speller
81c1fad4d4 Revert "Hash key for plugin store table and limit plugin ID length (#7915)" (#7931)
This reverts commit c3af878573.
2017-12-01 23:20:11 -08:00
Joram Wilander
c3af878573 Hash key for plugin store table and limit plugin ID length (#7915)
* Hash plugin store keys and update column limits

* Limit plugin ID length on install

* Add note to manifest id and allow zero length keys
2017-12-01 15:20:08 -05:00
enahum
b51d9e8eab translations PR 20171127 (#7909) 2017-12-01 08:22:29 -05:00
Chris
daebd26a28 PLT-8018: Bundled jira plugin (#7920)
* bundled jira plugin

* fix generated file formatting, add prepackaged key

* whoops, uploaded wrong file

* whitelist generated files for license check

* make it work for people without go/bin in their path
2017-11-30 14:55:44 -06:00
Jonathan
375c0632fa PLT-7503: Create Message Export Scheduled Task and CLI Command (#7612)
* Created message export scheduled task

* Added CLI command to immediately kick off an export job

* Added email addresses for users joining and leaving the channel to the export

* Added support for both MySQL and PostgreSQL

* Fixing gofmt error

* Added a new ChannelMemberHistory store and associated tests

* Updating the ChannelMemberHistory channel as users create/join/leave channels

* Added user email to the message export object so it can be included in the actiance export xml

* Don't fail to log a leave event if a corresponding join event wasn't logged

* Adding copyright notices

* Adding message export settings to daily diagnostics report

* Added System Console integration for message export

* Cleaned up TODOs

* Made batch size configurable

* Added export from timestamp to CLI command

* Made ChannelMemberHistory table updates best effort

* Added a context-based timeout option to the message export CLI

* Minor PR updates/improvements

* Removed unnecessary fields from MessageExport object to reduce query overhead

* Removed JSON functions from the message export query in an effort to optimize performance

* Changed the way that channel member history queries and purges work to better account for edge cases

* Fixing a test I missed with the last refactor

* Added file copy functionality to file backend, improved config validation, added default config values

* Fixed file copy tests

* More concise use of the testing libraries

* Fixed context leak error

* Changed default export path to correctly place an 'export' directory under the 'data' directory

* Can't delete records from a read replica

* Fixed copy file tests

* Start job workers when license is applied, if configured to do so

* Suggestions from the PR

* Moar unit tests

* Fixed test imports
2017-11-30 09:07:04 -05:00
Joram Wilander
785a410936 Decrease plugin key value store table index name size (#7910) 2017-11-27 18:49:28 -05:00
Joram Wilander
6176bcff69 PLT-8131 (part2) Add plugin key value store support (#7902)
* Add plugin key value store support

* Add localization strings

* Updates per feedback
2017-11-27 17:23:35 -05:00
Joram Wilander
0bc17001c4 Do not allow installation of plugins with the same ID (#7870) 2017-11-21 14:15:10 -05:00
Jason Blais
01e652ed48 Fix minimun --> minimum typo (#7872) 2017-11-21 12:10:56 -05:00
Jason Blais
deff850115 Update "display name" --> "title" for integration errors (#7854)
Related to https://github.com/mattermost/mattermost-webapp/pull/308
2017-11-20 15:51:25 -08:00
Tsilavina Razafinirina
ab6ef954b4 PLT-6217 Fixes system message posted to Town Square when a member leaves a team (#7752)
* Fixes system message posted to Town Square when adding/removing team member (#6483)

Fixes unit test method call to match RemoveUserFromTeam modification (#6483)

Fixes system message posted to Town Square when adding/removing team member (#6483)

Removes unnessary error message

* Updates system message when a user leaves a team (#6483)

* Changes system message when a user is removed from team (#6483)

* Adds a new string to be post to town-square when a member is added to a team (#6483)
2017-11-20 10:15:33 -05:00
Christopher Speller
9513309879 Merge branch 'release-4.4' 2017-11-16 08:46:16 -08:00
Jesús Espino
6c211c3a12 PLT-7111 Add groupmsg command (#7419)
* Coping command_msg to use as command_groupmsg base

* Changing msg to groupmsg names in groumsg command

* Add groupmsg command
2017-11-14 17:27:14 -05:00
enahum
a0017f1845 translations PR 20171113 (#7827) 2017-11-14 10:30:06 -08:00
enahum
7ef60d47c9 translations PR 20171106 (#7795) 2017-11-08 13:01:05 -08:00
enahum
1af182c198 translations PR 20171030 (#7748) 2017-11-06 10:09:22 -08:00
Chris
d5dbdb2737 several one-line panic, race, and logic fixes (#7766) 2017-11-03 08:25:38 -07:00
Chris
9d32cd4208 prevent deactivation of sso users (#7759) 2017-11-02 17:24:11 -04:00