summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Adding multi-session cookie=Corey Hulen2015-10-203-45/+24
* Fixing merge conflicts=Corey Hulen2015-10-199-61/+435
|\
| * Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-198-61/+430
| |\
| | * Generalized webhook post code and added it to outgoing webhooksJoramWilander2015-10-191-33/+6
| | * Show/hide integrations properly based off config settings.JoramWilander2015-10-192-51/+55
| | * Fix postgres query and minor UI updates for outgoing webhooks.JoramWilander2015-10-192-9/+6
| | * Implement outgoing webhooks.JoramWilander2015-10-196-5/+400
* | | Fixing merge issue=Corey Hulen2015-10-191-8/+3
* | | Merging from master=Corey Hulen2015-10-1933-366/+522
|\| |
| * | Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-196-152/+230
| |\ \
| | * | Remove unnecessary bindJoramWilander2015-10-161-1/+0
| | * | Fix typing socket constantJoramWilander2015-10-162-3/+3
| | * | Small refactor of websocket code on client and serverJoramWilander2015-10-166-150/+229
| * | | Merge pull request #1107 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-191-0/+3
| |\ \ \
| | * | | Updating scroll on admin consoleAsaad Mahmood2015-10-191-0/+3
| * | | | Merge pull request #1104 from florianorben/fix_arrow_left_rightHarrison Healey2015-10-191-3/+4
| |\ \ \ \
| | * | | | No longer try to navigate to next/prev image if image preview modal is not openFlorian Orben2015-10-191-3/+4
| | | |_|/ | | |/| |
| * | | | Merge pull request #1102 from florianorben/fix_email_tooltipHarrison Healey2015-10-191-2/+2
| |\ \ \ \
| | * | | | Fixes wrong tooltip on user profileFlorian Orben2015-10-191-2/+2
| | |/ / /
| * | | | Merge pull request #1101 from stasvovk/admin_console_urlsHarrison Healey2015-10-195-6/+26
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | change url when a user navigates between tabs [#962]Stas Vovk2015-10-185-6/+26
| | |/ /
| * | | Updating scroll on LHSAsaad Mahmood2015-10-191-1/+3
| * | | Updating userEntries div to tr tdAsaad Mahmood2015-10-181-1/+1
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-186-17/+19
| |\| |
| | * | Merge pull request #1090 from jvasallo/masterJoram Wilander2015-10-171-1/+2
| | |\ \
| | | * | Updated Email Check Regex to RFC5322 StandardJoel Vasallo2015-10-161-1/+2
| | * | | Merge pull request #1096 from rgarmsen2295/plt-153Joram Wilander2015-10-171-2/+8
| | |\ \ \
| | | * | | Added proper recognition of android devices in the Active Sessions UIReed Garmsen2015-10-161-2/+8
| | * | | | Merge pull request #1097 from rgarmsen2295/plt-693Joram Wilander2015-10-171-1/+6
| | |\ \ \ \
| | | * | | | Fixes back button on username page during team signup when email is turned offReed Garmsen2015-10-161-1/+6
| | | |/ / /
| | * / / / PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too much...Florian Orben2015-10-172-13/+2
| | |/ / /
| | * | | Add semi-colonPat Lathem2015-10-161-1/+1
| | * | | Add z-index to command-box so that elements behind it do not show through aut...Pat Lathem2015-10-161-0/+1
| | |/ /
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-1612-101/+138
| |\| |
| | * | Merge pull request #1089 from mattermost/client-warning-fixesCorey Hulen2015-10-1611-103/+132
| | |\ \
| | | * | Fixing some client warningsChristopher Speller2015-10-1611-103/+132
| | | |/
| * | | Fixing more direct channel modal scrollingAsaad Mahmood2015-10-163-1/+23
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-1613-31/+266
| |\ \ \ | | | |/ | | |/|
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-168-88/+82
* | | | Refactoring web classes to use multi-session=Corey Hulen2015-10-163-82/+100
* | | | Fixing merge=Corey Hulen2015-10-1622-44/+395
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge pull request #1085 from mattermost/plt-633Harrison Healey2015-10-162-4/+12
| |\ \ \ | | |_|/ | |/| |
| | * | Add default username and icon to incoming webhooks.JoramWilander2015-10-162-4/+12
| * | | Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-167-14/+220
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-16118-16980/+14346
| | |\ \ \
| | * | | | update posts time in the right sidebar when user changes time formatStas Vovk2015-10-151-0/+14
| | * | | | fixed style guide errorStas Vovk2015-10-151-1/+1
| | * | | | added file with display settingsStas Vovk2015-10-141-0/+168
| | * | | | added display tab under account settings. added 24h time optionStas Vovk2015-10-145-14/+38
| * | | | | Merge pull request #1083 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-163-3/+6
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 09:06:31 +0000