summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* PLT-93 cleaing up client side configs=Corey Hulen2015-09-1555-285/+272
* removing loggly=Corey Hulen2015-09-153-18/+0
* Merge pull request #681 from mattermost/PLT-12-logChristopher Speller2015-09-159-8/+215
|\
| * Moving style into css=Corey Hulen2015-09-152-11/+11
| * Fixing eslint issues=Corey Hulen2015-09-141-9/+0
| * Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-1438-657/+18411
| |\
| * | PLT-12 adding log viewer=Corey Hulen2015-09-108-8/+224
* | | Merge pull request #684 from mattermost/fix-text-overflowCorey Hulen2015-09-151-1/+1
|\ \ \
| * | | Fixing long channel name overflow by changing text to EditChristopher Speller2015-09-151-1/+1
* | | | Merge pull request #682 from mattermost/nc-patchJoram Wilander2015-09-151-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixing cutoff team name in new channel modalChristopher Speller2015-09-151-1/+1
| | |/ | |/|
* | | Merge pull request #676 from hmhealey/mm1900bJoram Wilander2015-09-159-220/+308
|\ \ \ | |/ / |/| |
| * | Renamed text formatting tokens so that there should be significantly less cha...hmhealey2015-09-141-11/+11
| * | Removed textToJsx!hmhealey2015-09-141-199/+0
| * | Removed all calls to textToJsx and replaced them with calls to TextFormattinghmhealey2015-09-147-28/+39
| * | Cleaned up TextFormatting and added a default click handler for hashtags and ...hmhealey2015-09-141-47/+74
| * | Added highlighting of search terms to the new text formattinghmhealey2015-09-141-6/+41
| * | Added autolinking of hashtags to the new text formattinghmhealey2015-09-141-6/+48
| * | Added autolinking of urls to the new text formattinghmhealey2015-09-141-4/+35
| * | Added highlighting when the current user is mentioned to the new text formattinghmhealey2015-09-141-17/+69
| * | Changed one instance of textToJsx to use new text formatting for testing purp...hmhealey2015-09-141-1/+9
| * | Added handling for @mentions to the new text formattinghmhealey2015-09-141-9/+54
| * | Added skeleton for new text formatting code which will replace textToJsxhmhealey2015-09-141-0/+36
* | | Merge pull request #678 from mattermost/mm-1589Corey Hulen2015-09-1426-623/+18344
|\ \ \
| * | | New add channel modal using react-bootstrap.Christopher Speller2015-09-1426-623/+18344
* | | | Merge pull request #679 from mattermost/fix-file-content-typeHarrison Healey2015-09-141-4/+3
|\ \ \ \
| * | | | Blank Content-Type for file GETs.JoramWilander2015-09-141-4/+3
* | | | | Merge pull request #674 from Trozz/PLT-41Joram Wilander2015-09-144-7/+5
|\ \ \ \ \
| * | | | | update remaining web files tolowercaseMichael Leer2015-09-142-2/+2
| * | | | | replace lowerName with nameMichael Leer2015-09-141-3/+1
| * | | | | PLT-41Michael Leer2015-09-141-2/+2
| * | | | | PLT-41Michael Leer2015-09-141-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #677 from mattermost/plt-50Joram Wilander2015-09-141-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Allowing underscores in channel names. Added conversion of some slack channel...Christopher Speller2015-09-141-1/+1
| | |/ / | |/| |
* | | | Merge pull request #668 from nickago/MM-1958Corey Hulen2015-09-141-0/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | WIP Added base video playernickago2015-09-121-0/+18
| |/ /
* | | Merge pull request #648 from mattermost/PLT-12Christopher Speller2015-09-1413-34/+1134
|\ \ \
| * \ \ Merge branch 'master' into PLT-12=Corey Hulen2015-09-116-20/+28
| |\ \ \ | | |_|/ | |/| |
| * | | Cleaning up html=Corey Hulen2015-09-106-44/+53
| * | | merging=Corey Hulen2015-09-1028-184/+626
| |\ \ \
| * | | | PLT-12 UI framework for admin console=Corey Hulen2015-09-108-353/+901
| * | | | Adding unit tests for cmd line=Corey Hulen2015-09-041-1/+1
| * | | | Merge branch 'master' into PLT-12=Corey Hulen2015-09-0345-257/+434
| |\ \ \ \
| * | | | | Adding initial admin console html pages=Corey Hulen2015-09-033-0/+545
| * | | | | Adding initial admin console html pages=Corey Hulen2015-09-037-41/+33
* | | | | | PLT-217 - Improving horizontal scrollbar in LHS menuAsaad Mahmood2015-09-142-1/+6
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #654 from hmhealey/plt198Corey Hulen2015-09-111-2/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | PLT-198 Added a small delay to one of the web tests to allow the server to ge...hmhealey2015-09-111-2/+7
* | | | | Merge pull request #657 from mattermost/fix-npm-packageCorey Hulen2015-09-111-14/+14
|\ \ \ \ \
| * | | | | Change versioning to exact versions in package.jsonChristopher Speller2015-09-111-14/+14
| |/ / / /