Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 1 | -8/+8 | |
| | | | | | ||||||
| * | | | | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 2 | -0/+59 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merging from master | =Corey Hulen | 2015-10-19 | 2 | -1/+14 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Fixing merge | =Corey Hulen | 2015-10-16 | 4 | -22/+52 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 3 | -13/+13 | |
| | | | | | | | | ||||||
* | | | | | | | | Updating mattermost logo | Asaad Mahmood | 2015-10-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
* | | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-22 | 2 | -12/+8 | |
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the UI for the active item in the nav - Updating the UI for drag and drop - Fixing z-index for date selector | |||||
* | | | | | | | Changed markdown renderer to only parse emoticons twice | hmhealey | 2015-10-22 | 2 | -1/+15 | |
| | | | | | | | ||||||
* | | | | | | | Fixed improperly quoted html attributes for emoticons | hmhealey | 2015-10-22 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1135 from trashcan/PLT-521 | Harrison Healey | 2015-10-22 | 1 | -2/+4 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | PLT-521: Fix emoji with underscores | |||||
| * | | | | | | Pass eslint tests | Pat Lathem | 2015-10-21 | 1 | -3/+3 | |
| | | | | | | | ||||||
| * | | | | | | Missing semicolon | Pat Lathem | 2015-10-21 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Remove stray emoticons.jsx import | Pat Lathem | 2015-10-21 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Add a call to doFormatText inside of the markdown paragraph handler | Pat Lathem | 2015-10-21 | 1 | -0/+3 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Add stop button to stop animated gifs | Florian Orben | 2015-10-21 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | PLT-616: Enable playing of animated GIF in thumbnails and preview | Florian Orben | 2015-10-21 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1100 from girishso/wink_emoji | Joram Wilander | 2015-10-20 | 1 | -0/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-699: translate ;) to wink emoji | |||||
| * | | | | | translate ;) to wink emoji | Girish S | 2015-10-18 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Handle window resize events in React way | Antti Ahti | 2015-10-20 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling. See http://facebook.github.io/react/tips/dom-event-listeners.html | |||||
* | | | | | | Merge pull request #1114 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Ui improvements | |||||
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-19 | 1 | -0/+12 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | ui-improvements | |||||
| * | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-19 | 1 | -2/+2 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 2 | -0/+59 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-235 Implement outgoing webhooks. | |||||
| * | | | | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -0/+59 | |
| |/ / / | ||||||
* | | | | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 1 | -0/+12 | |
|\ \ \ \ | |/ / / |/| | | | PLT-554 Small refactor of websocket code on client and server | |||||
| * | | | Fix typing socket constant | JoramWilander | 2015-10-16 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 1 | -0/+12 | |
| | |/ | |/| | ||||||
* / | | Updated Email Check Regex to RFC5322 Standard | Joel Vasallo | 2015-10-16 | 1 | -1/+2 | |
|/ / | ||||||
* | | Merge pull request #1054 from stasvovk/PLT-637 | Christopher Speller | 2015-10-16 | 2 | -14/+22 | |
|\ \ | | | | | | | PLT-638: added display tab under account settings. added 24h time option | |||||
| * \ | Merge remote-tracking branch 'upstream/master' into PLT-637 | Stas Vovk | 2015-10-16 | 4 | -2/+28 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx | |||||
| * | | | fixed style guide error | Stas Vovk | 2015-10-15 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | added display tab under account settings. added 24h time option | Stas Vovk | 2015-10-14 | 2 | -14/+22 | |
| | | | | ||||||
* | | | | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 2 | -8/+20 | |
|\ \ \ \ | |_|/ / |/| | | | Added an initial call to get all user preferences on page load | |||||
| * | | | Added an initial call to get all user preferences on page load | hmhealey | 2015-10-15 | 2 | -8/+20 | |
| | |/ | |/| | ||||||
* / | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last message | Florian Orben | 2015-10-15 | 1 | -0/+10 | |
|/ / | ||||||
* | | Multiple UI Improvements | Asaad Mahmood | 2015-10-15 | 1 | -0/+4 | |
| | | ||||||
* | | Merge pull request #1057 from hmhealey/plt520 | Christopher Speller | 2015-10-15 | 1 | -0/+12 | |
|\ \ | | | | | | | PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap | |||||
| * | | Updated More Direct Channels modal and converted it to ReactBootstrap | hmhealey | 2015-10-14 | 1 | -0/+12 | |
| |/ | ||||||
* / | Don't auto-add http:// to mailto: and ftp: markdown links | Florian Orben | 2015-10-14 | 2 | -2/+2 | |
|/ | ||||||
* | Multiple UI Improvements | Asaad Mahmood | 2015-10-14 | 1 | -0/+6 | |
| | ||||||
* | Merge pull request #968 from hmhealey/plt322 | Harrison Healey | 2015-10-13 | 3 | -1/+85 | |
|\ | | | | | PLT-322 Updated Direct Messages menu | |||||
| * | Removed Preference.AltId | hmhealey | 2015-10-13 | 3 | -20/+18 | |
| | | ||||||
| * | Fixed edge cases with leaving a direct channel while viewing that channel | hmhealey | 2015-10-13 | 1 | -0/+1 | |
| | | ||||||
| * | Renamed show_hide preference to show | hmhealey | 2015-10-13 | 2 | -3/+7 | |
| | | ||||||
| * | Changed direct messages channels so users can show/hide them | hmhealey | 2015-10-13 | 2 | -0/+37 | |
| | | ||||||
| * | Changed direct channels in the sidebar to be displayed based on user preferences | hmhealey | 2015-10-13 | 3 | -0/+44 | |
| | | ||||||
* | | Revert "Modified markdown lexer to not break up words written in snake_case" | hmhealey | 2015-10-13 | 2 | -39/+8 | |
| | | | | | | | | This reverts commit 787d2ef7bca7f411b18d1d13561d61d7e95c81a7. | |||||
* | | Merge pull request #1026 from asaadmahmoodspin/master | Joram Wilander | 2015-10-13 | 1 | -0/+1 | |
|\ \ | |/ |/| | Fixing code block markdown | |||||
| * | Fixing code block markdown | Asaad Mahmood | 2015-10-13 | 1 | -0/+1 | |
| | | ||||||
* | | Merge pull request #987 from hmhealey/plt521 | Joram Wilander | 2015-10-13 | 2 | -8/+39 | |
|\ \ | |/ |/| | PLT-521 Modified markdown lexer to not break up words written in snake_case |