summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #673 from apaatsio/clean-go-depsJoram Wilander2015-09-151-0/+2
|\
| * Clean installed Go dependenciesAntti Ahti2015-09-141-0/+2
* | 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-1427-627/+18350
|\ \ \
| * | | New add channel modal using react-bootstrap.Christopher Speller2015-09-1427-627/+18350
* | | | Merge pull request #679 from mattermost/fix-file-content-typeHarrison Healey2015-09-142-4/+4
|\ \ \ \
| * | | | Blank Content-Type for file GETs.JoramWilander2015-09-142-4/+4
* | | | | 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-144-6/+21
|\ \ \ \ \
| * | | | | Allowing underscores in channel names. Added conversion of some slack channel...Christopher Speller2015-09-144-6/+21
| | |_|/ / | |/| | |
* | | | | Merge pull request #671 from mattermost/it33-patch-1Christopher Speller2015-09-141-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Updating MaxUsersPerTeam error msgit332015-09-131-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-1425-131/+1625
|\ \ \
| * \ \ Merge branch 'master' into PLT-12=Corey Hulen2015-09-118-33/+35
| |\ \ \
| * | | | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN=Corey Hulen2015-09-117-18/+18
| * | | | Fixing help text based on feedback=Corey Hulen2015-09-111-3/+3
| * | | | Cleaning up html=Corey Hulen2015-09-106-44/+53
| * | | | merging=Corey Hulen2015-09-1052-238/+1464
| |\ \ \ \
| * | | | | Fixing unit test=Corey Hulen2015-09-101-4/+4
| * | | | | re-enabling system_admin=Corey Hulen2015-09-101-5/+0
| * | | | | Adding back admin unit test=Corey Hulen2015-09-102-3/+3
| * | | | | PLT-12 UI framework for admin console=Corey Hulen2015-09-1011-368/+924
| * | | | | Adding unit tests for cmd line=Corey Hulen2015-09-048-17/+25
| * | | | | Adding cmd line options=Corey Hulen2015-09-0411-96/+472
| * | | | | Merge branch 'master' into PLT-12=Corey Hulen2015-09-0347-259/+436
| |\ \ \ \ \
| * | | | | | Adding initial admin console html pages=Corey Hulen2015-09-033-0/+545
| * | | | | | Adding initial admin console html pages=Corey Hulen2015-09-038-41/+40
* | | | | | | Merge pull request #672 from asaadmahmoodspin/ui-changesJoram Wilander2015-09-142-1/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | PLT-217 - Improving horizontal scrollbar in LHS menuAsaad Mahmood2015-09-142-1/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #663 from mattermost/it33-patch-4Christopher Speller2015-09-141-0/+1
|\ \ \ \ \ \
| * | | | | | Link Code Contribution Guidelines from TOCit332015-09-121-0/+1
* | | | | | | Merge pull request #660 from mattermost/it33-patch-3Christopher Speller2015-09-141-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOG with info on recent commitsit332015-09-121-1/+4
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-04 07:23:23 +0000