Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-4.8' into merge-4.8 | JoramWilander | 2018-03-08 | 14 | -37/+349 |
|\ | |||||
| * | translations PR 20180306 (#8414) | Elias Nahum | 2018-03-07 | 14 | -37/+349 |
| | | |||||
* | | MM-8840: Add GlobalRelay Configuration Settings (#8304) | Jonathan | 2018-03-08 | 1 | -0/+24 |
| | | | | | | | | | | | | | | | | * Added new GlobalRelay config settings * Adding default values to global relay config * Migrate global relay config tests to table driven tests | ||||
* | | PLT-7567: Integration of Team Icons (#8284) | Christian Hoff | 2018-03-01 | 1 | -0/+44 |
| | | | | | | | | | | | | | | | | | | | | * PLT-7567: Integration of Team Icons * PLT-7567: Read replica workaround, upgrade logic moved, more concrete i18n key * PLT-7567: Read replica workaround, corrections * PLT-7567: upgrade correction | ||||
* | | [PLT-8186] add support for ec2 instance profile authentication (#8243) | Carlos Tadeu Panato Junior | 2018-02-28 | 1 | -0/+12 |
|/ | |||||
* | Fix push notification content for file only messages (#8346) | Joram Wilander | 2018-02-22 | 1 | -0/+4 |
| | |||||
* | Adding saml migration command (#8263) | Jesús Espino | 2018-02-21 | 1 | -0/+12 |
| | | | | | | * Adding saml migration command * Texts fixed | ||||
* | MM-8681 Adding config settings necessary for using CloudFront. (#8307) | Christopher Speller | 2018-02-20 | 1 | -0/+4 |
| | | | | | | * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics. | ||||
* | Update en.json (#8332) | Jason Blais | 2018-02-20 | 1 | -1/+1 |
| | |||||
* | MM-9556 Added ability to upload files without a multipart request (#8306) | Harrison Healey | 2018-02-20 | 1 | -0/+4 |
| | | | | | | * MM-9556 Added ability to upload files without a multipart request * MM-9556 Handled some unusual test behaviour | ||||
* | translations PR 20180220 (#8334) | enahum | 2018-02-20 | 14 | -241/+345 |
| | |||||
* | merge 4.7.1 to master | Saturnino Abril | 2018-02-19 | 14 | -289/+293 |
|\ | |||||
| * | translations PR 20180215 | Elias Nahum | 2018-02-15 | 14 | -61/+113 |
| | | |||||
| * | Merge branch 'release-4.7' into icu753 | Derrick Anderson | 2018-02-14 | 14 | -244/+196 |
| |\ | |||||
| | * | Merge branch 'translations-20180212' into release-4.7 | Derrick Anderson | 2018-02-14 | 14 | -244/+192 |
| | |\ | |||||
| | | * | translations PR 20180212 | Elias Nahum | 2018-02-12 | 14 | -244/+192 |
| | | | | |||||
| | * | | XYZ-111: Check max users per team on re-join after leave a team | Jesús Espino | 2018-02-13 | 1 | -0/+4 |
| | |/ | |||||
| * / | ICU-753 Added unit tests for messages with only push notifications | Harrison Healey | 2018-02-13 | 1 | -2/+2 |
| |/ | |||||
| * | revert master changes | Derrick Anderson | 2018-02-12 | 1 | -20/+16 |
| | | |||||
* | | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873) | Carlos Tadeu Panato Junior | 2018-02-16 | 1 | -0/+4 |
|/ | |||||
* | Merge branch 'master' into release-4.7 | Chris | 2018-02-12 | 1 | -16/+20 |
|\ | |||||
| * | Merge branch 'release-4.7' | Derrick Anderson | 2018-02-08 | 6 | -34/+34 |
| |\ | |||||
| * | | PLT-7537: Move channel CLI command posts system message to channel. (#8161) | Vordimous | 2018-02-07 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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 | ||||
| * | | XYZ-35: Added Support for GlobalRelay Compliance Export Format | Jonathan | 2018-02-07 | 1 | -16/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | Added invite_id field to email invite url, along with validation of this ↵ | Jonathan | 2018-02-12 | 1 | -12/+4 |
| |/ |/| | | | | | field on the server (#8235) | ||||
* | | translations PR 20180205 (#8200) | enahum | 2018-02-07 | 6 | -34/+34 |
|/ | |||||
* | ICU-715 Change ExperimentalGroupUnreadChannels setting to allow for default ↵ | Harrison Healey | 2018-02-06 | 1 | -0/+4 |
| | | | | on/off (#8211) | ||||
* | translations PR 20180129 (#8164) | enahum | 2018-01-30 | 14 | -141/+1129 |
| | |||||
* | Used a consistent tense for system messages (#8079) | Harrison Healey | 2018-01-26 | 1 | -7/+7 |
| | |||||
* | XYZ-32: Increases size of position to 128 characters. (#8148) | Martin Kraft | 2018-01-26 | 1 | -1/+1 |
| | | | | | | | | | | * 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. | ||||
* | Fixed spelling error (#8153) | der-test | 2018-01-26 | 1 | -1/+1 |
| | |||||
* | Merge branch 'release-4.6' | Harrison Healey | 2018-01-23 | 14 | -89/+245 |
|\ | |||||
| * | translations PR 20180115 (#8107) | enahum | 2018-01-21 | 3 | -13/+13 |
| | | |||||
| * | translations PR 20180109 (#8069) | enahum | 2018-01-12 | 14 | -78/+234 |
| | | | | | | | | | | | | * translations PR 20180109 * Fix french translation | ||||
* | | PLT-3383: image proxy support (#7991) | Chris | 2018-01-22 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | Post a system message to the affected channel by CLI command (#7877) (#7968) | Evgeniy | 2018-01-18 | 1 | -0/+8 |
| | | |||||
* | | [PLT-7793] Add /users/tokens/search endpoint (#8088) | Adrian Carolli | 2018-01-11 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | * Add /users/tokens/search endpoint + tests * Fix check-style * Unnecessary deletion | ||||
* | | [XYZ-6] Add sampledata platform command (#8027) | Jesús Espino | 2018-01-11 | 1 | -1/+53 |
| | | | | | | | | | | | | | | | | * Add fake dependency * [XYZ-6] Add sampledata platform command * Creating EMOJI_NAME_MAX_LENGTH as a constant and using it where needed | ||||
* | | [PLT-7793] Added /users/tokens endpoint (#8038) | Adrian Carolli | 2018-01-05 | 1 | -0/+4 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | [PLT-8173] Strip the post_ prefix on incoming webhook overrides. (#8019) | Jesse Hallam | 2018-01-03 | 1 | -2/+2 |
| | |||||
* | [PLT-8173] Add username and profile picture to webhook set up pages (#8002) | Jesse Hallam | 2018-01-02 | 1 | -0/+12 |
| | |||||
* | translations PR 20180101 (#8015) | enahum | 2018-01-02 | 1 | -1/+1 |
| | |||||
* | translations PR 20171225 (#8006) | enahum | 2018-01-02 | 2 | -18/+18 |
| | |||||
* | fix i18n identifier (#8009) | Jesse Hallam | 2018-01-02 | 1 | -1/+1 |
| | |||||
* | translations PR 20171218 (#7983) | enahum | 2017-12-21 | 14 | -12/+220 |
| | |||||
* | Merge branch 'release-4.5' | Christopher Speller | 2017-12-18 | 14 | -155/+1723 |
|\ | |||||
| * | translations PR 20171211 (#7966) | enahum | 2017-12-12 | 14 | -163/+1723 |
| | | |||||
* | | Add plugin slash command support (#7941) | Chris | 2017-12-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | * add plugin slash command support * remove unused string * rebase | ||||
* | | PLT-6217-bis Fixes system message posted to Town Square when a user joins a ↵ | Tsilavina Razafinirina | 2017-12-08 | 1 | -0/+4 |
|/ | | | | | | | | team #7863 (#7864) * Adds new string post message when a user has joined a team (#6483) * Simplifies long if statement in post.go (#6483) | ||||
* | Hash key for plugin store and limit id length (#7933) | Joram Wilander | 2017-12-05 | 1 | -8/+4 |
| |