Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'release-1.2' | Christopher Speller | 2015-11-12 | 1 | -12/+7 |
|\ | |||||
| * | Remove unneed role | JoramWilander | 2015-11-11 | 1 | -2/+0 |
| | | |||||
| * | Remove unneed argument | JoramWilander | 2015-11-11 | 1 | -1/+1 |
| | | |||||
| * | Fix channel invite button on channel intro message and fix empty channel ↵ | JoramWilander | 2015-11-11 | 1 | -13/+10 |
| | | | | | | | | invite modal. | ||||
* | | Rename areStatesEqual to areObjectsEqual and make it more comprehensive and ↵ | JoramWilander | 2015-11-12 | 1 | -2/+92 |
| | | | | | | | | accurate. | ||||
* | | fix indentation to use tabs | Florian Orben | 2015-11-10 | 1 | -1/+1 |
| | | |||||
* | | Add latex support | Florian Orben | 2015-11-10 | 1 | -0/+9 |
|/ | | | | | | Adds latex highlighting support via https://www.npmjs.com/package/katex as requested in https://mattermost.uservoice.com/forums/306457-general/suggestions/10160757-add-latex-support | ||||
* | Merge pull request #1345 from hmhealey/plt983 | Harrison Healey | 2015-11-06 | 1 | -1/+1 |
|\ | | | | | PLT-983 Fix _emphasizing_ markdown text when it's not the start of the post | ||||
| * | 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 #1340 from mattermost/markdown-image-fixes | Joram Wilander | 2015-11-06 | 1 | -1/+1 |
|\ \ | | | | | | | Markdown image fixes. | ||||
| * | | Fixing broken markdown images taking up too much space. Fixed unnessisary ↵ | Christopher Speller | 2015-11-06 | 1 | -1/+1 |
| |/ | | | | | | | expantion of markdown images not in center channel. | ||||
* / | Updating UI for search autocomplete | Asaad Mahmood | 2015-11-06 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #1328 from mattermost/PLT-1016 | Christopher Speller | 2015-11-06 | 1 | -0/+1 |
|\ | | | | | PLT-1016 force logout on other browsers | ||||
| * | PLT-1016 force logout on other browsers | =Corey Hulen | 2015-11-05 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #1327 from florianorben/PLT-857-2 | Joram Wilander | 2015-11-06 | 1 | -0/+3 |
|\ \ | | | | | | | PLT-857: Support `attachments` for Incoming Webhooks | ||||
| * | | attachments frontend | Florian Orben | 2015-11-05 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #1321 from hmhealey/plt911 | Joram Wilander | 2015-11-06 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | PLT-911 Search autocomplete improvements | ||||
| * | | | Moved public and private channels into separate sections in the search ↵ | hmhealey | 2015-11-05 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | autocomplete | ||||
* | | | | 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 |
| | | | | |||||
| * | | | Cleaned up Markedown Lexer for eslint | hmhealey | 2015-11-05 | 1 | -62/+56 |
| | | | | |||||
| * | | | Copied part of the marked lexer into markdown.jsx | hmhealey | 2015-11-05 | 1 | -1/+298 |
| | | | | |||||
| * | | | Moved highlighting code out of markdown.jsx | hmhealey | 2015-11-05 | 2 | -51/+54 |
| | |/ | |/| | |||||
* | | | Switching to mp3 | =Corey Hulen | 2015-11-05 | 1 | -1/+1 |
| | | | |||||
* | | | PLT-1040 changing ding | =Corey Hulen | 2015-11-05 | 1 | -1/+1 |
|/ / | |||||
* / | Only allow one ding every 3s | JoramWilander | 2015-11-05 | 1 | -1/+5 |
|/ | |||||
* | Add constant form 'mention' | JoramWilander | 2015-11-05 | 1 | -0/+3 |
| | |||||
* | Merge pull request #1308 from asaadmahmoodspin/plt-960 | Christopher Speller | 2015-11-05 | 2 | -15/+35 |
|\ | | | | | Plt 960 - Moving code themes into custom themes | ||||
| * | Removed old code theme selector and fixed some issues | Reed Garmsen | 2015-11-04 | 2 | -16/+14 |
| | | |||||
| * | Moved code theme picker into custom theme subarea | Reed Garmsen | 2015-11-04 | 1 | -1/+23 |
| | | |||||
* | | Merge pull request #1298 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-04 | 1 | -1/+1 |
|\ \ | |/ |/| | Multiple UI Improvements | ||||
| * | Making tutorial buttons and tutorial circles consistent | Asaad Mahmood | 2015-11-04 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1287 from hmhealey/plt382 | Christopher Speller | 2015-11-04 | 2 | -3/+5 |
|\ \ | |/ |/| | PLT-382 Refactored some modals to use React-Bootstrap and added a confirmation when discarding theme changes | ||||
| * | Moved InviteMemberModal to be controlled by a store | hmhealey | 2015-11-02 | 2 | -5/+4 |
| | | |||||
| * | Ported ConfirmModal and InviteMemberModal to React-Bootstrap | hmhealey | 2015-11-02 | 1 | -0/+3 |
| | | |||||
* | | Properly escaped mention keywords and search terms when formatting them | hmhealey | 2015-11-04 | 1 | -2/+6 |
| | | |||||
* | | Allowed @mentions to follow any non-alphanumeric character instead of just ↵ | hmhealey | 2015-11-04 | 1 | -1/+1 |
| | | | | | | | | whitespace | ||||
* | | Removed unused text formatting functions | hmhealey | 2015-11-04 | 1 | -16/+0 |
| | | |||||
* | | Merge pull request #1289 from mattermost/plt-516-2 | Joram Wilander | 2015-11-04 | 3 | -6/+18 |
|\ \ | | | | | | | PLT-516 Part 1 of performance fixes for large teams | ||||
| * | | Minor changes to statuses client code | JoramWilander | 2015-11-03 | 1 | -1/+3 |
| | | | |||||
| * | | Multiple fixes to major performance issues with teams with 50+ users | JoramWilander | 2015-11-03 | 3 | -6/+16 |
| | | | |||||
* | | | Merge pull request #1286 from hmhealey/plt973 | Christopher Speller | 2015-11-04 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | PLT-973 Re-enabled Markdown tables | ||||
| * | | | Re-enabled Markdown tables | hmhealey | 2015-11-03 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #1279 from rgarmsen2295/plt-743 | Joram Wilander | 2015-11-04 | 1 | -0/+21 |
|\ \ \ | | | | | | | | | PLT-741/743 Adds additional checks when sorting channels/teams by display name | ||||
| * | | | Functionalized code | Reed Garmsen | 2015-11-02 | 1 | -0/+21 |
| | |/ | |/| | |||||
* | | | Merge pull request #1290 from mattermost/fixed-embed-height | Corey Hulen | 2015-11-03 | 1 | -0/+15 |
|\ \ \ | | | | | | | | | PLT-991 Fixing height of embeded images | ||||
| * | | | Fixing height of embeded images | Christopher Speller | 2015-11-03 | 1 | -0/+15 |
| |/ / |