Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Changed markdown text regex to not capture the final underscore on a word to ↵ | hmhealey | 2015-11-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | better match the original behaviour | |||||
| * | | | Changed markdown text regex to capture whitespace preceeding an underscore | hmhealey | 2015-11-06 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #1342 from hmhealey/plt761 | Joram Wilander | 2015-11-06 | 1 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | PLT-761 Removed required whitespace from before @mentions | |||||
| * | | | | Removed required whitespace from before @mentions | hmhealey | 2015-11-06 | 1 | -4/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #1341 from hmhealey/plt911 | Joram Wilander | 2015-11-06 | 1 | -1/+10 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-911 Fixed navigating search autocomplete with the keyboard | |||||
| * | | | | | Sorted channel suggestions be type before sorting by name | hmhealey | 2015-11-06 | 1 | -1/+10 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #1340 from mattermost/markdown-image-fixes | Joram Wilander | 2015-11-06 | 2 | -5/+8 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Markdown image fixes. | |||||
| * | | | | Fixing broken markdown images taking up too much space. Fixed unnessisary ↵ | Christopher Speller | 2015-11-06 | 2 | -5/+8 | |
| |/ / / | | | | | | | | | | | | | expantion of markdown images not in center channel. | |||||
* | | | | Merge pull request #1339 from mattermost/loading-forever-fix | Joram Wilander | 2015-11-06 | 1 | -5/+0 | |
|\ \ \ \ | | | | | | | | | | | Fixed loading forever on first page load | |||||
| * | | | | Fixed loading forever on first page load | Christopher Speller | 2015-11-06 | 1 | -5/+0 | |
| | | | | | ||||||
* | | | | | Merge pull request #1338 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-11-06 | 3 | -5/+32 | |
|\ \ \ \ \ | | | | | | | | | | | | | Updating UI for search autocomplete | |||||
| * | | | | | Updating UI for search autocomplete | Asaad Mahmood | 2015-11-06 | 3 | -5/+32 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #1337 from florianorben/attachments_rhs | Joram Wilander | 2015-11-06 | 2 | -1/+5 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Display slack attachments in RHS comment section | |||||
| * | | | | display slack attachments in RHS comment section | Florian Orben | 2015-11-06 | 2 | -1/+5 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #1336 from mattermost/lfbrock-patch-1 | Christopher Speller | 2015-11-06 | 1 | -4/+24 | |
|\ \ \ \ | |_|/ / |/| | | | Update CHANGELOG.md | |||||
| * | | | Update CHANGELOG.md | lfbrock | 2015-11-06 | 1 | -4/+24 | |
| |/ / | ||||||
* | | | Merge pull request #1326 from mattermost/it33-patch-2 | Joram Wilander | 2015-11-06 | 1 | -5/+24 | |
|\ \ \ | |/ / |/| | | Adding doc links | |||||
| * | | Fixed ESLint error | it33 | 2015-11-06 | 1 | -1/+1 | |
| | | | ||||||
| * | | Adding doc links | it33 | 2015-11-05 | 1 | -5/+24 | |
| | | | ||||||
* | | | Merge pull request #1335 from mattermost/triple-dot-fix | Joram Wilander | 2015-11-06 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | Fix user profile never updating properly | |||||
| * | | Fix user profile never updating properly | JoramWilander | 2015-11-06 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #1334 from mattermost/plt-121 | Joram Wilander | 2015-11-06 | 4 | -7/+171 | |
|\ \ \ | | | | | | | | | PLT-121 Fixing searching for quotations | |||||
| * | | | Fixing searching for quotations | Christopher Speller | 2015-11-06 | 4 | -7/+171 | |
| | | | | ||||||
* | | | | Merge pull request #1318 from mattermost/plt-1025 | Christopher Speller | 2015-11-06 | 2 | -16/+44 | |
|\ \ \ \ | | | | | | | | | | | PLT-1025 Make dots in tutorial intro clickable and always at the same spot | |||||
| * | | | | Use state for current screen in turotial intro | JoramWilander | 2015-11-05 | 1 | -5/+5 | |
| | | | | | ||||||
| * | | | | Make dots in tutorial intro clickable and always at the same spot | JoramWilander | 2015-11-05 | 2 | -16/+44 | |
| | | | | | ||||||
* | | | | | Merge pull request #1328 from mattermost/PLT-1016 | Christopher Speller | 2015-11-06 | 3 | -9/+38 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-1016 force logout on other browsers | |||||
| * | | | | | Fixing issue with safari private mode | =Corey Hulen | 2015-11-05 | 1 | -1/+5 | |
| | | | | | | ||||||
| * | | | | | PLT-1016 force logout on other browsers | =Corey Hulen | 2015-11-05 | 3 | -8/+33 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #1332 from mattermost/plt-560 | Christopher Speller | 2015-11-06 | 4 | -37/+66 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-560 Prevent SSO users from changing their email | |||||
| * | | | | | | Prevent SSO users from changing their email | JoramWilander | 2015-11-06 | 4 | -37/+66 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1333 from mattermost/GIT-888 | Christopher Speller | 2015-11-06 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | GIT-888 improving perf | |||||
| * | | | | | | GIT-888 improving perf | =Corey Hulen | 2015-11-06 | 1 | -0/+9 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #1331 from Tsynapse/patch-2 | Joram Wilander | 2015-11-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update to proxy_pass | |||||
| * | | | | | | Update to proxy_pass | Jason | 2015-11-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | Changed proxy_pass to the mattermost server rather than pointing at the nginx server(localhost) | |||||
* | | | | | | | Merge pull request #1327 from florianorben/PLT-857-2 | Joram Wilander | 2015-11-06 | 13 | -31/+585 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | PLT-857: Support `attachments` for Incoming Webhooks | |||||
| * | | | | | | remove max column size from 'props' | Florian Orben | 2015-11-06 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | fix alter table command for postgres | Florian Orben | 2015-11-06 | 2 | -1/+8 | |
| | | | | | | | ||||||
| * | | | | | | fix logging statement not to post nonsense | Florian Orben | 2015-11-06 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | remove two unused assignments | Florian Orben | 2015-11-05 | 2 | -2/+0 | |
| | | | | | | | ||||||
| * | | | | | | postgres needs another query to get table information... | Florian Orben | 2015-11-05 | 2 | -17/+8 | |
| | | | | | | | ||||||
| * | | | | | | PLT-857: Support for Incoming Webhooks - Try #2 | Florian Orben | 2015-11-05 | 10 | -41/+182 | |
| | | | | | | | ||||||
| * | | | | | | collapse text after 700 chars or 5 line breaks | Florian Orben | 2015-11-05 | 2 | -2/+60 | |
| | | | | | | | ||||||
| * | | | | | | attachments frontend | Florian Orben | 2015-11-05 | 7 | -0/+359 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1321 from hmhealey/plt911 | Joram Wilander | 2015-11-06 | 3 | -50/+125 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-911 Search autocomplete improvements | |||||
| * | | | | | | | Moved public and private channels into separate sections in the search ↵ | hmhealey | 2015-11-05 | 3 | -36/+74 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autocomplete | |||||
| * | | | | | | | Fixed search autocomplete click handling | hmhealey | 2015-11-05 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Changed search autocomplete to scroll when making a selection using the keyboard | hmhealey | 2015-11-05 | 1 | -13/+50 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #1325 from hmhealey/plt618 | Joram Wilander | 2015-11-06 | 2 | -52/+350 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-618 Ignore formatting markdown lists containing only one element | |||||
| * | | | | | | | Changed markdown lexer to ignore lists containing only one item | hmhealey | 2015-11-05 | 1 | -50/+54 | |
| | | | | | | | |