summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* PLT-3143 Added serverside code for custom Emoji (#3311)Harrison Healey2016-06-1418-5/+1538
| | | | | | | | | | | | | | * Added model objects for emoji * Added database tables for emoji * Added settings for custom emoji * Added serverside APIs and unit tests for custom emoji * Added additional validation to catch duplicate emoji names earlier on * Added additional validation to prevent users from adding emoji as another user
* Made error message clearer (#3318)David Lu2016-06-142-3/+9
|
* Require indentation for multiline list items (#3326)Harrison Healey2016-06-142-6/+5
|
* Merge branch 'release-3.1'JoramWilander2016-06-1329-137/+252
|\ | | | | | | | | Conflicts: webapp/components/create_comment.jsx
| * PLT-3270 Comment out max file size setting in system console (#3324)Joram Wilander2016-06-132-21/+22
| | | | | | | | | | | | * Comment out max file size settting in system console * Remove pending post after successful create post request
| * Adding DB schema version to CLI (#3315)Corey Hulen2016-06-131-0/+1
| |
| * Stopped trimming passwords on login (#3304)Harrison Healey2016-06-101-2/+2
| |
| * Correctly set defaults for all LDAPSettings in the config (#3301)Joram Wilander2016-06-091-24/+64
| |
| * Add server restart note to LDAP sync setting (#3303)jasonblais2016-06-092-2/+2
| | | | | | | | | | | | * Add server restart note to LDAP sync setting * Add server restart note to LDAP sync setting
| * PLT-3254 Javascript error and can't login with Spanish Client language (#3298)enahum2016-06-091-1/+1
| |
| * PLT-3236 Click in little x for admin console localization settings causes ↵enahum2016-06-093-0/+5
| | | | | | | | error (#3292)
| * PLT-3257 Fix Team Statistics (#3290)enahum2016-06-092-12/+12
| |
| * Fixing attachment in RHS root post for compact view (#3289)Asaad Mahmood2016-06-092-4/+5
| | | | | | | | | | | | * Fixing attachment in RHS root post for compact view * Improving spacing for mentions
| * Join team correctly when signing up with LDAP (#3287)Joram Wilander2016-06-071-6/+28
| |
| * Lock Javascript driver to 3.1 branch (#3277)Harrison Healey2016-06-071-1/+1
| |
| * Changed default LocalizationSettings.AvailableLocales to include all locales ↵Harrison Healey2016-06-072-1/+12
| | | | | | | | (#3280)
| * PLT-3203 Commenting on the RHS while in permalink view makes the message not ↵enahum2016-06-075-7/+13
| | | | | | | | show up in the RHS (#3282)
| * Properly removed hashtags and at mentions inside of markdown links (#3283)Harrison Healey2016-06-071-1/+1
| |
| * Auto join teams if coming from team sign-up page to login for GitLab (#3284)Joram Wilander2016-06-075-44/+67
| |
| * PLT-3215 Moving custom branding in admin console (#3286)Corey Hulen2016-06-071-10/+17
| |
| * Bumping version to: 3.1.0-rc1Mattermost Build2016-06-061-0/+1
| |
* | PLT-3244 On Password Reset page, an imprecise error message is displayed (#3295)enahum2016-06-101-1/+3
| |
* | PLT-2058 Debugging incoming web hook content (#3150)Martin Schenck2016-06-107-11/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-2058 Debugging incoming web hook content This change debugs contents of incoming webhooks using l4g. The problem is that in order to debug the request body, it neads to be read. And a Reader can only be read once. Hence, the body is only read for Debugging if it is actually enabled. Furthermore, a new reader is created from the content of the old reader in order for the rest of the method to work as usual (with or without debugging). The debug statement is wrapped in a closure, so that the content is only copied if Debug is actually enabled. It is not possible to return `(string, string)` from the closure to `l4g.Debug()`. That is the reason the debugging is not done with `=%v`, but the translations strings end with a space. I tested the change with a `application/json` HTTP header as well as `payload=` The debug method is extracted into util/log.go in order to be re-usable for debugging `io.Reader` * Added a config flag to turn off incoming webhook debugging Setting `EnableWebhookDebugging` to false in the `config.json` will disable the printing of the content of incoming webhooks to the console * Defaulting webhook debugging to true * Added the setting of debugging incoming webhooks to the system console
* | Scrolling fixes (#3200)samogot2016-06-102-8/+5
| | | | | | | | | | | | | | | | | | * scrolling fixes: - jumps on free scroll when somebody posts a new message (and old one disappears at top) - jumps on closing RHS (no compensation of resize) - scroll blinking on opening/closing RHS (delay before resize compensation) * fix scroll slipping up on multiple open/close RHS in case when (this.refs.postlist.offsetHeight % Constants.SCROLL_PAGE_FRACTION === 0)
* | PLT-3156 Typo in 'Edit Nickname' message when nickname is set through login ↵Anthony M. Powers2016-06-102-1/+2
| | | | | | | | | | | | | | | | | | provider (#3204) * Fixed a typo to an error message regarding editing an account field handled by a login provider. (PLT-3156) * Added 'field_handled_externally' to the en language file. Other languages are needed.
* | CLI: invite user by email - missing siteURL in email (#3297)Thomas Balthazar2016-06-102-11/+27
| |
* | daily translations 20160609 (#3305)enahum2016-06-102-22/+22
| |
* | Focus search text input when opening "Direct Messages" modal (#3231)Kevyn Bruyere2016-06-101-0/+4
| |
* | PLT-3221 Remove async call to get posts when creating a comment and editing ↵enahum2016-06-096-26/+33
| | | | | | | | | | a post (#3300) PLT-3203 Commenting on the RHS while in permalink view makes the message not show up in the RHS
* | PLT-3094 - Fixing autocomplete and image modal scrolling on mobile (#3279)Asaad Mahmood2016-06-094-6/+16
| |
* | daily translations 20160608 (#3296)enahum2016-06-096-50/+50
| |
* | daily translations 20160607 (#3288)enahum2016-06-077-18/+22
| |
* | Fixing test-markdown-lists.md (#3281)Harrison Healey2016-06-071-2/+2
| |
* | PLT-2406 Add "Database:" to Mattermost About Dialog (#3261)Thomas Balthazar2016-06-073-0/+9
| | | | | | | | | | | | | | | | | | * Add "Database:" to Mattermost About Dialog The property has been named SQLDriverName to make a difference with the FileSettings DriverName. * Add missing string for 'Database' in i18n file
* | Removed deactivate method from User Settings tabs (#3271)Harrison Healey2016-06-073-30/+4
|/
* daily translations 20160606 (#3275)enahum2016-06-069-67/+271
|
* Update NOTICE.txt (#3274)lfbrock2016-06-061-0/+52
|
* Up the max preference store listeners (#3273)Joram Wilander2016-06-061-1/+1
|
* PLT-3163Commenting in the RHS while in permalink view (#3272)enahum2016-06-062-4/+0
|
* Update test-links.md (#3270)lfbrock2016-06-061-0/+1
|
* PLT-3056 Fix Unable to type quickly in post textbox in IE11 (#3249)enahum2016-06-065-18/+35
|
* System messages trigger notifications when user is mentioned (#3235)Joram Wilander2016-06-063-25/+36
|
* Removed placeholder text on channel switch modal (#3262)David Lu2016-06-066-6/+0
|
* Removed ESC (#3268)David Lu2016-06-061-1/+1
|
* PLT-3185 Added support for DMs in Channel Switcher (#3260)David Lu2016-06-064-4/+41
| | | | | | * Added support for DMs * Checked username beginning characters
* Added error when both session and local storage are unusable (#3263)David Lu2016-06-063-7/+23
|
* PLT-3114 Moved preview collapse out of pre-release features (#3206)Joram Wilander2016-06-0614-43/+353
| | | | | | | | | | * Added user setting to auto collapse image previews * Added slash commands for collapsing/expanding image previews * Added translation strings for collapse setting * Add default props for preview collapse setting
* Remove data source replica from system console UI (#3267)Joram Wilander2016-06-061-26/+2
|
* PLT-2559 Always return successful when trying to join a channel that the ↵Harrison Healey2016-06-064-4/+97
| | | | | | | | | | user is already a member of (#3265) * Added unit tests for SqlChannelStore.GetMember * Fixed api routes for accessing channels by name when the name includes an underscore * Changed join channel API to always return successful when the user is already a member of the channel
* PLT-3101 Added message history (#3205)David Lu2016-06-066-26/+147
| | | | | | | | | | | | * Added message history * Minor logical changes * Fixed indexes resetting * Fixed double messages * Fixed resetting main history when RHS opened