summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |_|/ |/| |
| * | Fixing JS bug with droid=Corey Hulen2016-02-171-12/+16
* | | Merge pull request #2176 from rgarmsen2295/plt-1870Harrison Healey2016-02-172-12/+59
|\ \ \ | |_|/ |/| |
| * | Added license audit parsing to audit tableReed Garmsen2016-02-162-12/+59
|/ /
* | Merge pull request #2171 from asaadmahmoodspin/ui-fixesJoram Wilander2016-02-169-17/+212
|\ \ | |/ |/|
| * Other minor improvementsAsaad Mahmood2016-02-153-3/+25
| * Fixing custom theme header click eventAsaad Mahmood2016-02-152-6/+10
| * Multiple UI ImprovementsAsaad Mahmood2016-02-156-14/+183
|/
* Merge pull request #2146 from ttyniwa/feature/PLT-1908Corey Hulen2016-02-143-17/+118
|\
| * add translated messages to es.json.Tatsuya Niwa2016-02-121-0/+4
| * delete not translated messages in es.jsonTatsuya Niwa2016-02-121-4/+0
| * Add a warning when demoting yourself from System Administrator from the team ...Tatsuya Niwa2016-02-113-17/+118
* | Merge pull request #2168 from ZBoxApp/permalink-spanishCorey Hulen2016-02-141-0/+2
|\ \
| * | RHS spanish translations for permalinkElias Nahum2016-02-141-0/+2
* | | Merge pull request #2165 from ZBoxApp/update-locsCorey Hulen2016-02-142-2/+2
|\ \ \ | |/ / |/| |
| * | Update loc stringsElias Nahum2016-02-122-2/+2
* | | Merge pull request #2123 from hmhealey/plt1711Joram Wilander2016-02-141-0/+1
|\ \ \
| * | | Prevent the admin console from switching to a team that is being removed from...hmhealey2016-02-091-0/+1
* | | | Merge pull request #2138 from rgarmsen2295/plt-1672Joram Wilander2016-02-144-1/+48
|\ \ \ \
| * | | | Added permalink feature to posts in the RHSReed Garmsen2016-02-124-1/+48
| | |/ / | |/| |
* | | | Merge branch 'release-2.0'Christopher Speller2016-02-136-17/+52
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #2161 from mattermost/load-more-fixChristopher Speller2016-02-131-1/+1
| |\ \ \
| | * | | Fix load more messages being broken by getPostsSince callJoramWilander2016-02-121-1/+1