summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2224 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-02-231-1/+20
|\
| * UI improvementsAsaad Mahmood2016-02-231-1/+20
* | Merge pull request #2216 from mattermost/fix-cmdsJoram Wilander2016-02-231-16/+13
|\ \
| * | Fixing localization error in commandsChristopher Speller2016-02-221-16/+13
* | | Merge pull request #2217 from mattermost/fix-droidJoram Wilander2016-02-236-18/+179
|\ \ \ | |_|/ |/| |
| * | Fixing postgres=Corey Hulen2016-02-222-3/+3
| * | Fixing device id column for droid=Corey Hulen2016-02-226-18/+179
* | | Merge pull request #2223 from ZBoxApp/fix-locsChristopher Speller2016-02-237-905/+904
|\ \ \
| * | | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067Elias Nahum2016-02-237-905/+904
* | | | Merge pull request #2214 from hmhealey/plt1422Corey Hulen2016-02-221-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed Makefile to properly kill watchify on stop-clienthmhealey2016-02-221-1/+6
* | | | Merge pull request #2213 from hmhealey/psChristopher Speller2016-02-225-141/+91
|\ \ \ \
| * | | | Updated perfect-scrollbar to 0.6.10hmhealey2016-02-225-141/+91
| | |/ / | |/| |
* | | | Merge pull request #2210 from hmhealey/plt1258Christopher Speller2016-02-224-159/+207
|\ \ \ \ | |_|/ / |/| | |
| * | | Ported RenameChannelModal to React-Bootstraphmhealey2016-02-224-159/+207
|/ / /
* | | Merge pull request #2211 from mattermost/asaadmahmoodspin-ui-improvementsChristopher Speller2016-02-2213-7/+26
|\ \ \ | |/ / |/| |
| * | Localizing back button=Corey Hulen2016-02-2211-9/+14
| * | Merge branch 'ui-improvements' of https://github.com/asaadmahmoodspin/platfor...=Corey Hulen2016-02-2211-7/+21
| |\ \ | | |/ | |/|
| | * Fixing link on find_teamAsaad Mahmood2016-02-111-1/+1
| | * Adding back button for login pagesAsaad Mahmood2016-02-1111-7/+21
* | | Merge pull request #2208 from mattermost/client-upgradesHarrison Healey2016-02-2290-406/+449
|\ \ \ | |/ / |/| |
| * | Updating some client deps + eslintChristopher Speller2016-02-2290-406/+449
* | | Merge pull request #2204 from kernicPanel/PLT-1880Joram Wilander2016-02-224-9/+9
|\ \ \ | |/ / |/| |
| * | PLT-1800 Replace webhooks documentation URLNicolas Clerc2016-02-214-9/+9
* | | Merge pull request #2199 from rgarmsen2295/plt-1688Christopher Speller2016-02-221-1/+1
|\ \ \
| * | | Fixed issue with corrupted custom mentions on username changeReed Garmsen2016-02-191-1/+1
* | | | Formatting tweaks to READMEit332016-02-211-25/+25
* | | | Re-organized READMEit332016-02-211-99/+34
| |/ / |/| |
* | | Merge pull request #2198 from timlyo/patch-1it332016-02-191-1/+1
|\ \ \ | |/ / |/| |
| * | Fixed dead linkTim2016-02-191-1/+1
|/ /
* | Merge pull request #2191 from hmhealey/plt1256Joram Wilander2016-02-184-95/+116
|\ \
| * | Ported PostDeletedModal to React-Bootstraphmhealey2016-02-184-95/+116
* | | Merge pull request #2192 from rgarmsen2295/plt-1622Joram Wilander2016-02-183-52/+58
|\ \ \
| * | | Removed ability to copy a permalink on mobileReed Garmsen2016-02-183-52/+58
* | | | Merge pull request #2193 from rgarmsen2295/plt-1858Joram Wilander2016-02-181-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed content security policy headerReed Garmsen2016-02-181-1/+1
|/ / /
* | | Merge pull request #2189 from mattermost/plt-2042Harrison Healey2016-02-1857-4139/+1
|\ \ \
| * | | Moving tests to /tests and removing /doc folder. Docs are now in seperate rep...Christopher Speller2016-02-1857-4139/+1
|/ / /
* | | Merge pull request #2188 from ZBoxApp/missing-locs-esChristopher Speller2016-02-183-12/+18
|\ \ \
| * | | Added missing spanish translationsElias Nahum2016-02-183-12/+18
|/ / /
* | | Merge pull request #2183 from mattermost/file-upload-fixCorey Hulen2016-02-173-3/+4
|\ \ \
| * | | Fix loc error with cancelling in progress uploadsJoramWilander2016-02-173-3/+4
* | | | Merge pull request #2181 from mattermost/plt-1707Christopher Speller2016-02-174-117/+119
|\ \ \ \
| * | | | Added help text to sso switching and removed redundant divsJoramWilander2016-02-174-117/+119
* | | | | Update README.mdit332016-02-171-1/+1
* | | | | Merge pull request #2182 from rgarmsen2295/plt-1515Corey Hulen2016-02-171-1/+1
|\ \ \ \ \
| * | | | | Changed wording of password change email to be more generalizedReed Garmsen2016-02-171-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #2180 from hmhealey/plt1422Corey Hulen2016-02-171-18/+30
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Added restart-server target to Makefilehmhealey2016-02-171-18/+30
| |/ / /
* | | | Merge pull request #2179 from mattermost/fix-droidCorey Hulen2016-02-171-12/+16
|\ \ \ \ | |_|/ / |/| | |