summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
|\ \ \ \ | |/ / / |/| | | MM-1900 Removed textToJsx
| * | | Renamed text formatting tokens so that there should be significantly less ↵hmhealey2015-09-141-11/+11
| | | | | | | | | | | | | | | | chance of having conflicting tokens
| * | | 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
| | | | | | | | | | | | | | | | @mentions
| * | | 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 ↵hmhealey2015-09-141-1/+9
| | | | | | | | | | | | | | | | purposes
| * | | 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
|\ \ \ \ | |_|_|/ |/| | | PLT-171 MM-1589 New add channel modal using react-bootstrap.
| * | | 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.
| * | | | Blank Content-Type for file GETs.JoramWilander2015-09-141-4/+3
| | | | |
* | | | | Merge pull request #674 from Trozz/PLT-41Joram Wilander2015-09-144-7/+5
|\ \ \ \ \ | | | | | | | | | | | | PLT-41 Automatically convert uppercase letters to lowercase in username input box.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed lowercase from the error wording. Removed additional toLowerCase within validator.
| * | | | | PLT-41Michael Leer2015-09-141-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Automatically convert uppercase letters to lowercase in username input box. Validator not changed.
* | | | | Merge pull request #677 from mattermost/plt-50Joram Wilander2015-09-141-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 Speller2015-09-141-1/+1
| | |/ / | |/| | | | | | | | | | channel names into valid mattermost names.
* | | | Merge pull request #668 from nickago/MM-1958Corey Hulen2015-09-141-0/+18
|\ \ \ \ | |_|/ / |/| | | MM-1958 please read comment, base video player
| * | | WIP Added base video playernickago2015-09-121-0/+18
| |/ /
* | | Merge pull request #648 from mattermost/PLT-12Christopher Speller2015-09-1413-34/+1134
|\ \ \ | | | | | | | | PLT-12: Work in progress for Admin Console UI
| * \ \ 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 Fix unit tests on Go 1.5.1
| * | | | PLT-198 Added a small delay to one of the web tests to allow the server to ↵hmhealey2015-09-111-2/+7
| | | | | | | | | | | | | | | | | | | | get fully set up
* | | | | Merge pull request #657 from mattermost/fix-npm-packageCorey Hulen2015-09-111-14/+14
|\ \ \ \ \ | | | | | | | | | | | | Change versioning to exact versions in package.json
| * | | | | Change versioning to exact versions in package.jsonChristopher Speller2015-09-111-14/+14
| |/ / / /
* / / / / Fix load more posts bug.JoramWilander2015-09-112-4/+10
|/ / / /
* | | / Updating UI for modals and notification barAsaad Mahmood2015-09-113-2/+4
| |_|/ |/| |
* | | Removing border from first tr tds in more modalAsaad Mahmood2015-09-101-0/+5
| | |
* | | PM-183 and PM-162 - Updating UI for more modal and unread notification barAsaad Mahmood2015-09-102-7/+8
| | |
* | | Merge release branch 'release-0.7.0'Christopher Speller2015-09-101-0/+1
|\ \ \
| * | | Set EmailVerified to true for users signing up with SSO.JoramWilander2015-09-101-0/+1
| | | |
* | | | Fixing attachment button in RHSAsaad Mahmood2015-09-101-7/+12
| | | |
* | | | Merge pull request #635 from hmhealey/plt159Christopher Speller2015-09-101-3/+5
|\ \ \ \ | | | | | | | | | | PLT-159/MM-2074 Changed unread posts indicator to not be shown for the current channel
| * | | | PLT-159 Changed unread posts indicator to not be shown for the current channelhmhealey2015-09-091-3/+5
| | | | |
* | | | | Merge pull request #633 from asaadmahmoodspin/ui-changesJoram Wilander2015-09-103-3/+11
|\ \ \ \ \ | | | | | | | | | | | | PLT-188 - Moving attachment button to the left on mobile UI