Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | UI Modifications for multiple tickets | Asaad Mahmood | 2015-09-22 | 4 | -7/+14 |
| | |||||
* | Merge pull request #734 from mattermost/plt-206 | Christopher Speller | 2015-09-21 | 4 | -3/+7 |
|\ | | | | | PLT-206 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. | ||||
| * | Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. | JoramWilander | 2015-09-21 | 4 | -3/+7 |
| | | |||||
* | | Merge pull request #736 from hmhealey/plt312 | Joram Wilander | 2015-09-21 | 1 | -1/+7 |
|\ \ | |/ |/| | PLT-312 Added theme class to markdown links | ||||
| * | Added theme class to markdown links | hmhealey | 2015-09-21 | 1 | -1/+7 |
| | | |||||
* | | Merge pull request #732 from mattermost/plt-243 | Joram Wilander | 2015-09-21 | 1 | -8/+13 |
|\ \ | | | | | | | PLT-243 Adding new create channel modal to the more menu | ||||
| * | | Adding new create channel modal to the more menu | Christopher Speller | 2015-09-21 | 1 | -8/+13 |
| |/ | |||||
* / | Wrapped comment messages in divs like posts in the center pane | hmhealey | 2015-09-21 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #722 from hmhealey/timestamp | Joram Wilander | 2015-09-21 | 3 | -3/+16 |
|\ | | | | | Added a tooltip to post timestamps displaying the actual time the post was created | ||||
| * | Added a tooltip to post timestamps displaying the actual time the post was ↵ | hmhealey | 2015-09-19 | 3 | -3/+16 |
| | | | | | | | | created | ||||
* | | Merge pull request #731 from asaadmahmoodspin/new-channel | Christopher Speller | 2015-09-21 | 1 | -5/+5 |
|\ \ | | | | | | | Updating new channel UI | ||||
| * | | Updating new channel UI | Asaad Mahmood | 2015-09-21 | 1 | -5/+5 |
| |/ | |||||
* | | Cleaned up markdown formatting code and removed debug statements | hmhealey | 2015-09-19 | 2 | -7/+9 |
| | | |||||
* | | Deferred to marked.js's html sanitization when markdown is enabled | hmhealey | 2015-09-19 | 1 | -2/+12 |
| | | |||||
* | | Changed markdown link parsing to automatically add an explicit protocol to urls | hmhealey | 2015-09-19 | 2 | -1/+16 |
| | | |||||
* | | Prevented our url autolinking from breaking markdown links | hmhealey | 2015-09-19 | 1 | -6/+34 |
| | | |||||
* | | Added marked library to text_formatting.jsx | hmhealey | 2015-09-19 | 3 | -3/+13 |
| | | |||||
* | | Removed underscores surrounding formatting tokens since they won't work with ↵ | hmhealey | 2015-09-19 | 1 | -8/+8 |
| | | | | | | | | markdown | ||||
* | | Removed unnecessary conversion of newlines to html line breaks | hmhealey | 2015-09-19 | 1 | -6/+4 |
|/ | |||||
* | merging | =Corey Hulen | 2015-09-18 | 3 | -6/+14 |
|\ | |||||
| * | Merge pull request #699 from mattermost/PLT-92 | Joram Wilander | 2015-09-18 | 2 | -5/+13 |
| |\ | | | | | | | PLT-92 Adding server side versioning to the binary | ||||
| | * | moving to security tab | =Corey Hulen | 2015-09-17 | 2 | -12/+11 |
| | | | |||||
| | * | 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 |
| | | | | |||||
| | * | | PLT-92 Adding server side versioning to the binary | =Corey Hulen | 2015-09-16 | 1 | -5/+2 |
| | | | | |||||
| * | | | Fixed incorrect check if a url starts with an explicit protocol | hmhealey | 2015-09-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | Moving logout item | =Corey Hulen | 2015-09-17 | 1 | -6/+6 |
| | | | | |||||
* | | | | PLT-11 adding config for logs to UI | =Corey Hulen | 2015-09-17 | 16 | -292/+207 |
| | | | | |||||
* | | | | PLT-11 Adding ability to save config file | =Corey Hulen | 2015-09-17 | 8 | -131/+489 |
|/ / / | |||||
* | | | Merge pull request #705 from esethna/patch-1 | Corey Hulen | 2015-09-17 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Grammar change to New Channel ui text | ||||
| * | | 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 |
|\ \ \ | |/ / |/| | | PLT-40 adding experimental support for emojis | ||||
| * | | 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. | ||||
| * | | 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 |
|/ | |||||
* | Merge pull request #693 from mattermost/mm-1419 | Christopher Speller | 2015-09-16 | 9 | -5/+492 |
|\ | | | | | Implement OAuth2 service provider functionality. | ||||
| * | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 9 | -5/+492 |
| | | |||||
* | | Merge pull request #695 from hmhealey/startswith | Corey Hulen | 2015-09-16 | 1 | -2/+2 |
|\ \ | |/ |/| | Replaced instances of startsWith with lastIndexOf in TextFormatting | ||||
| * | Replaced instances of startsWith with lastIndexOf in TextFormatting | hmhealey | 2015-09-16 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #687 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 42 | -528/+145 |
|\ \ | | | | | | | PLT-93 Cleaning up client side configs | ||||
| * | | Merge branch 'master' into PLT-93 | =Corey Hulen | 2015-09-16 | 1 | -3/+4 |
| |\| | |||||
| * | | Fixing eslint problems | =Corey Hulen | 2015-09-15 | 3 | -7/+0 |
| | | | |||||
| * | | Finished removing some of the last bits of client side config | =Corey Hulen | 2015-09-15 | 4 | -41/+1 |
| | | | |||||
| * | | Removing old config stuff | =Corey Hulen | 2015-09-15 | 8 | -238/+4 |
| | | | |||||
| * | | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 38 | -242/+147 |
| | | |