summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1335 from mattermost/triple-dot-fixJoram Wilander2015-11-061-1/+1
|\
| * Fix user profile never updating properlyJoramWilander2015-11-061-1/+1
* | Merge pull request #1318 from mattermost/plt-1025Christopher Speller2015-11-062-16/+44
|\ \
| * | Use state for current screen in turotial introJoramWilander2015-11-051-5/+5
| * | Make dots in tutorial intro clickable and always at the same spotJoramWilander2015-11-052-16/+44
* | | Merge pull request #1328 from mattermost/PLT-1016Christopher Speller2015-11-063-9/+38
|\ \ \
| * | | Fixing issue with safari private mode=Corey Hulen2015-11-051-1/+5
| * | | PLT-1016 force logout on other browsers=Corey Hulen2015-11-053-8/+33
* | | | Merge pull request #1332 from mattermost/plt-560Christopher Speller2015-11-061-35/+55
|\ \ \ \
| * | | | Prevent SSO users from changing their emailJoramWilander2015-11-061-35/+55
* | | | | GIT-888 improving perf=Corey Hulen2015-11-061-0/+9
| |_|_|/ |/| | |
* | | | Merge pull request #1327 from florianorben/PLT-857-2Joram Wilander2015-11-067-1/+479
|\ \ \ \ | |/ / / |/| | |
| * | | fix alter table command for postgresFlorian Orben2015-11-061-0/+1
| * | | remove two unused assignmentsFlorian Orben2015-11-052-2/+0
| * | | PLT-857: Support for Incoming Webhooks - Try #2Florian Orben2015-11-054-12/+74
| * | | collapse text after 700 chars or 5 line breaksFlorian Orben2015-11-052-2/+60
| * | | attachments frontendFlorian Orben2015-11-057-0/+359
* | | | Merge pull request #1321 from hmhealey/plt911Joram Wilander2015-11-063-50/+125
|\ \ \ \
| * | | | Moved public and private channels into separate sections in the search autoco...hmhealey2015-11-053-36/+74
| * | | | Fixed search autocomplete click handlinghmhealey2015-11-051-1/+1
| * | | | Changed search autocomplete to scroll when making a selection using the keyboardhmhealey2015-11-051-13/+50
| | |_|/ | |/| |
* | | | Merge pull request #1325 from hmhealey/plt618Joram Wilander2015-11-062-52/+350
|\ \ \ \
| * | | | Changed markdown lexer to ignore lists containing only one itemhmhealey2015-11-051-50/+54
| * | | | Cleaned up Markedown Lexer for eslinthmhealey2015-11-051-62/+56
| * | | | Copied part of the marked lexer into markdown.jsxhmhealey2015-11-051-1/+298
| * | | | Moved highlighting code out of markdown.jsxhmhealey2015-11-052-51/+54
| | |_|/ | |/| |
* | | | Merge pull request #1329 from florianorben/no_panic_on_webhook_errJoram Wilander2015-11-061-0/+5
|\ \ \ \
| * | | | don't panic if incoming webhook contains invalid jsonFlorian Orben2015-11-061-0/+5
| | |_|/ | |/| |
* / | | Revert 59581c38506acf267854f33af3c1d25e876dbb69Corey Hulen2015-11-051-1/+1
|/ / /
* | | Merge pull request #1320 from mattermost/PLT-1040Harrison Healey2015-11-052-1/+1
|\ \ \
| * | | Switching to mp3=Corey Hulen2015-11-053-1/+1
| * | | PLT-1040 changing ding=Corey Hulen2015-11-052-1/+1
* | | | PLT-480: Use `Utils.displayUsername` for username renderings. (fixes #874)Martin Fischer2015-11-051-1/+1
| |/ / |/| |
* | | Merge pull request #1319 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-053-21/+29
|\ \ \ | |/ / |/| |
| * | UI Improvements for Slack and post dropdownAsaad Mahmood2015-11-053-21/+29
* | | Merge pull request #1317 from hmhealey/scrollCorey Hulen2015-11-052-4/+7
|\ \ \
| * | | Re-added changes made in ac052fb9 to perfect scrollbarhmhealey2015-11-052-4/+7
| | |/ | |/|
* | | Merge pull request #1315 from mattermost/plt-996Corey Hulen2015-11-054-6/+6
|\ \ \
| * | | Update tutorial to not show by defaultJoramWilander2015-11-054-6/+6
* | | | Merge pull request #1314 from mattermost/plt-829Corey Hulen2015-11-051-1/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | Only allow one ding every 3sJoramWilander2015-11-051-1/+5
| |/ /
* | | Merge pull request #1316 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-11-057-96/+134
|\ \ \ | |_|/ |/| |
| * | Modal improvements for membersAsaad Mahmood2015-11-057-96/+134
* | | Merge pull request #1313 from mattermost/plt-992Joram Wilander2015-11-058-11/+14
|\ \ \ | |_|/ |/| |
| * | Fixed center channel height magic. Fixes tutorialChristopher Speller2015-11-058-11/+14
* | | Add constant form 'mention'JoramWilander2015-11-052-1/+5
* | | Only show * in tab title when a channel is marked unreadJoramWilander2015-11-051-1/+3
| |/ |/|
* | Fix abd user reference in head.htmlJoramWilander2015-11-051-1/+1
* | Merge pull request #1308 from asaadmahmoodspin/plt-960Christopher Speller2015-11-0513-112/+108
|\ \
| * | Updating UI for access history and access log modalsAsaad Mahmood2015-11-053-7/+3