summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Updated marked to better handle underscores within words (#5093)Harrison Healey2017-01-171-1/+1
|
* PLT-5279: Show username for slash cmd notification. (#5091)George Goldberg2017-01-171-2/+0
|
* Fix error from quote in channel autocomplete (#5092)Joram Wilander2017-01-171-1/+1
|
* PLT-5210: Unify errors for invalid invite. (#5090)George Goldberg2017-01-171-2/+7
| | | | Now shows the same error regardless of whether the user is logged in or logged out.
* Add inbucket docker image to allow local and automated testing of emails (#4901)Carlos Tadeu Panato Junior2017-01-179-6/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | * add docker container for inbucket * Add way to get the emails using inbucket and add a test for reset password * add config setting to send emails * update TestEmailTest update * add another test and fix wrong assert * update per review fix lint change senders email * Revert config.json to default values for EmailSettings section * update test * add setup to make the test run
* PLT-5156 Fix Channel Switcher Console Errors. (#5058)George Goldberg2017-01-172-1/+13
|
* PLT-5211 Always emove deleted channels for LHS (#5087)Corey Hulen2017-01-171-1/+5
|
* Clear mention autocomplete if there is no regex match (#5085)Joram Wilander2017-01-161-0/+3
|
* Fix preferences not loading correctly (#5084)Joram Wilander2017-01-161-1/+5
|
* Discard outdated results in modal searches (#5082)Joram Wilander2017-01-166-8/+43
|
* Fix lodaing missing messages after search bug (#5080)Joram Wilander2017-01-163-18/+20
|
* PLT-4784 Display Sign In button spinner (#5046)Mika Andrianarijaona2017-01-162-7/+25
| | | | | | | | | | | | * PLT-4784 Display Sign In button spinner When the user clicks the Sign In button, display a spinner on the left fixes #4973 * Replace "Sing in..." by "Signing in..." * fix: replace ternary with if block
* PLT-5173 fixing javascript error when creating DM on Android (#5077)Corey Hulen2017-01-161-1/+9
|
* PLT-5134 removing the async sending from update user (#5078)Corey Hulen2017-01-161-2/+2
|
* PLT-5190 fixing javasscript error on RHS (#5068)Corey Hulen2017-01-161-5/+6
| | | | | | * PLT-5190 fixing javasscript error on RHS * PLT-5190 fixing javasscript error on RHS
* PLT-5228 Fix Clicking "Join Another Team" during WebRTC call hangs up the ↵enahum2017-01-161-1/+4
| | | | call (#5067)
* PLT-5149 Removing req for purge button to need license (#5066)Corey Hulen2017-01-151-4/+0
|
* PLT-5049 (Webapp) New Channel Members UI. (#5036)George Goldberg2017-01-1510-150/+543
| | | | | | | | | | | This replaces the existing Channel Members UI with one based on the Team Members UI, so that either a button, a role or a role with a menu can be displayed. Basic logic for which actions and roles are displayed is implemented, although this doesn't change behaviour or functionality at all, as that will come in later PRs. It does, however, add code to fetch the ChannelMember objects as that is necessary to provide the full set of actions and roles as intended.
* PLT-5221: Correct error when team description unchanged. (#5055)George Goldberg2017-01-152-81/+34
| | | Also replace all legacy i18n code in the changed file.
* Refactor and migrate more functions out of api into app package (#5063)Joram Wilander2017-01-1333-1360/+1634
|
* PLT-4938 Add app package and move logic over from api package (#4931)Joram Wilander2017-01-1385-2997/+3368
| | | | | | | | | | * Add app package and move logic over from api package * Change app package functions to return errors * Move non-api tests into app package * Fix merge
* PLT-5025: Fix scroll to bottom delay loading channel. (#5056)George Goldberg2017-01-131-0/+5
|
* add error page on root.html (#4887)Erik2017-01-131-0/+45
|
* Register the same language aliases as Rouge (#5040)Jazz2017-01-132-34/+46
| | | This allows the use of the same aliases as GitLab.
* PLT-5050 (Server). API to update channel member roles. (#5043)George Goldberg2017-01-134-1/+153
| | | Implements API reference proposal mattermost-api-reference:#66.
* GH-4907 Move Client.updatePost call into an action (#5045)Mika Andrianarijaona2017-01-132-10/+18
| | | | | | | | | | | | | | * move Client.updatePost into an action Client.updatePost where called from components so they needed to be moved inside action and call that action from component instead fixes #4907 * move loadPost in updatePost callback * Add loadPosts call in updatePost action * Lint: remove trailing spaces
* PLT-4317: Fix Desktop App platform in sessions list. (#5048)George Goldberg2017-01-133-0/+16
| | | | Incidentally fixes displaying the Linux icon next to sessions on Linux at the same time.
* PLT-5238: Show error on execute invalid slash command. (#5057)George Goldberg2017-01-131-1/+8
|
* PLT-4449: Update channel creation placeholders. (#5059)George Goldberg2017-01-132-2/+4
|
* Merge branch 'release-3.6'Christopher Speller2017-01-1261-1525/+1782
|\
| * Fix ios Team Switch double tap (#5051)enahum2017-01-122-14/+20
| | | | | | | | | | | | * Fix ios Team Switch double tap * Removing check of the user agent
| * Fix slack link parsing for integrations without attachments (#5050)Joram Wilander2017-01-121-8/+12
| |
| * Fix enforcement text on MFA setup page (#5042)Joram Wilander2017-01-121-1/+1
| |
| * Reset unread counts for channels being switched to/away (#5037)Joram Wilander2017-01-101-0/+4
| |
| * Fixing DM channel emails (#5038)Christopher Speller2017-01-101-5/+8
| |
| * translations PR 20170110 (#5031)enahum2017-01-1022-863/+1023
| | | | | | | | | | | | * translations PR 20170110 * Demoting Dutch from beta to alpha
| * Use status cache for checking @here notifications (#5035)Joram Wilander2017-01-103-40/+48
| |
| * PLT-5191 - Filter box overlapping fix for IE (#5034)Asaad Mahmood2017-01-101-1/+5
| | | | | | | | | | | | * PLT-5191 - Filter box overlapping fix for IE * Updating flex value for direct divs
| * PLT-5204 Fix Team Sidebar empty tooltip (#5028)enahum2017-01-101-1/+1
| |
| * Stopped rerendering CreatePost/CreateComment when blurring textbox (#5026)Harrison Healey2017-01-102-8/+11
| |
| * Allow joining team from an invite before setting up MFA (#5022)Joram Wilander2017-01-091-1/+1
| |
| * Minor UI fixes (#5023)Asaad Mahmood2017-01-091-4/+6
| | | | | | | | | | | | * PLT-5207 - Enabling scroll in settings modal * PLT-5194 - Removing status indicator on mobile
| * Fixed onBlur being called when not given as a prop (#5024)Harrison Healey2017-01-091-1/+4
| |
| * Allow resetting password regardless of signin/signup settings (#5025)Joram Wilander2017-01-091-4/+0
| |
| * SAML help text improvement (#5003)Christopher Speller2017-01-092-3/+3
| |
| * PLT-5179 - Fixing modal overflow for autocomplete (#5002)Asaad Mahmood2017-01-095-53/+39
| | | | | | | | | | | | * PLT-5179 - Fixing modal overflow for autocomplete * PLT-5171 - Fixing search bar popover behaviour
| * Reorganize stats on system statistics page (#5007)Joram Wilander2017-01-092-126/+190
| |
| * Don't sanitize company name out of license (#5001)Joram Wilander2017-01-091-1/+0
| |
| * PLT-5151 Show jewel with only mentions on mobile (#5004)enahum2017-01-091-3/+1
| |
| * Slack format for Slash command messages (#4999)Zeger-Jan van de Weg2017-01-093-55/+69
| | | | | | | | | | | | | | | | | | | | | | | | * Slash commands accept Slack format Until this commit the slash commands only accepted 'text' properties. For better styling however, Slack formatting support was added. However, ephemeral messages are not supported, and only text will be displayed. * Allow emphemeral Slack messages