Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing merge | =Corey Hulen | 2016-02-01 | 2 | -1/+2 |
|\ | |||||
| * | Adding reply functionality | Asaad Mahmood | 2016-01-28 | 2 | -1/+2 |
| | | |||||
* | | merging | =Corey Hulen | 2016-01-25 | 1 | -2/+16 |
|\| | |||||
| * | Merge pull request #1956 from mattermost/plt-1779 | Corey Hulen | 2016-01-22 | 1 | -2/+16 |
| |\ | | | | | | | PLT-1779 Add system-wide statistics page | ||||
| | * | Add system analytics page | JoramWilander | 2016-01-21 | 1 | -2/+2 |
| | | | |||||
| | * | Generalize analytics server functions and begin componentizing client ↵ | JoramWilander | 2016-01-21 | 1 | -2/+16 |
| | | | | | | | | | | | | analytics controls | ||||
* | | | merging | =Corey Hulen | 2016-01-22 | 5 | -5/+82 |
|\| | | |||||
| * | | PLT-7 adding loc feature to preview | =Corey Hulen | 2016-01-22 | 1 | -0/+4 |
| | | | |||||
| * | | PLT-7 adding lang selector | =Corey Hulen | 2016-01-22 | 1 | -0/+15 |
| | | | |||||
| * | | Merge pull request #1948 from hmhealey/plt1652 | Christopher Speller | 2016-01-22 | 1 | -2/+3 |
| |\ \ | | | | | | | | | PLT-1652 Added download param to getFile api call | ||||
| | * | | Added download param to getFile api call | hmhealey | 2016-01-21 | 1 | -2/+3 |
| | | | | |||||
| * | | | PLT-7 Adding react-intl libs | =Corey Hulen | 2016-01-21 | 3 | -0/+38 |
| |/ / | |||||
| * | | Merge pull request #1924 from loafoe/master | Christopher Speller | 2016-01-21 | 1 | -0/+11 |
| |\ \ | | | | | | | | | [#1923] Make Websocket ports configurable | ||||
| | * | | Fix indentation | Andy Lo-A-Foe | 2016-01-20 | 1 | -7/+7 |
| | | | | |||||
| | * | | Optionally specify ws:// and wss:// port in config | Andy Lo-A-Foe | 2016-01-19 | 1 | -0/+11 |
| | | | | |||||
| * | | | Merge pull request #1927 from rgarmsen2295/plt-1668 | Christopher Speller | 2016-01-21 | 2 | -3/+7 |
| |\ \ \ | | |_|/ | |/| | | PLT-1668 Removes duplicate short username error message | ||||
| | * | | Removed extraneous error when providing a short username | Reed Garmsen | 2016-01-20 | 2 | -3/+7 |
| | |/ | |||||
| * | | Merge pull request #1885 from rgarmsen2295/plt-406 | Joram Wilander | 2016-01-21 | 1 | -0/+4 |
| |\ \ | | |/ | |/| | PLT-406 Fixes issues with drag and drop overlay in IE11 | ||||
| | * | Fix issue with drag n drop overlay in ie11 | Reed Garmsen | 2016-01-12 | 1 | -0/+4 |
| | | | |||||
* | | | finishing up commands UI | =Corey Hulen | 2016-01-14 | 1 | -1/+59 |
| | | | |||||
* | | | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-01-14 | 4 | -11/+112 |
|\| | | |||||
| * | | Added license validation and settings | JoramWilander | 2016-01-14 | 2 | -4/+62 |
| | | | |||||
| * | | Merge pull request #1855 from rgarmsen2295/plt-1006 | Corey Hulen | 2016-01-13 | 1 | -1/+2 |
| |\ \ | | | | | | | | | 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 | 1 | -1/+2 |
| | |/ | |||||
| * | | Merge pull request #1853 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-13 | 2 | -3/+16 |
| |\ \ | | |/ | |/| | Adding away icon and changing online and offline icons | ||||
| | * | Adding away icon and changing online and offline icons | Asaad Mahmood | 2016-01-11 | 2 | -3/+16 |
| | | | |||||
| * | | Merge pull request #1849 from hmhealey/plt1578 | Corey Hulen | 2016-01-11 | 1 | -0/+15 |
| |\ \ | | |/ | |/| | 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 | -0/+15 |
| | | | |||||
| * | | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 2 | -3/+11 |
| |\ \ | | |/ | |/| | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel | ||||
| | * | Made ChannelInviteModal pull all channel members before rendering | hmhealey | 2016-01-07 | 2 | -3/+11 |
| | | | |||||
| * | | Removed ability to drag n' drop text; drag n' drop ui no longer appears when ↵ | Reed Garmsen | 2016-01-06 | 1 | -0/+6 |
| |/ | | | | | | | non-files are dragged | ||||
* | | Fixing unit tests | =Corey Hulen | 2016-01-09 | 1 | -1/+1 |
| | | |||||
* | | partial fix for UI | =Corey Hulen | 2016-01-08 | 2 | -7/+29 |
|/ | |||||
* | 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 | 1 | -16/+2 |
| | | | | | | | | the get file api | ||||
* | | Changed Audio/Video preview to just display a file info when encountering a ↵ | hmhealey | 2016-01-06 | 1 | -0/+19 |
|/ | | | | file that cannot be played | ||||
* | Merge pull request #1801 from hmhealey/plt1602 | Christopher Speller | 2016-01-04 | 1 | -0/+10 |
|\ | | | | | 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 | -0/+10 |
| | | |||||
* | | Merge pull request #1745 from mattermost/plt-1118 | Christopher Speller | 2016-01-04 | 2 | -0/+36 |
|\ \ | |/ |/| | PLT-1118 Add ability to switch between SSO and email account | ||||
| * | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 2 | -0/+36 |
| | | |||||
* | | Merge pull request #1769 from mattermost/PLT-1488 | Christopher Speller | 2016-01-04 | 1 | -0/+3 |
|\ \ | | | | | | | PLT-1488 fixing error message from session revoke | ||||
| * | | PLT-1488 fixing error message from session revoke | =Corey Hulen | 2015-12-23 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #1740 from hmhealey/plt730 | Joram Wilander | 2015-12-28 | 2 | -2/+29 |
|\ \ \ | | | | | | | | | PLT-730/PLT-731 Added remaining mobile UI V2 components | ||||
| * | | | Added theme styling to floating timestamp | hmhealey | 2015-12-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | Added DelayedAction class to use to handle stopping scrolling | hmhealey | 2015-12-16 | 1 | -0/+27 |
| | | | | |||||
* | | | | Merge pull request #1755 from hmhealey/plt1108 | Joram Wilander | 2015-12-28 | 3 | -1/+32 |
|\ \ \ \ | |_|/ / |/| | | | PLT-1108 Refactored ViewImage modal and made it automatically play animated gifs | ||||
| * | | | Refactored ViewImage modal and made it automatically play animated gifs | hmhealey | 2015-12-18 | 3 | -1/+32 |
| | |/ | |/| | |||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-21 | 1 | -2/+3 |
| | | | |||||
* | | | Merge pull request #1756 from mattermost/lfbrock-emojis | Corey Hulen | 2015-12-18 | 1 | -21/+21 |
|\ \ \ | | | | | | | | | PLT-1122 Fixed black_large_square emoticon. Also fixed emoji mapping. |