Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | 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 | |
| | | | ||||||
| * | | removing loggly | =Corey Hulen | 2015-09-15 | 2 | -7/+0 | |
| | | | ||||||
* | | | Merge pull request #691 from asaadmahmoodspin/ui-changes | Corey Hulen | 2015-09-16 | 6 | -5/+14 | |
|\ \ \ | | | | | | | | | UI Updates for multiple tickets | |||||
| * | | | UI Updates for multiple tickets | Asaad Mahmood | 2015-09-16 | 6 | -5/+14 | |
| | |/ | |/| | ||||||
* / | | PLT-149 Removed the file list from (message deleted) placeholder posts | hmhealey | 2015-09-16 | 1 | -0/+1 | |
|/ / | ||||||
* / | Removing js map from react bootstrap to make safari happy. | Christopher Speller | 2015-09-16 | 1 | -3/+4 | |
|/ | | | | | Adding babel runtime to build process because Safari hasen't gotten with the program yet. | |||||
* | Merge pull request #681 from mattermost/PLT-12-log | Christopher Speller | 2015-09-15 | 7 | -2/+201 | |
|\ | | | | | PLT-12 Adding server logs viewer to admin console | |||||
| * | Moving style into css | =Corey Hulen | 2015-09-15 | 1 | -11/+1 | |
| | | ||||||
| * | Fixing eslint issues | =Corey Hulen | 2015-09-14 | 1 | -9/+0 | |
| | | ||||||
| * | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 17 | -257/+661 | |
| |\ | ||||||
| * | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 7 | -2/+220 | |
| | | | ||||||
* | | | Merge pull request #684 from mattermost/fix-text-overflow | Corey Hulen | 2015-09-15 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fixing long channel name overflow by changing text to Edit | |||||
| * | | | Fixing long channel name overflow by changing text to Edit | Christopher Speller | 2015-09-15 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #682 from mattermost/nc-patch | Joram Wilander | 2015-09-15 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Fixing cutoff team name in new channel modal. | |||||
| * | | | Fixing cutoff team name in new channel modal | Christopher Speller | 2015-09-15 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #676 from hmhealey/mm1900b | Joram Wilander | 2015-09-15 | 9 | -220/+308 | |
|\ \ \ | |/ / |/| | | MM-1900 Removed textToJsx | |||||
| * | | Renamed text formatting tokens so that there should be significantly less ↵ | hmhealey | 2015-09-14 | 1 | -11/+11 | |
| | | | | | | | | | | | | chance of having conflicting tokens | |||||
| * | | Removed textToJsx! | hmhealey | 2015-09-14 | 1 | -199/+0 | |
| | | | ||||||
| * | | Removed all calls to textToJsx and replaced them with calls to TextFormatting | hmhealey | 2015-09-14 | 7 | -28/+39 | |
| | | | ||||||
| * | | Cleaned up TextFormatting and added a default click handler for hashtags and ↵ | hmhealey | 2015-09-14 | 1 | -47/+74 | |
| | | | | | | | | | | | | @mentions | |||||
| * | | Added highlighting of search terms to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+41 | |
| | | | ||||||
| * | | Added autolinking of hashtags to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+48 | |
| | | | ||||||
| * | | Added autolinking of urls to the new text formatting | hmhealey | 2015-09-14 | 1 | -4/+35 | |
| | | | ||||||
| * | | Added highlighting when the current user is mentioned to the new text formatting | hmhealey | 2015-09-14 | 1 | -17/+69 | |
| | | | ||||||
| * | | Changed one instance of textToJsx to use new text formatting for testing ↵ | hmhealey | 2015-09-14 | 1 | -1/+9 | |
| | | | | | | | | | | | | purposes | |||||
| * | | Added handling for @mentions to the new text formatting | hmhealey | 2015-09-14 | 1 | -9/+54 | |
| | | | ||||||
| * | | Added skeleton for new text formatting code which will replace textToJsx | hmhealey | 2015-09-14 | 1 | -0/+36 | |
| | | | ||||||
* | | | Merge pull request #678 from mattermost/mm-1589 | Corey Hulen | 2015-09-14 | 10 | -228/+611 | |
|\ \ \ | | | | | | | | | PLT-171 MM-1589 New add channel modal using react-bootstrap. | |||||
| * | | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 10 | -228/+611 | |
| | | | | ||||||
* | | | | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 1 | -4/+3 | |
|\ \ \ \ | | | | | | | | | | | Blank Content-Type for file GETs. |