summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1328 from mattermost/PLT-1016Christopher Speller2015-11-062-9/+29
|\ | | | | PLT-1016 force logout on other browsers
| * Fixing issue with safari private mode=Corey Hulen2015-11-051-1/+5
| |
| * PLT-1016 force logout on other browsers=Corey Hulen2015-11-052-8/+24
| |
* | Merge pull request #1332 from mattermost/plt-560Christopher Speller2015-11-061-35/+55
|\ \ | | | | | | PLT-560 Prevent SSO users from changing their email
| * | 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-065-0/+390
|\ \ \ | |/ / |/| | PLT-857: Support `attachments` for Incoming Webhooks
| * | remove two unused assignmentsFlorian Orben2015-11-052-2/+0
| | |
| * | PLT-857: Support for Incoming Webhooks - Try #2Florian Orben2015-11-052-11/+60
| | |
| * | collapse text after 700 chars or 5 line breaksFlorian Orben2015-11-051-2/+57
| | |
| * | attachments frontendFlorian Orben2015-11-056-0/+288
| | |
* | | Merge pull request #1321 from hmhealey/plt911Joram Wilander2015-11-063-50/+125
|\ \ \ | | | | | | | | PLT-911 Search autocomplete improvements
| * | | Moved public and private channels into separate sections in the search ↵hmhealey2015-11-053-36/+74
| | | | | | | | | | | | | | | | autocomplete
| * | | 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
|\ \ \ \ | | | | | | | | | | PLT-618 Ignore formatting markdown lists containing only one element
| * | | | 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
| | |_|/ | |/| |
* | | | Revert 59581c38506acf267854f33af3c1d25e876dbb69Corey Hulen2015-11-051-1/+1
| |_|/ |/| |
* | | Merge pull request #1320 from mattermost/PLT-1040Harrison Healey2015-11-051-1/+1
|\ \ \ | | | | | | | | PLT-1040 changing ding
| * | | Switching to mp3=Corey Hulen2015-11-051-1/+1
| | | |
| * | | PLT-1040 changing ding=Corey Hulen2015-11-051-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-052-4/+8
|\ \ \ | |/ / |/| | UI Improvements for Slack and post dropdown
| * | UI Improvements for Slack and post dropdownAsaad Mahmood2015-11-052-4/+8
| | |
* | | Merge pull request #1315 from mattermost/plt-996Corey Hulen2015-11-054-6/+6
|\ \ \ | | | | | | | | PLT-996 Prevent tutorial showing up a second before post list loads
| * | | Update tutorial to not show by defaultJoramWilander2015-11-054-6/+6
| | | |
* | | | Merge pull request #1314 from mattermost/plt-829Corey Hulen2015-11-051-1/+5
|\ \ \ \ | |_|/ / |/| | | PLT-829 Only allow one ding every 3s
| * | | Only allow one ding every 3sJoramWilander2015-11-051-1/+5
| |/ /
* | | Merge pull request #1316 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-11-056-95/+133
|\ \ \ | |_|/ |/| | Modal improvements for members
| * | Modal improvements for membersAsaad Mahmood2015-11-056-95/+133
| | |
* | | Merge pull request #1313 from mattermost/plt-992Joram Wilander2015-11-053-6/+2
|\ \ \ | |_|/ |/| | PLT-992 / PLT-984 Fixed center channel height magic. Fixes tutorial.
| * | Fixed center channel height magic. Fixes tutorialChristopher Speller2015-11-053-6/+2
| | |
* | | Add constant form 'mention'JoramWilander2015-11-052-1/+5
| | |
* | | Only show * in tab title when a channel is marked unreadJoramWilander2015-11-051-1/+3
| |/ |/|
* | Merge pull request #1308 from asaadmahmoodspin/plt-960Christopher Speller2015-11-056-106/+97
|\ \ | | | | | | Plt 960 - Moving code themes into custom themes
| * | Updating UI for access history and access log modalsAsaad Mahmood2015-11-051-1/+1
| | |
| * | Updating code themesAsaad Mahmood2015-11-051-4/+6
| | |
| * | Merge branch 'plt-960' of https://github.com/rgarmsen2295/platform into PLT-960Asaad Mahmood2015-11-055-105/+94
| |\ \
| | * | Removed old code theme selector and fixed some issuesReed Garmsen2015-11-045-99/+20
| | | |
| | * | Moved code theme picker into custom theme subareaReed Garmsen2015-11-043-24/+92
| | | |
* | | | Merge pull request #1298 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-046-16/+35
|\ \ \ \ | |/ / / |/| | | Multiple UI Improvements
| * | | Binding handleShown to constructorAsaad Mahmood2015-11-042-0/+2
| | | |
| * | | Making tutorial buttons and tutorial circles consistentAsaad Mahmood2015-11-042-2/+2
| | | |
| * | | Fixing issues with memberList modalAsaad Mahmood2015-11-041-14/+14
| | | |
| * | | Adding focus for channel modalsAsaad Mahmood2015-11-043-0/+17
| | | |
* | | | Merge pull request #1303 from mattermost/plt-516-2Christopher Speller2015-11-046-341/+325
|\ \ \ \ | |_|_|/ |/| | | PLT-516 Part 2 of fixing performance issues with large teams
| * | | Convert channel_members and channel_invite modals to react boostrap to fix ↵JoramWilander2015-11-046-341/+325
| | | | | | | | | | | | | | | | performance issues