Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #1935 from hmhealey/plt1664 | Corey Hulen | 2016-01-21 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Changed UnreadChannelIndicator display style so that it uses a value that IE1... | hmhealey | 2016-01-20 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1933 from hmhealey/plt1661 | Corey Hulen | 2016-01-21 | 2 | -41/+31 | |
|\ \ \ \ \ | ||||||
| * | | | | | Added a small margin where the PostsView will be considered to be at the bott... | hmhealey | 2016-01-20 | 1 | -1/+4 | |
| * | | | | | Removed some vestigial code from the post textbox | hmhealey | 2016-01-20 | 1 | -19/+0 | |
| * | | | | | Changed the post textbox resizing code to be more reliable and not rely on ma... | hmhealey | 2016-01-20 | 1 | -23/+29 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1924 from loafoe/master | Christopher Speller | 2016-01-21 | 2 | -1/+12 | |
|\ \ \ \ \ | ||||||
| * | | | | | 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 | 2 | -1/+12 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1927 from rgarmsen2295/plt-1668 | Christopher Speller | 2016-01-21 | 9 | -44/+57 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Removed extraneous error when providing a short username | Reed Garmsen | 2016-01-20 | 9 | -44/+57 | |
| |/ / / | ||||||
* | | | | Merge pull request #1922 from cloudron-io/check_auth_service | Harrison Healey | 2016-01-21 | 1 | -2/+2 | |
|\ \ \ \ | ||||||
| * | | | | Check auth_service for constructing message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 | |
| * | | | | Check auth_service to describe user login message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #1882 from trashcan/PLT-1232-more-channel-info | Harrison Healey | 2016-01-21 | 1 | -2/+10 | |
|\ \ \ \ | ||||||
| * | | | | Show correct channel URL in channel info modal | Pat Lathem | 2016-01-13 | 1 | -1/+4 | |
| * | | | | Rename 'Channel Handle' to Channel URL' | Pat Lathem | 2016-01-13 | 1 | -1/+1 | |
| * | | | | Add channel purpose | Pat Lathem | 2016-01-13 | 1 | -0/+5 | |
* | | | | | Merge pull request #1886 from rgarmsen2295/plt-549c | Joram Wilander | 2016-01-21 | 1 | -2/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fixed react warning issue with setState in RHS | Reed Garmsen | 2016-01-13 | 1 | -2/+10 | |
* | | | | | | Merge pull request #1885 from rgarmsen2295/plt-406 | Joram Wilander | 2016-01-21 | 1 | -0/+4 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Fix issue with drag n drop overlay in ie11 | Reed Garmsen | 2016-01-12 | 1 | -0/+4 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #1894 from mattermost/release-1.4 | Corey Hulen | 2016-01-14 | 1 | -3/+3 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Encode url query properly for SSO switching | JoramWilander | 2016-01-14 | 1 | -3/+3 | |
* | | | | | 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 | 8 | -25/+391 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #1855 from rgarmsen2295/plt-1006 | Corey Hulen | 2016-01-13 | 4 | -7/+45 | |
|\ \ \ \ | ||||||
| * | | | | Changed statistics to show usernames with an email tooltip | Reed Garmsen | 2016-01-11 | 4 | -7/+45 | |
* | | | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-13 | 4 | -4/+18 | |
|\ \ \ \ \ | ||||||
| * | | | | | Adding away icon and changing online and offline icons | Asaad Mahmood | 2016-01-11 | 4 | -4/+18 | |
* | | | | | | Merge pull request #1850 from mattermost/preview-mode | Corey Hulen | 2016-01-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | 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 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | Help text in invite member modal now updates according to town-square display... | Reed Garmsen | 2016-01-07 | 1 | -2/+8 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Adding push-test.mattermost.com | it33 | 2016-01-11 | 1 | -2/+2 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #1849 from hmhealey/plt1578 | Corey Hulen | 2016-01-11 | 2 | -8/+36 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | 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 | 3 | -3/+8 | |
|\ \ \ | ||||||
| * | | | 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 | 4 | -23/+71 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Added a loading screen to ChannelMembersModal and made it pull all channel me... | hmhealey | 2016-01-07 | 1 | -13/+36 | |
| * | | Made ChannelInviteModal pull all channel members before rendering | hmhealey | 2016-01-07 | 3 | -10/+35 | |
* | | | 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 | |
| |/ |/| | ||||||
* | | Merge pull request #1813 from mattermost/PLT-1558 | Harrison Healey | 2016-01-06 | 1 | -1/+132 | |
|\ \ | |/ |/| | ||||||
| * | Adding UI for session length settings | =Corey Hulen | 2016-01-05 | 1 | -1/+132 | |
* | | Merge pull request #1819 from hmhealey/plt1401 | Joram Wilander | 2016-01-06 | 1 | -3/+3 | |
|\ \ |