summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Support attachments in post and replies - Bulk import (#9124)Pradeep Murugesan2018-07-202-9/+265
| | | | | | | | | | * 9006 - process the attachments of the post * 9006 enabling the import of attachments in the reply post * 9006 assert if the post and files are linked * 9006 fixed the typo
* Add missed plugin error translation (#9131)Jesús Espino2018-07-191-1/+1
|
* Temporarily comment out until MM-11108 to fix builds (#9133)Joram Wilander2018-07-191-1/+2
|
* MM-11389 Added diagnostics for FileSettings.Directory (#9125)Harrison Healey2018-07-191-0/+3
|
* MM-11028 Adding some plugin tests. (#9103)Christopher Speller2018-07-182-2/+451
| | | | | | | | * Rearranging plugin mocks and moving some common test code out. * Adding tests. * Fixing tests after GoDoc cleanup changes.
* Support `server`, deprecate `backend` in plugin manifest (#9127)Jesse Hallam2018-07-181-4/+4
| | | | | | | | | | | | | | * Support `server`, deprecate `backend` in plugin manifest This lets us converge on the use of the term `server` everywhere instead of sometimes `backend` and sometimes `server`. We're still using `webapp` and will eventually support `mobile` as well. The plan is actually to rip out these deprecations as part of releasing 5.2, but I want to coordinate the extra additional breakage at the same time, so for now this is a backwards compatible change. * fix failing tests
* Support for Embeded chat (#9129)Chris Duarte2018-07-181-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ucLive support crazy testing lovely logs more cookie work arounds Added Access-Control-Expose-Headers to user login Add complete_saml_body template and revert loginWithSaml endpoint Set Access-Control-Allow-Credentials to true in user login Login via email instead of username Clean up code Add comment to give some context Move faml logic into saml function Communicate via chrome sendMessage api Remove unused code Add config to support multiple extensions Clean up embedded complete_saml template Fix indentation for templates Added license header to extension.go Add EnableExperimentalExtensions flag Extension validated for email auth Clean up api auth code Remove complete_saml_body.html * Add extension support in saml * Clean up code * Clean up extension validation
* MM-10699 Add channel renaming to CLI (#9094)Druhin Bala2018-07-182-0/+29
|
* Make plugin IDs case insensitive (#9117)Joram Wilander2018-07-161-0/+5
|
* MM-10254 Add plugin APIs for getting/updating user statuses (#9101)Joram Wilander2018-07-1610-8/+74
| | | | | | | | * Add plugin APIs for getting/updating user statuses * Add and update tests * Updates per feedback
* MM-11172: Don't allow reacting in read-only town square. (#9106)George Goldberg2018-07-161-0/+38
|
* Add localized timestamp support for email notification (#8674)Chris Duarte2018-07-132-34/+201
| | | | | | * Add localized timestamp support for email notification * Move localTime logic over to getFormattedPostTime
* MM-11292: clean up plugins GoDoc (#9109)Jesse Hallam2018-07-133-3/+3
| | | | | | | | | | | | | | | | | | | * clean up plugins GoDoc: - eliminate plugin.NewBlankContext() as unnecessary - export ValidIdRegex as a string vs. the less readable var - add/update various documentation strings - hide everything by default, except where used by client plugins or the mattermost-server. The exception to this rule are the `*(Args|Returns)` structs which must be public for go-plugin, but are now prefixed with `Z_` with a warning not to use. - include a top-level example to get plugin authors started This is not a breaking change for existing plugins compiled against plugins-v2. * remove commented out ServeHTTPResponseWriter * update examples to match developer docs * add missing plugin/doc.go license header
* Avoid using app function so bulk loading does not fail when custom emojis ↵Joram Wilander2018-07-121-6/+6
| | | | are disabled (#9064)
* Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-121-17/+19
|\ | | | | | | release-5.1-daily-merge-20180712
| * push notifications follow teammate name display user or server setting (#9049)Elias Nahum2018-07-111-17/+19
| | | | | | | | | | | | * push notifications follow teammate name display user or server setting * Feedback review
* | GH-6278 hasReactions flag is set to true only if the post contains reactions ↵Pradeep Murugesan2018-07-121-4/+9
| | | | | | | | (#9053)
* | Add telemetry for ServiceSettings.EnableEmailInvitations (#9105)Jason Blais2018-07-121-0/+1
| |
* | Enhance Log Output from Permanent Delete (#9044)Daniel Schalla2018-07-121-5/+17
| | | | | | | | | | | | | | use structured logging Missed Structured Log Using Err for Errors in Structured Logging
* | GH-8964 enable notification for text and preText fields in Attachments (#9069)Pradeep Murugesan2018-07-112-15/+95
| |
* | Deduplicating some code in app/status.go (#9095)Jesús Espino2018-07-111-17/+3
| |
* | Merge branch 'plugins-2'JoramWilander2018-07-1030-2718/+849
|\ \
| * | Don't panic if plugin manifest does not have settings (#9086)Joram Wilander2018-07-101-2/+4
| | |
| * | Adding ability for plugin system to respect the defaults listed in the ↵Christopher Speller2018-07-093-18/+26
| | | | | | | | | | | | plugin manifest. (#9066)
| * | Merge branch 'master' into plugins-2JoramWilander2018-07-078-11/+196
| |\ \
| * | | First batch of new plugin api methods (#9022)Daniel Schalla2018-07-063-9/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update api mocks Generated new hooks ChannelHasJoinedChannel Implementation User Left Team/Channel Hook; User Joined Team Hook Implementation Update RPC Client and Mocks gofmt go tests fix Add Config API Methods codegne Add Channel Has Been Created Hook Fix ChannelHasBeenCreated hook fix missing context param fix duplicate hooks; remove redudandcy
| * | | MM-10703 Adding blank request context to plugin hooks for future use. (#9043)Christopher Speller2018-07-064-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding blank request context to plugin hooks for future use. * Rename RequestContext to Context * Adding context to ServeHTTP and ExecuteCommand * Fixing import cycle in test.
| * | | Add back enable/disable WS events (#9052)Joram Wilander2018-07-052-0/+18
| | | |
| * | | MM-11029 Adding plugin logging functionality. (#9034)Christopher Speller2018-07-031-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Capturing stdout, stderr of plugins in logs. * Cleanup go-plugin debug logs. * Adding logging to plugin API * Generating mocks. * godoc convention
| * | | Merge branch 'master' into plugins-2JoramWilander2018-06-308-31/+255
| |\ \ \
| * \ \ \ Merge branch 'master' into plugins-2JoramWilander2018-06-279-8/+392
| |\ \ \ \
| * | | | | MM-9674 Add plugin API for publishing custom WebSocket events (#8999)Joram Wilander2018-06-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add plugin API for publishing custom WebSocket events * Add clearer payload comment * Update comment
| * | | | | MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)Christopher Speller2018-06-2527-2702/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving plugins to use hashicorp go-plugin. * Tweaks from feedback.
* | | | | | Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-1013-12/+368
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | release-5.1-daily-merge-20180710
| * | | | fix TestInvitePeopleProvider test (#9084)Carlos Tadeu Panato Junior2018-07-101-0/+6
| | | | |
| * | | | MM-11229: Fix invite people slash command and add test case. (#9074)George Goldberg2018-07-102-0/+44
| | | | |
| * | | | MM-11227: Fix group msg slash command. (#9070)George Goldberg2018-07-103-4/+98
| | | | |
| * | | | MM-11120 Adding setting to disable email invitations and rate limiting. (#9063)Christopher Speller2018-07-104-4/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding setting to disable email invitations. * Adding a setting and rate limiting for email invite sending. * Modifying email rate limit to 20/user/hour * Adding EnableEmailInvitations to client side config and command.
| * | | | MM-11174: Fix /msg slash command. (#9059)George Goldberg2018-07-102-0/+38
| | | | |
| * | | | MM-11194: Fix channel header slash command. (#9057)George Goldberg2018-07-083-4/+118
| | | | |
* | | | | Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-063-9/+29
|\| | | | | | | | | | | | | | | | | | | release-5.1-daily-merge-20180706
| * | | | MM-11106: Allow systeadmin webook to post to read only town square. (#9051)George Goldberg2018-07-061-1/+10
| | | | |
| * | | | MM-10766 - Replacing default profile image font (#8955)Asaad Mahmood2018-07-052-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updating default profile pic font * Updating profile image font * Updating test * Use new default font if configured for old one * Update OFL.txt
* | | | | MM-10603: Ignore Redirects and Other Changes when Displaying Link Previews ↵Declan Freeman-Gleason2018-07-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#9025) * Don't use redirected URL in link preview. * Only show preview if OG data is provided.
* | | | | Add ability to bulk import emoji (#9048)Joram Wilander2018-07-052-1/+156
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ability to bulk import emoji * Improve error handling * Update test config
* | | | Make sure diagnostic ID is loaded before client config. (#9032)George Goldberg2018-07-031-1/+3
| | | |
* | | | Disable Gfycat by default during Beta and move default keys to server (#9027)Jason Blais2018-07-031-0/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Update default.json * Update diagnostics.go * Added default Gfycat API credentials to server * Fixed default Gfycat credentials
* | | redirect, vs. proxy, 80->443 without LE enabled (#9020)Jesse Hallam2018-06-291-8/+16
| | | | | | | | | The code incorrectly got refactored to proxy instead of forward, deviating from the behaviour when LE is enabled.
* | | Make import compatible with scheme-roles. (#9028)George Goldberg2018-06-292-6/+162
| | | | | | | | | | | | | | | This doesn't introduce new fields as we would then break backwards compatability with old "roles" fields. We can add custom fields if/when we go to "version 2" of the bulk import format.
* | | add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-281-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update e.json string names and remove console log reorder variables update db.setConnMaxLifetime to take in *settings.MaxLifetimeConns Add MaxLifetimeConns to test Update variable names like MaxLifetimeConns to ConnMaxLifetimeMilliseconds Update time passed to SetConnMaxLifetime Revert "Update time passed to SetConnMaxLifetime" This reverts commit dc1c1b6d5a6404d4ee11c65d4756c19f9316794f. update en.json Update supplier_test.go and docker.go ConnMaxLifetimeMilliseconds to 3600000