| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge branch 'master' into PLT-93 | =Corey Hulen | 2015-09-16 | 6 | -17/+62 | |
| | |\| | ||||||
| | * | | 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 | 55 | -285/+272 | |
| | | | | ||||||
| | * | | removing loggly | =Corey Hulen | 2015-09-15 | 3 | -18/+0 | |
| | | | | ||||||
| * | | | Merge pull request #691 from asaadmahmoodspin/ui-changes | Corey Hulen | 2015-09-16 | 9 | -7/+33 | |
| |\ \ \ | | | | | | | | | UI Updates for multiple tickets | |||||
| | * | | | UI Updates for multiple tickets | Asaad Mahmood | 2015-09-16 | 9 | -7/+33 | |
| | | |/ | |/| | ||||||
| * / | | 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 | 2 | -4/+4 | |
| | | | | | | | | | | | Adding babel runtime to build process because Safari hasen't gotten with the program yet. | |||||
| * | | Merge pull request #686 from hmhealey/plt172 | Joram Wilander | 2015-09-16 | 4 | -13/+58 | |
| |\ \ | |/ |/| | PLT-172 Fixes TypeErrors and random jumping that occurs when clicking the scroll bar in the sidebar | |||||
| | * | PLT-172 Added a modified version of perfect-scrollbar-0.6.5 which correctly ↵ | hmhealey | 2015-09-15 | 2 | -6/+9 | |
| | | | | | | | | | stops clicks through the scrollbar | |||||
| | * | PLT-172 Updated perfect-scrollbar to 0.6.5 | hmhealey | 2015-09-15 | 4 | -12/+54 | |
| | | | ||||||
| * | | Merge pull request #681 from mattermost/PLT-12-log | Christopher Speller | 2015-09-15 | 9 | -8/+215 | |
| |\ \ | | | | | | | PLT-12 Adding server logs viewer to admin console | |||||
| | * | | Moving style into css | =Corey Hulen | 2015-09-15 | 2 | -11/+11 | |
| | | | | ||||||
| | * | | Fixing eslint issues | =Corey Hulen | 2015-09-14 | 1 | -9/+0 | |
| | | | | ||||||
| | * | | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 38 | -657/+18411 | |
| | |\ \ | ||||||
| | * | | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 8 | -8/+224 | |
| | | | | | ||||||
| * | | | | 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 | 26 | -623/+18344 | |
| |\ \ \ \ | |_|_|/ |/| | | | PLT-171 MM-1589 New add channel modal using react-bootstrap. | |||||
| | * | | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 26 | -623/+18344 | |
| | | | | | ||||||
| * | | | | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 1 | -4/+3 | |
| |\ \ \ \ | | | | | | | | | | | Blank Content-Type for file GETs. | |||||
| | * | | | | 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 | 4 | -7/+5 | |
| |\ \ \ \ \ | | | | | | | | | | | | | PLT-41 Automatically convert uppercase letters to lowercase in username input box. | |||||
| | * | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed lowercase from the error wording. Removed additional toLowerCase within validator. | |||||
| | * | | | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -1/+1 | |
| | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Automatically convert uppercase letters to lowercase in username input box. Validator not changed. | |||||
| * | | | | | Merge pull request #677 from mattermost/plt-50 | Joram Wilander | 2015-09-14 | 1 | -1/+1 | |
| |\ \ \ \ \ | |_|/ / / |/| | | | | PLT-50 Allowing channel names with underscores. Allow import of more slack channel names. | |||||
| | * | | | | Allowing underscores in channel names. Added conversion of some slack ↵ | Christopher Speller | 2015-09-14 | 1 | -1/+1 | |
| | | |/ / | |/| | | | | | | | | | | channel names into valid mattermost names. | |||||
| * | | | | Merge pull request #668 from nickago/MM-1958 | Corey Hulen | 2015-09-14 | 1 | -0/+18 | |
| |\ \ \ \ | |_|/ / |/| | | | MM-1958 please read comment, base video player | |||||
| | * | | | 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 | 13 | -34/+1134 | |
| |\ \ \ | | | | | | | | | PLT-12: Work in progress for Admin Console UI | |||||
| | * \ \ | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 6 | -20/+28 | |
| | |\ \ \ | | |_|/ | |/| | | ||||||
| | * | | | Cleaning up html | =Corey Hulen | 2015-09-10 | 6 | -44/+53 | |
| | | | | | ||||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |