summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #722 from hmhealey/timestampJoram Wilander2015-09-213-3/+16
|\
| * Added a tooltip to post timestamps displaying the actual time the post was cr...hmhealey2015-09-193-3/+16
* | Merge pull request #731 from asaadmahmoodspin/new-channelChristopher Speller2015-09-211-5/+5
|\ \
| * | Updating new channel UIAsaad Mahmood2015-09-211-5/+5
| |/
* / Added marked library to text_formatting.jsxhmhealey2015-09-191-2/+2
|/
* merging=Corey Hulen2015-09-181-0/+11
|\
| * Merge pull request #699 from mattermost/PLT-92Joram Wilander2015-09-181-0/+11
| |\
| | * moving to security tab=Corey Hulen2015-09-172-12/+11
| | * Making changes to versioning=Corey Hulen2015-09-171-5/+4
| | * Merge branch 'master' into PLT-92=Corey Hulen2015-09-174-36/+100
| | |\
| | * | Adding version to UI=Corey Hulen2015-09-161-0/+13
* | | | Moving logout item=Corey Hulen2015-09-171-6/+6
* | | | PLT-11 adding config for logs to UI=Corey Hulen2015-09-1715-292/+184
* | | | PLT-11 Adding ability to save config file=Corey Hulen2015-09-175-130/+403
|/ / /
* | | Merge pull request #705 from esethna/patch-1Corey Hulen2015-09-171-1/+1
|\ \ \ | |_|/ |/| |
| * | Grammar change to New Channel ui textesethna2015-09-171-1/+1
* | | Merge pull request #701 from mattermost/PLT-40Joram Wilander2015-09-171-2/+26
|\ \ \ | |/ / |/| |
| * | Fixing css=Corey Hulen2015-09-161-2/+2
| * | PLT-40 adding experimental support for emojis=Corey Hulen2015-09-161-2/+26
| |/
* | Merge pull request #702 from mattermost/oauth-switch-fixJoram Wilander2015-09-171-1/+1
|\ \
| * | Properly check if OAuth providing is enabled on the client.JoramWilander2015-09-171-1/+1
| |/
* | Cleaned up logic for the unread indicatorsChristopher Speller2015-09-163-108/+100
* | Moved unread channel indicators into their own React component and filehmhealey2015-09-162-70/+112
* | Properly hide unread channel indicators when there are no unread channelshmhealey2015-09-161-5/+11
|/
* Implement OAuth2 service provider functionality.JoramWilander2015-09-166-5/+432
* Merge pull request #687 from mattermost/PLT-93Christopher Speller2015-09-1629-315/+99
|\
| * Fixing eslint problems=Corey Hulen2015-09-151-1/+0
| * Removing old config stuff=Corey Hulen2015-09-156-154/+4
| * PLT-93 cleaing up client side configs=Corey Hulen2015-09-1528-166/+101
* | UI Updates for multiple ticketsAsaad Mahmood2015-09-166-5/+14
|/
* Merge pull request #681 from mattermost/PLT-12-logChristopher Speller2015-09-153-1/+100
|\
| * Moving style into css=Corey Hulen2015-09-151-11/+1
| * Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-1413-232/+633
| |\
| * | PLT-12 adding log viewer=Corey Hulen2015-09-103-1/+110
* | | Fixing long channel name overflow by changing text to EditChristopher Speller2015-09-151-1/+1
* | | Merge pull request #676 from hmhealey/mm1900bJoram Wilander2015-09-157-21/+40
|\ \ \ | |_|/ |/| |
| * | Removed all calls to textToJsx and replaced them with calls to TextFormattinghmhealey2015-09-147-28/+39
| * | Changed one instance of textToJsx to use new text formatting for testing purp...hmhealey2015-09-141-1/+9
* | | Merge pull request #678 from mattermost/mm-1589Corey Hulen2015-09-146-220/+598
|\ \ \
| * | | New add channel modal using react-bootstrap.Christopher Speller2015-09-146-220/+598
* | | | 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-143-3/+3
|\ \ \ \ \
| * | | | | update remaining web files tolowercaseMichael Leer2015-09-142-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 branch 'master' into PLT-12=Corey Hulen2015-09-112-4/+10
|\| | | |/ |/|