Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Making changes to versioning | =Corey Hulen | 2015-09-17 | 1 | -5/+4 | |
| | * | Merge branch 'master' into PLT-92 | =Corey Hulen | 2015-09-17 | 4 | -36/+100 | |
| | |\ | ||||||
| | * | | Adding version to UI | =Corey Hulen | 2015-09-16 | 1 | -0/+13 | |
* | | | | Moving logout item | =Corey Hulen | 2015-09-17 | 1 | -6/+6 | |
* | | | | PLT-11 adding config for logs to UI | =Corey Hulen | 2015-09-17 | 15 | -292/+184 | |
* | | | | PLT-11 Adding ability to save config file | =Corey Hulen | 2015-09-17 | 5 | -130/+403 | |
|/ / / | ||||||
* | | | Merge pull request #705 from esethna/patch-1 | Corey Hulen | 2015-09-17 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Grammar change to New Channel ui text | esethna | 2015-09-17 | 1 | -1/+1 | |
* | | | Merge pull request #701 from mattermost/PLT-40 | Joram Wilander | 2015-09-17 | 1 | -2/+26 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Fixing css | =Corey Hulen | 2015-09-16 | 1 | -2/+2 | |
| * | | PLT-40 adding experimental support for emojis | =Corey Hulen | 2015-09-16 | 1 | -2/+26 | |
| |/ | ||||||
* | | Merge pull request #702 from mattermost/oauth-switch-fix | Joram Wilander | 2015-09-17 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Properly check if OAuth providing is enabled on the client. | JoramWilander | 2015-09-17 | 1 | -1/+1 | |
| |/ | ||||||
* | | Cleaned up logic for the unread indicators | Christopher Speller | 2015-09-16 | 3 | -108/+100 | |
* | | Moved unread channel indicators into their own React component and file | hmhealey | 2015-09-16 | 2 | -70/+112 | |
* | | Properly hide unread channel indicators when there are no unread channels | hmhealey | 2015-09-16 | 1 | -5/+11 | |
|/ | ||||||
* | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 6 | -5/+432 | |
* | Merge pull request #687 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 29 | -315/+99 | |
|\ | ||||||
| * | Fixing eslint problems | =Corey Hulen | 2015-09-15 | 1 | -1/+0 | |
| * | Removing old config stuff | =Corey Hulen | 2015-09-15 | 6 | -154/+4 | |
| * | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 28 | -166/+101 | |
* | | UI Updates for multiple tickets | Asaad Mahmood | 2015-09-16 | 6 | -5/+14 | |
|/ | ||||||
* | Merge pull request #681 from mattermost/PLT-12-log | Christopher Speller | 2015-09-15 | 3 | -1/+100 | |
|\ | ||||||
| * | Moving style into css | =Corey Hulen | 2015-09-15 | 1 | -11/+1 | |
| * | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 13 | -232/+633 | |
| |\ | ||||||
| * | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 3 | -1/+110 | |
* | | | Fixing long channel name overflow by changing text to Edit | Christopher Speller | 2015-09-15 | 1 | -1/+1 | |
* | | | Merge pull request #676 from hmhealey/mm1900b | Joram Wilander | 2015-09-15 | 7 | -21/+40 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Removed all calls to textToJsx and replaced them with calls to TextFormatting | hmhealey | 2015-09-14 | 7 | -28/+39 | |
| * | | Changed one instance of textToJsx to use new text formatting for testing purp... | hmhealey | 2015-09-14 | 1 | -1/+9 | |
* | | | Merge pull request #678 from mattermost/mm-1589 | Corey Hulen | 2015-09-14 | 6 | -220/+598 | |
|\ \ \ | ||||||
| * | | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 6 | -220/+598 | |
* | | | | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 1 | -4/+3 | |
|\ \ \ \ | ||||||
| * | | | | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 1 | -4/+3 | |
* | | | | | Merge pull request #674 from Trozz/PLT-41 | Joram Wilander | 2015-09-14 | 3 | -3/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | update remaining web files tolowercase | Michael Leer | 2015-09-14 | 2 | -2/+2 | |
| * | | | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #677 from mattermost/plt-50 | Joram Wilander | 2015-09-14 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Allowing underscores in channel names. Added conversion of some slack channel... | Christopher Speller | 2015-09-14 | 1 | -1/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #668 from nickago/MM-1958 | Corey Hulen | 2015-09-14 | 1 | -0/+18 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | WIP Added base video player | nickago | 2015-09-12 | 1 | -0/+18 | |
| |/ / | ||||||
* | / | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 2 | -4/+10 | |
|\| | | |/ |/| | ||||||
| * | Fix load more posts bug. | JoramWilander | 2015-09-11 | 2 | -4/+10 | |
* | | Cleaning up html | =Corey Hulen | 2015-09-10 | 4 | -6/+41 | |
* | | merging | =Corey Hulen | 2015-09-10 | 16 | -156/+451 | |
|\| | ||||||
| * | Merge pull request #635 from hmhealey/plt159 | Christopher Speller | 2015-09-10 | 1 | -3/+5 | |
| |\ | ||||||
| | * | PLT-159 Changed unread posts indicator to not be shown for the current channel | hmhealey | 2015-09-09 | 1 | -3/+5 | |
| * | | Adding minor hover changes for settings | Asaad Mahmood | 2015-09-09 | 1 | -1/+2 | |
| * | | MM-1825 - Improving UI for settings | Asaad Mahmood | 2015-09-09 | 3 | -23/+24 | |
| * | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1866 | Asaad Mahmood | 2015-09-09 | 3 | -15/+17 | |
| |\| |