summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2092 from mattermost/fix-slashChristopher Speller2016-02-084-28/+55
|\
| * Fixing slash commands=Corey Hulen2016-02-051-8/+46
| * Fixing slash commands=Corey Hulen2016-02-054-22/+11
* | Merge pull request #2094 from mattermost/GIT-1812Christopher Speller2016-02-082-8/+22
|\ \
| * | GIT-1812 fixing wesocket issue with firefox=Corey Hulen2016-02-052-8/+22
* | | Merge pull request #2090 from hmhealey/plt1847Joram Wilander2016-02-062-8/+21
|\ \ \
| * | | Disabled keyboard focus code changes on mobilehmhealey2016-02-052-8/+21
| | |/ | |/|
* | | Merge pull request #2093 from rgarmsen2295/plt-1615Joram Wilander2016-02-062-2/+9
|\ \ \ | |_|/ |/| |
| * | Limits hashtag linking to a minimum of three charactersReed Garmsen2016-02-052-2/+9
* | | Merge pull request #2091 from rgarmsen2295/plt-1797Corey Hulen2016-02-054-3/+4
|\ \ \ | |/ / |/| |
| * | Increased username max lengthReed Garmsen2016-02-054-3/+4
* | | Merge pull request #2074 from rgarmsen2295/plt-1882Joram Wilander2016-02-052-1/+17
|\ \ \ | |_|/ |/| |
| * | Separated displayTime functions for component/string formReed Garmsen2016-02-052-2/+38
| * | Fixed issue with on-hover timestampsReed Garmsen2016-02-052-33/+13
* | | Merge pull request #2088 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-02-052-3/+27
|\ \ \ | |/ / |/| |
| * | Fixing indentationAsaad Mahmood2016-02-051-2/+2
| * | Minor UI ImprovementsAsaad Mahmood2016-02-052-3/+27
|/ /
* | Merge pull request #2087 from hmhealey/plt1758Corey Hulen2016-02-053-12/+13
|\ \
| * | Changed CommandProvider to only set the matched pretext if it actually matche...hmhealey2016-02-053-12/+13
* | | Merge pull request #2085 from hmhealey/plt1896Christopher Speller2016-02-051-0/+4
|\ \ \
| * | | Added more space between adjacent markdown paragraphshmhealey2016-02-051-0/+4
| |/ /
* | | Merge pull request #2082 from mattermost/plt-1848Christopher Speller2016-02-051-4/+23
|\ \ \
| * | | Stats for recently active and new users now shows date with the timeJoramWilander2016-02-051-4/+23
| |/ /
* | | Merge pull request #2086 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-057-126/+150
|\ \ \ | |/ / |/| |
| * | Improving indentation for base.scssAsaad Mahmood2016-02-051-128/+128
| * | Multiple UI improvementsAsaad Mahmood2016-02-057-31/+55
|/ /
* | Merge pull request #2077 from hmhealey/plt1819Joram Wilander2016-02-051-5/+13
|\ \
| * | Changed notifications to only request permission once per session if the user...hmhealey2016-02-041-5/+13
* | | Merge pull request #2080 from ZBoxApp/PLT-7-locsCorey Hulen2016-02-044-100/+133
|\ \ \
| * | | New localizationsElias Nahum2016-02-044-100/+133
|/ / /
* | | Merge pull request #2079 from mattermost/help-text-updatesCorey Hulen2016-02-043-8/+8
|\ \ \
| * | | Update en.jsonit332016-02-041-1/+1
| * | | Update es.jsonit332016-02-041-1/+1
| * | | Update en.jsonit332016-02-041-1/+1
| * | | Update email_settings.jsxit332016-02-041-1/+1
| * | | Update es.jsonit332016-02-041-2/+2
| * | | Update en.jsonit332016-02-041-2/+2
| * | | Update email_settings.jsxit332016-02-041-2/+2
* | | | Merge pull request #2076 from ZBoxApp/loc-fixCorey Hulen2016-02-044-42/+114
|\ \ \ \
| * | | | fix typosElias Nahum2016-02-042-4/+4
| * | | | revert config.jsonElias Nahum2016-02-041-32/+7
| * | | | PLT-7: Fix and Add new loc stringsElias Nahum2016-02-045-48/+145
| |/ / /
* | | | Merge pull request #2075 from mattermost/PLT-1851Corey Hulen2016-02-041-7/+16
|\ \ \ \
| * | | | PLT-1851 fixing websocket reconnect error=Corey Hulen2016-02-041-6/+12
| * | | | Merge branch 'master' into PLT-1851=Corey Hulen2016-02-0454-1005/+3728
| |\| | |
| * | | | PLT-1851 reconnect and get missing messages=Corey Hulen2016-02-031-1/+4
* | | | | Merge pull request #2071 from hmhealey/plt1820Corey Hulen2016-02-044-41/+36
|\ \ \ \ \
| * | | | | Added focus to the sidebar textbox when it is openedhmhealey2016-02-041-0/+6
| * | | | | Added code to refocus on the post/comment textbox after a file is drag and dr...hmhealey2016-02-042-0/+8
| * | | | | Updated RHS textbox to refocus after clicking to upload a filehmhealey2016-02-041-0/+5