summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* PLT-6451 Migrate installed_oauth_app.jsx to be pure and use Redux (#7190)n1aba2017-08-188-49/+294
| | | | | | * Migrate installed_oauth_app.jsx to be pure and use Redux, add test * Fix behavior for the error case
* PLT-7397 Added loadImage function instead of Image.prototype.load (#7184)Harrison Healey2017-08-183-43/+46
|
* Rename SAML in the System Console to SAML 2.0 + access token string fixes ↵Jason Blais2017-08-184-14/+14
| | | | | | | | | | | | (#7182) * Update en.json * Update en.json * Update admin_sidebar.jsx * Update saml_settings.jsx
* PLT-6443 Migrate add_oauth_app.jsx to be pure and use Redux (#7232)n1aba2017-08-186-62/+762
| | | | | | * Migrate add_oauth_app.jsx to be pure and use Redux, add tests * Remove unused flux code for OAuthApps
* [PLT-3377] Open up a shortcuts dialog instead of printing help text (#7064)Saturnino Abril2017-08-1815-244/+561
| | | | | | | | | | | | | | | | | | * open up a shortcuts dialog instead of printing help text * Updating UI for keyboard shortcuts modal * update PR per PLT-7284 * fix typo error * fix mixed up shortcut keys * move to client side * fix shortcuts list, remove unused function and revert server side code for autocompletion * remove quick team switcher
* Updating server dependancies. (#7246)Christopher Speller2017-08-17400-11804/+45303
|
* webhook merge fix (#7250)Chris2017-08-172-1/+18
|
* Fixing bad merge (#7247)Corey Hulen2017-08-171-2/+2
|
* Merge branch 'release-4.1'Christopher Speller2017-08-1760-1941/+2200
|\
| * PLT-7408 Move webhook handling into api4 package to fix EnableAPIv3 config ↵Joram Wilander2017-08-163-52/+53
| | | | | | | | | | | | | | | | setting (#7219) * Move webhook handling into api4 package to fix EnableAPIv3 config setting * Fix unit test
| * translations PR 20170814 (#7210)enahum2017-08-1527-1813/+1852
| |
| * [PLT-7180] Fix delete/edit not showing on DotMenu at parent post of RHS (#7214)Saturnino Abril2017-08-151-0/+9
| | | | | | | | | | | | * fix delete/edit not showing on DotMenu at parent post of RHS * remove unnecessary shouldComponentUpdate
| * disable intermittently failing test at TestGetAllTeams temporarily (#7211)Saturnino Abril2017-08-151-2/+4
| |
| * PLT-7398 Removed flex-basis from search box (#7204)Harrison Healey2017-08-151-2/+0
| |
| * PLT-7375: Email batching not on by default for accounts that have never ↵Jonathan2017-08-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touched their email settings (#7206) * PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference * PLT-7375: Reverting 4cf316fcd * PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference * PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail * PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail * PLT-7375: Reverted accidental changes to config * PLT-7375: Manually fixing config.
| * Adding default of EN to localization store (#7208)Christopher Speller2017-08-151-1/+1
| |
| * [PLT-7342] Add function and tests to specifically determine @all & @channel ↵Saturnino Abril2017-08-123-1/+108
| | | | | | | | | | | | | | | | (#7181) * add function and tests to specifically determine @all & @channel * uodate per comments - regex and tests
| * PLT-7336: Fix team API endpoints.George Goldberg2017-08-112-3/+22
| |
| * PLT-6609: Fix hashtag highlighting of search results (#7175)George Goldberg2017-08-112-6/+23
| | | | | | | | | | | | * PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag * Fix bug that broke pre-release.
| * PLT-7323/PLT-7334 CSS fixes (#7155)Asaad Mahmood2017-08-113-4/+15
| | | | | | | | | | | | | | | | | | | | * PLT-7334 - Channel header cuts off list * PLT-7323 - Fixing alignment for attachments * PLT-7323 - Fixing close button for attachments * Changed header description to use margin instead of padding
| * Add character limit to channel header edit modal (#7179)Joram Wilander2017-08-112-7/+9
| |
| * PLT-7360 Adding SSE to compliance (#7165)Corey Hulen2017-08-112-21/+34
| | | | | | | | | | | | | | | | * Adding SSE to E20 * Fixing UI bug * Fixing loc strings
| * Update mattermost-redux to webapp-4.1 branch (#7170)Joram Wilander2017-08-112-3/+3
| |
| * Merge 4.0.3 into release-4.1 (#7169)Saturnino Abril2017-08-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix dm custom slash command regression (#7008) * point mattermost-redux to webapp-4.0 latest (#7040) * If login is using mobile respond with JSON object (#7030) * Allow regions to be set and honored for S3 driver. (#7010) (#7073) This is necessary for certain users where GetBucketLocation API is disabled using IAM policies. There is a field AmazonS3Region which we need to re-purpose and use to support this properly. Fixes https://github.com/mattermost/platform/issues/6999 * [PLT-7231/PLT-7306] Fix GitLab SSO failure with non-English locale and make config locales more forgiving (#7106) * make config locales more forgiving by assigning default values * fix error text * update per comment * Minor updates to team * Another team update
| * Fix arrow keys when viewing images (#7161)Joram Wilander2017-08-111-1/+2
| |
| * Fix pinned posts not updating when list empty (#7164)Joram Wilander2017-08-101-3/+7
| |
| * reset post attachments on post prop change (#7158)Chris2017-08-091-0/+1
| |
| * Update unit testJoramWilander2017-08-091-0/+4
| |
| * Another team updateJoramWilander2017-08-092-1/+22
| |
| * Minor updates to teamJoramWilander2017-08-084-11/+39
| |
* | Minor UI improvements (#7137)Asaad Mahmood2017-08-176-38/+78
| | | | | | | | | | | | | | | | | | | | | | | | * PLT-7303 - Fixing manage members button * Revert "PLT-7303 - Fixing manage members button" This reverts commit 7dcb68a8e333a2c95444d417ed9a244c9c30aa99. * PLT-7303 - Redesigning channel members popover * Updating font size and positioning
* | PLT-7302: Aggregate Elasticsearch indexes over a certain age. (#7224)George Goldberg2017-08-1712-54/+187
| | | | | | | | | | | | | | | | | | * PLT-7302: Aggregate Elasticsearch indexes over a certain age. This is done by a scheduled daily job, in order to keep the shard count to a sensible level in Elasticsearch. * Use map[string]string instead of StringMap
* | set ephemeral message ("message deleted") without ("Only visible to you") ↵Saturnino Abril2017-08-173-1/+715
| | | | | | | | visible to users other than the owner (#7201)
* | PLT-7407: Back-end plugin mechanism (#7177)Chris2017-08-1633-1/+2163
| | | | | | | | | | | | | | | | | | | | | | | | * begin backend plugin wip * flesh out rpcplugin. everything done except for minor supervisor stubs * done with basic plugin infrastructure * simplify tests * remove unused test lines
* | Fixing licensing (#7226)Corey Hulen2017-08-161-1/+1
| |
* | PLT-6079 Adding leader election (#7105)Corey Hulen2017-08-164-1/+11
| |
* | PLT-6226 Fixing races with licensing (#7213)Corey Hulen2017-08-1636-361/+403
| | | | | | | | | | | | | | | | | | | | * PLT-6226 Fixing races with licensing * Fixing build issue * Fixing licensing issue * removing commented code
* | PLT-7353 Fixed being unable to use quotes in links (#7171)Harrison Healey2017-08-162-3/+3
| |
* | PLT-7368: Don't clear search box on ESC in Chrome. (#7215)George Goldberg2017-08-162-3/+9
| |
* | Add note that users can be searched by token ID in the Users page (#7222)Jason Blais2017-08-163-4/+4
| | | | | | | | | | | | | | | | * Update en.json * Update custom_integrations_settings.jsx * Update logs.jsx
* | PLT-1649: add response_url support for custom slash commands (#6739)Chris2017-08-1618-11/+562
| | | | | | | | | | | | | | | | | | | | * add response_url support for custom slash commands * pr suggestions * pr update / suggestion * test fix
* | add emoji to recently used section when reacting to a post in RHS (#7217)Saturnino Abril2017-08-162-2/+4
| |
* | Fix out-of-channel mentions for usernames with dashes (#7151)Joram Wilander2017-08-101-3/+5
| |
* | PLT-6358: Server HTTP client improvements (#6980)Chris2017-08-0919-98/+342
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * restrict untrusted, internal http connections by default * command test fix * more test fixes * change setting from toggle to whitelist * requested ui changes * add isdefault diagnostic * fix tests
* | when session id is invalid,the function "revokeSession" should return (#7127)KenmyZhang2017-08-091-0/+1
| |
* | PLT-7288: Allow CLI to delete teams with no channels. (#7135)George Goldberg2017-08-092-1/+23
| |
* | lint all the things (#7154)Chris2017-08-096-43/+22
| | | | | | | | | | | | * lint all the things * remove extra echo
* | PLT-7301: Removed props mutation that was causing JS error, now passing ↵Jonathan2017-08-092-9/+7
| | | | | | | | locale as a prop directly instead of fetching it out of the user object (#7162)
* | PLT-7206: Remove the "Delete Channel" option for private channels if you're ↵Jonathan2017-08-0915-104/+861
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the last channel member and policy setting restricts channel deletion (#7050) * PLT-7206: UI changes. Removed last user in channel loophole, refactored code to clean it up, added differentiated support for public and private channels, added unit tests. Still need to implement server-side checks * PLT-7206: All helper methods in channel_utils.jsx now accept the same three boolean variables in the same order and use the same boolean logic to check their values. * PLT-7206: Added unit tests for showManagementOptions(...) * PLT-7206: Fixed test case descriptions * Added unit tests for showCreateOption(...) * PLT-7206: Added unit tests for canManageMembers(...) * PLT-7206: Removed last person in channel loophole from server-side code * PLT-7206: Reverted config.json * PLT-7206: Fixed double negatives in unit test names * PLT-7206: PR feedback - Removed confusing comment and unused variable
* | testify (#7116)Chris2017-08-0870-92/+15434
| |