Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #715 from mattermost/plt-27 | Joram Wilander | 2015-09-22 | 9 | -28/+315 |
|\ | | | | | PLT-27 Implement incoming webhooks. | ||||
| * | Implement incoming webhooks. | JoramWilander | 2015-09-21 | 9 | -28/+315 |
| | | |||||
* | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵ | Christopher Speller | 2015-09-22 | 3 | -0/+3 |
| | | | | | | | | emojify" | ||||
* | | Merge pull request #737 from hmhealey/plt289 | Harrison Healey | 2015-09-22 | 3 | -3/+0 |
|\ \ | | | | | | | PLT-289 Added parsing for named emojis to TextFormatting and removed emojify | ||||
| * | | Added parsing for named emojis to TextFormatting and removed dependency on ↵ | hmhealey | 2015-09-22 | 3 | -3/+0 |
| | | | | | | | | | | | | emojify | ||||
* | | | Merge pull request #730 from mattermost/shorten-description-help-text | Corey Hulen | 2015-09-22 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Shorten description help text | ||||
| * | | Adjusting sentence | it33 | 2015-09-21 | 1 | -1/+1 |
| | | | |||||
| * | | Shorten description help text | it33 | 2015-09-20 | 1 | -1/+1 |
| |/ | | | | | Currently it word wraps, this prevents word-wrapping | ||||
* | | 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 #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 |
| |/ | |||||
* / | Added marked library to text_formatting.jsx | hmhealey | 2015-09-19 | 1 | -2/+2 |
|/ | |||||
* | merging | =Corey Hulen | 2015-09-18 | 1 | -0/+11 |
|\ | |||||
| * | Merge pull request #699 from mattermost/PLT-92 | Joram Wilander | 2015-09-18 | 1 | -0/+11 |
| |\ | | | | | | | 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 |
| | | | | |||||
* | | | | 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 | ||||
| * | | 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 |
|/ | |||||
* | 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 |
|\ | | | | | PLT-93 Cleaning up client side configs | ||||
| * | 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 |
|\ | | | | | PLT-12 Adding server logs viewer to admin console | ||||
| * | 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 |
|\ \ \ | |_|/ |/| | | MM-1900 Removed textToJsx | ||||
| * | | 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 ↵ | hmhealey | 2015-09-14 | 1 | -1/+9 |
| | | | | | | | | | | | | purposes |