Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing unit tests | =Corey Hulen | 2016-01-09 | 1 | -1/+1 |
| | |||||
* | Fixing unit tests | =Corey Hulen | 2016-01-08 | 1 | -0/+4 |
| | |||||
* | partial fix for UI | =Corey Hulen | 2016-01-08 | 3 | -13/+30 |
| | |||||
* | Merge pull request #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 2 | -2/+133 |
|\ | | | | | PLT-1558 adding session length to config file | ||||
| * | Adding UI for session length settings | =Corey Hulen | 2016-01-05 | 1 | -1/+132 |
| | | |||||
| * | PLT-1558 adding session length to config file | =Corey Hulen | 2016-01-05 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1819 from hmhealey/plt1401 | Joram Wilander | 2016-01-06 | 1 | -3/+3 |
|\ \ | | | | | | | PLT-1401 Removed email regex | ||||
| * | | Removed email regex | hmhealey | 2016-01-06 | 1 | -3/+3 |
| | | | |||||
* | | | Removed temporary fix for old filenames that used absolute urls pointing to ↵ | hmhealey | 2016-01-06 | 3 | -26/+3 |
| | | | | | | | | | | | | the get file api | ||||
* | | | Changed Audio/Video preview to just display a file info when encountering a ↵ | hmhealey | 2016-01-06 | 4 | -78/+190 |
|/ / | | | | | | | file that cannot be played | ||||
* | | Merge pull request #1814 from mattermost/PLT-1485a | Christopher Speller | 2016-01-06 | 1 | -1/+8 |
|\ \ | | | | | | | PLT-1485 Adding last view channel sticky | ||||
| * | | PLT-1485 Adding last view channel sticky | =Corey Hulen | 2016-01-05 | 1 | -1/+8 |
| | | | |||||
* | | | [Fix #1669] Allow parameters in Content-Type of incoming webhook request | Alex Polozov | 2016-01-06 | 1 | -1/+2 |
| | | | | | | | | | | | | Mattermost currently does not allow optional parameters in the `Content-Type` of an incoming webhook request. Visual Studio Team Services's Slack integration sends its message with `Content-Type: application/json; charset=utf-8`, whereas Mattermost currently requires precisely `Content-Type: application/json`. This PR relaxes this check, looking only at the media part of the header. | ||||
* | | | Merge pull request #1802 from hmhealey/plt1449 | Christopher Speller | 2016-01-05 | 3 | -118/+184 |
|\ \ \ | |/ / |/| | | PLT-1449 Made Youtube previews stop when the current channel is changed | ||||
| * | | Make Youtube previews stop when the channel is changed | hmhealey | 2016-01-04 | 3 | -2/+21 |
| | | | |||||
| * | | Move Youtube preview into its own file | hmhealey | 2016-01-04 | 2 | -117/+164 |
| | | | |||||
* | | | Merge pull request #1810 from hmhealey/plt644 | Christopher Speller | 2016-01-05 | 1 | -4/+0 |
|\ \ \ | |_|/ |/| | | PLT-644 Updated about dialog | ||||
| * | | Updated about dialog | hmhealey | 2016-01-05 | 1 | -4/+0 |
| | | | |||||
* | | | Fixed issue where font would remain changed even after cancelling changes | Reed Garmsen | 2016-01-04 | 1 | -7/+13 |
|/ / | |||||
* | | Merge pull request #1801 from hmhealey/plt1602 | Christopher Speller | 2016-01-04 | 2 | -17/+35 |
|\ \ | | | | | | | PLT-1602 Fix ViewImageModal incorrectly assuming it has a file's info in certain cases | ||||
| * | | Fixed ViewImage modal to clear its loaded state when its file list changes | hmhealey | 2016-01-04 | 2 | -9/+19 |
| | | | |||||
| * | | Changed the ViewImageModal to only store info for the current image | hmhealey | 2016-01-04 | 1 | -8/+16 |
| |/ | |||||
* | | Merge pull request #1745 from mattermost/plt-1118 | Christopher Speller | 2016-01-04 | 10 | -243/+668 |
|\ \ | | | | | | | PLT-1118 Add ability to switch between SSO and email account | ||||
| * | | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 10 | -243/+668 |
| | | | |||||
* | | | Made links in help text open in a new tab | Reed Garmsen | 2016-01-04 | 3 | -3/+26 |
| |/ |/| | |||||
* | | Merge pull request #1785 from mattermost/plt-1492 | Corey Hulen | 2016-01-04 | 1 | -11/+14 |
|\ \ | | | | | | | PLT-1492 Fix default for teammate name display setting | ||||
| * | | Fix default for teammate name display setting | JoramWilander | 2015-12-28 | 1 | -11/+14 |
| | | | |||||
* | | | Merge pull request #1784 from mattermost/plt-1591 | Corey Hulen | 2016-01-04 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | PLT-1591 Fix appearance settings scroll bug | ||||
| * | | | Fix appearance settings scroll bug | JoramWilander | 2015-12-28 | 1 | -3/+6 |
| |/ / | |||||
* | | | Merge pull request #1800 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-01-04 | 5 | -25/+47 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2016-01-04 | 5 | -25/+47 |
| | | | | |||||
* | | | | Merge pull request #1769 from mattermost/PLT-1488 | Christopher Speller | 2016-01-04 | 2 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | PLT-1488 fixing error message from session revoke | ||||
| * | | | Fixing multi team issue | =Corey Hulen | 2015-12-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | PLT-1488 fixing error message from session revoke | =Corey Hulen | 2015-12-23 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #1787 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-03 | 1 | -1/+6 |
|\ \ \ \ | | | | | | | | | | | Improving spacing for bullet points. | ||||
| * | | | | Fixing bullets | Asaad Mahmood | 2015-12-28 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixing bullets | Asaad Mahmood | 2015-12-28 | 1 | -1/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1790 from hjf288/PLT-1587 | Corey Hulen | 2016-01-03 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | PLT-1587 - REGRESSION: Mattermost v1.3.0 System Console does not save Email Settings | ||||
| * | | | | Correct typo in email_settings.jsx that prevents enabling the 'Send push ↵ | Hjf288 | 2015-12-29 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | | | | notifications' option | ||||
* | | | | Update team_settings.jsx | Eric Sethna | 2015-12-30 | 1 | -1/+1 |
| | | | | | | | | | | | | help text for restrict domains | ||||
* | | | | Update team_general_tab.jsx | Eric Sethna | 2015-12-30 | 1 | -1/+1 |
|/ / / | | | | | | | help text for invite code in team settings | ||||
* | | | Merge pull request #1740 from hmhealey/plt730 | Joram Wilander | 2015-12-28 | 6 | -23/+224 |
|\ \ \ | | | | | | | | | PLT-730/PLT-731 Added remaining mobile UI V2 components | ||||
| * | | | Added theme styling to floating timestamp | hmhealey | 2015-12-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | Cleaned up floating post components | hmhealey | 2015-12-16 | 1 | -35/+54 |
| | | | | |||||
| * | | | Added scroll to bottom arrows for mobile | hmhealey | 2015-12-16 | 3 | -3/+42 |
| | | | | |||||
| * | | | Hid floating timestamp header on non-mobile | hmhealey | 2015-12-16 | 2 | -0/+6 |
| | | | | |||||
| * | | | Added DelayedAction class to use to handle stopping scrolling | hmhealey | 2015-12-16 | 3 | -2/+46 |
| | | | | |||||
| * | | | Added floating post timestamp | hmhealey | 2015-12-16 | 3 | -18/+111 |
| | | | | |||||
* | | | | Merge pull request #1755 from hmhealey/plt1108 | Joram Wilander | 2015-12-28 | 6 | -200/+254 |
|\ \ \ \ | | | | | | | | | | | PLT-1108 Refactored ViewImage modal and made it automatically play animated gifs | ||||
| * | | | | Changed 'Previewing' to 'Loading' in ViewImage modal | hmhealey | 2015-12-18 | 1 | -1/+1 |
| | | | | |