Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1853 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-13 | 5 | -6/+20 |
|\ | | | | | Adding away icon and changing online and offline icons | ||||
| * | Adding away icon and changing online and offline icons | Asaad Mahmood | 2016-01-11 | 5 | -6/+20 |
| | | |||||
* | | Merge pull request #1850 from mattermost/preview-mode | Corey Hulen | 2016-01-13 | 1 | -1/+1 |
|\ \ | | | | | | | Documenting how Preview Mode is disabled | ||||
| * | | Update email_settings.jsx | it33 | 2016-01-09 | 1 | -1/+1 |
| | | | |||||
| * | | Documenting how Preview Mode turns off | it33 | 2016-01-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1876 from mattermost/release-1.4 | Corey Hulen | 2016-01-12 | 1 | -1/+3 |
|\ \ \ | | | | | | | | | Release 1.4 RC2 | ||||
| * | | | Add removal comments | JoramWilander | 2016-01-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Support old oauth routes | JoramWilander | 2016-01-12 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge pull request #1830 from rgarmsen2295/plt-1599 | Joram Wilander | 2016-01-12 | 1 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | PLT-1599 Help text in invite member modal now reflects the default channel name | ||||
| * | | | | Help text in invite member modal now updates according to town-square ↵ | Reed Garmsen | 2016-01-07 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | display name | ||||
* | | | | | Merge pull request #1852 from mattermost/PLT-1608 | Joram Wilander | 2016-01-12 | 1 | -1/+1 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-1608 Upgrading logging package | ||||
| * | | | | Upgrade logging package | =Corey Hulen | 2016-01-11 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Adding push-test.mattermost.com | it33 | 2016-01-11 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #1854 from hmhealey/plt1608 | Joram Wilander | 2016-01-11 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | PLT-1608 Fixed developer errors storing invalid error objects | ||||
| * | | | | Fixed developer errors storing invalid error objects | hmhealey | 2016-01-11 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #1849 from hmhealey/plt1578 | Corey Hulen | 2016-01-11 | 2 | -8/+36 |
|\ \ \ \ | |/ / / |/| | | | PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs | ||||
| * | | | Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs | hmhealey | 2016-01-11 | 2 | -8/+36 |
| | |/ | |/| | |||||
* | | | Merge pull request #1822 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-01-11 | 5 | -5/+13 |
|\ \ \ | | | | | | | | | Multiple UI Improvements | ||||
| * | | | Updating fix | Asaad Mahmood | 2016-01-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2016-01-07 | 5 | -5/+13 |
| | |/ | |/| | |||||
* | | | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 4 | -23/+71 |
|\ \ \ | | | | | | | | | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel | ||||
| * | | | Added a loading screen to ChannelMembersModal and made it pull all channel ↵ | hmhealey | 2016-01-07 | 1 | -13/+36 |
| | | | | | | | | | | | | | | | | members before rendering | ||||
| * | | | Made ChannelInviteModal pull all channel members before rendering | hmhealey | 2016-01-07 | 3 | -10/+35 |
| | | | | |||||
* | | | | Merge pull request #1828 from hmhealey/plt1397 | Joram Wilander | 2016-01-11 | 1 | -15/+6 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-1397/PLT-1580/PLT-1614 Fixed spacing around markdown lists and paragraphs | ||||
| * | | | Fixed spacing between paragraphs in a post | hmhealey | 2016-01-07 | 1 | -1/+4 |
| | | | | |||||
| * | | | Fixed vertical spacing between lists and paragraphs in post bodies | hmhealey | 2016-01-07 | 1 | -11/+3 |
| | | | | |||||
| * | | | Removed extra space below unordered lists | hmhealey | 2016-01-07 | 1 | -5/+1 |
| | |/ | |/| | |||||
* | | | Fixed FileUpload to properly unbind drag handlers when unmounted | hmhealey | 2016-01-08 | 1 | -0/+12 |
| | | | |||||
* | | | Removed ability to drag n' drop text; drag n' drop ui no longer appears when ↵ | Reed Garmsen | 2016-01-06 | 4 | -24/+30 |
|/ / | | | | | | | non-files are dragged | ||||
* | | 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 |
| | | |