Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | UI Updates for multiple tickets | Asaad Mahmood | 2015-09-16 | 9 | -7/+33 |
* | Merge pull request #690 from mattermost/fix-safari | Harrison Healey | 2015-09-16 | 2 | -4/+4 |
|\ | |||||
| * | Removing js map from react bootstrap to make safari happy. | Christopher Speller | 2015-09-16 | 2 | -4/+4 |
|/ | |||||
* | Merge pull request #686 from hmhealey/plt172 | Joram Wilander | 2015-09-16 | 4 | -13/+58 |
|\ | |||||
| * | PLT-172 Added a modified version of perfect-scrollbar-0.6.5 which correctly s... | hmhealey | 2015-09-15 | 2 | -6/+9 |
| * | PLT-172 Updated perfect-scrollbar to 0.6.5 | hmhealey | 2015-09-15 | 4 | -12/+54 |
* | | Merge pull request #688 from mattermost/fixing-typo | Joram Wilander | 2015-09-16 | 1 | -4/+4 |
|\ \ | |||||
| * | | Fixing typo | =Corey Hulen | 2015-09-15 | 1 | -4/+4 |
|/ / | |||||
* | | Merge pull request #681 from mattermost/PLT-12-log | Christopher Speller | 2015-09-15 | 16 | -18/+332 |
|\ \ | |||||
| * | | Moving style into css | =Corey Hulen | 2015-09-15 | 3 | -14/+14 |
| * | | Fixing eslint issues | =Corey Hulen | 2015-09-14 | 1 | -9/+0 |
| * | | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 59 | -733/+18562 |
| |\ \ | |||||
| * | | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 14 | -15/+338 |
* | | | | Merge pull request #685 from mattermost/update-style-guide | Harrison Healey | 2015-09-15 | 1 | -8/+11 |
|\ \ \ \ | |||||
| * | | | | Updating style guide | Christopher Speller | 2015-09-15 | 1 | -8/+11 |
* | | | | | 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 | 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 | Christopher Speller | 2015-09-15 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #673 from apaatsio/clean-go-deps | Joram Wilander | 2015-09-15 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Clean installed Go dependencies | Antti Ahti | 2015-09-14 | 1 | -0/+2 |
* | | | | | Merge pull request #676 from hmhealey/mm1900b | Joram Wilander | 2015-09-15 | 9 | -220/+308 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Renamed text formatting tokens so that there should be significantly less cha... | hmhealey | 2015-09-14 | 1 | -11/+11 |
| * | | | | 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 |
| * | | | | 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 purp... | hmhealey | 2015-09-14 | 1 | -1/+9 |
| * | | | | 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 | 27 | -627/+18350 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 27 | -627/+18350 |
* | | | | | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 2 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 2 | -4/+4 |
* | | | | | | Merge pull request #674 from Trozz/PLT-41 | Joram Wilander | 2015-09-14 | 4 | -7/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | update remaining web files tolowercase | Michael Leer | 2015-09-14 | 2 | -2/+2 |
| * | | | | | | replace lowerName with name | Michael Leer | 2015-09-14 | 1 | -3/+1 |
| * | | | | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -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 | 4 | -6/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Allowing underscores in channel names. Added conversion of some slack channel... | Christopher Speller | 2015-09-14 | 4 | -6/+21 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #671 from mattermost/it33-patch-1 | Christopher Speller | 2015-09-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Updating MaxUsersPerTeam error msg | it33 | 2015-09-13 | 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 pull request #648 from mattermost/PLT-12 | Christopher Speller | 2015-09-14 | 25 | -131/+1625 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 8 | -33/+35 |
| |\ \ \ \ |