Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merging | =Corey Hulen | 2016-01-15 | 1 | -3/+3 |
|\ | |||||
| * | Merge pull request #1894 from mattermost/release-1.4 | Corey Hulen | 2016-01-14 | 1 | -3/+3 |
| |\ | | | | | | | Release 1.4 | ||||
| | * | Encode url query properly for SSO switching | JoramWilander | 2016-01-14 | 1 | -3/+3 |
| | | | |||||
* | | | finishing up commands UI | =Corey Hulen | 2016-01-14 | 1 | -67/+249 |
| | | | |||||
* | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 20 | -83/+507 |
|\| | | |||||
| * | | Fix error message | JoramWilander | 2016-01-14 | 1 | -5/+10 |
| | | | |||||
| * | | Minor update to about modal | JoramWilander | 2016-01-14 | 1 | -4/+1 |
| | | | |||||
| * | | Added license validation and settings | JoramWilander | 2016-01-14 | 6 | -21/+329 |
| | | | |||||
| * | | Merge pull request #1855 from rgarmsen2295/plt-1006 | Corey Hulen | 2016-01-13 | 3 | -6/+43 |
| |\ \ | | | | | | | | | PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip | ||||
| | * | | Changed statistics to show usernames with an email tooltip | Reed Garmsen | 2016-01-11 | 3 | -6/+43 |
| | | | | |||||
| * | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-13 | 2 | -1/+2 |
| |\ \ \ | | | | | | | | | | | Adding away icon and changing online and offline icons | ||||
| | * | | | Adding away icon and changing online and offline icons | Asaad Mahmood | 2016-01-11 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | 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 #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 | ||||
| * | | | | | Adding push-test.mattermost.com | it33 | 2016-01-11 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #1849 from hmhealey/plt1578 | Corey Hulen | 2016-01-11 | 1 | -8/+21 |
| |\ \ \ \ | | |_|_|/ | |/| | | | 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 | 1 | -8/+21 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1822 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-01-11 | 3 | -3/+8 |
| |\ \ \ | | | | | | | | | | | Multiple UI Improvements | ||||
| | * | | | Updating fix | Asaad Mahmood | 2016-01-08 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Multiple UI Improvements | Asaad Mahmood | 2016-01-07 | 3 | -3/+8 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 2 | -20/+60 |
| |\ \ \ | | |_|/ | |/| | | 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 | 1 | -7/+24 |
| | | | | |||||
| * | | | 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 | 3 | -24/+24 |
| | |/ | |/| | | | | | | | non-files are dragged | ||||
* | | | Adding UI | =Corey Hulen | 2016-01-11 | 2 | -0/+295 |
| | | | |||||
* | | | partial fix for UI | =Corey Hulen | 2016-01-08 | 1 | -6/+1 |
|/ / | |||||
* | | Merge pull request #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 1 | -1/+132 |
|\ \ | |/ |/| | PLT-1558 adding session length to config file | ||||
| * | Adding UI for session length settings | =Corey Hulen | 2016-01-05 | 1 | -1/+132 |
| | | |||||
* | | Removed temporary fix for old filenames that used absolute urls pointing to ↵ | hmhealey | 2016-01-06 | 2 | -10/+1 |
| | | | | | | | | the get file api | ||||
* | | Changed Audio/Video preview to just display a file info when encountering a ↵ | hmhealey | 2016-01-06 | 3 | -78/+171 |
| | | | | | | | | file that cannot be played | ||||
* | | Merge pull request #1802 from hmhealey/plt1449 | Christopher Speller | 2016-01-05 | 2 | -117/+183 |
|\ \ | | | | | | | 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 | 2 | -1/+20 |
| | | | |||||
| * | | 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 | 1 | -17/+25 |
|\ \ | | | | | | | 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 | 1 | -9/+9 |
| | | | |||||
| * | | 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 | 5 | -125/+494 |
|\ \ | | | | | | | PLT-1118 Add ability to switch between SSO and email account | ||||
| * | | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 5 | -125/+494 |
| | | | |||||
* | | | 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 |
| |/ / |