summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Replaced instances of startsWith with lastIndexOf in TextFormattinghmhealey2015-09-161-2/+2
|
* Removing js map from react bootstrap to make safari happy.Christopher Speller2015-09-161-3/+4
| | | | | Adding babel runtime to build process because Safari hasen't gotten with the program yet.
* Merge pull request #681 from mattermost/PLT-12-logChristopher Speller2015-09-157-2/+201
|\ | | | | PLT-12 Adding server logs viewer to admin console
| * Moving style into css=Corey Hulen2015-09-151-11/+1
| |
| * Fixing eslint issues=Corey Hulen2015-09-141-9/+0
| |
| * Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-1417-257/+661
| |\
| * | PLT-12 adding log viewer=Corey Hulen2015-09-107-2/+220
| | |
* | | Merge pull request #684 from mattermost/fix-text-overflowCorey Hulen2015-09-151-1/+1
|\ \ \ | | | | | | | | Fixing long channel name overflow by changing text to Edit
| * | | 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 modal.
| * | | 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-1410-228/+611
|\ \ \ | | | | | | | | PLT-171 MM-1589 New add channel modal using react-bootstrap.
| * | | New add channel modal using react-bootstrap.Christopher Speller2015-09-1410-228/+611
| | | |
* | | | 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 branch 'master' into PLT-12=Corey Hulen2015-09-113-18/+24
|\| | | |/ |/|
| * 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
| |/
* | Cleaning up html=Corey Hulen2015-09-105-6/+47
| |
* | merging=Corey Hulen2015-09-1021-159/+482
|\|
| * 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
| | |
| * | Adding minor hover changes for settingsAsaad Mahmood2015-09-091-1/+2
| | |
| * | MM-1825 - Improving UI for settingsAsaad Mahmood2015-09-093-23/+24
| | |
| * | Merge branch 'master' of https://github.com/mattermost/platform into mm-1866Asaad Mahmood2015-09-093-15/+17
| |\|
| | * Fix race condition where switching between two channels that both had new ↵JoramWilander2015-09-091-3/+7
| | | | | | | | | | | | messages sometimes caused improper scrolling.
| | * Merge pull request #625 from asaadmahmoodspin/ui-changesChristopher Speller2015-09-092-12/+10
| | |\ | | | | | | | | UI changes for various tickets
| | | * Adding symbol instead of × for close iconAsaad Mahmood2015-09-091-1/+1
| | | |