Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1381 from mishimi/patch-10 | Joram Wilander | 2015-11-11 | 1 | -4/+4 |
|\ | | | | | Updated bullet points section | ||||
| * | Update documentation-guidelines.md | mishimi | 2015-11-10 | 1 | -6/+4 |
| | | |||||
| * | Updated bullet points section | mishimi | 2015-11-10 | 1 | -4/+6 |
| | | |||||
* | | Merge pull request #1352 from florianorben/PLT-1049 | Joram Wilander | 2015-11-11 | 6 | -20/+509 |
|\ \ | | | | | | | PLT-1049: Vine URLs should not generate preview links | ||||
| * | | add unit test | Florian Orben | 2015-11-10 | 1 | -0/+30 |
| | | | |||||
| * | | move provider.json to components folder; fix indentation; add json files to ↵ | Florian Orben | 2015-11-10 | 4 | -325/+326 |
| | | | | | | | | | | | | eslintignore | ||||
| * | | PLT-1049: Vine URLs should not generate preview links | Florian Orben | 2015-11-10 | 4 | -20/+478 |
| | | | |||||
* | | | Merge pull request #1389 from florianorben/preview-markdown | Christopher Speller | 2015-11-11 | 3 | -6/+54 |
|\ \ \ | | | | | | | | | Preview markdown post | ||||
| * | | | add button to preview your current post | Florian Orben | 2015-11-10 | 3 | -6/+54 |
| | | | | |||||
* | | | | Update Troubleshooting.md | it33 | 2015-11-11 | 1 | -0/+12 |
| | | | | |||||
* | | | | Merge pull request #1391 from florianorben/editorconfig | Harrison Healey | 2015-11-11 | 1 | -0/+21 |
|\ \ \ \ | | | | | | | | | | | Add .editorconfig file to allow editors/IDEs to auto apply the correct settings | ||||
| * | | | | Add .editorconfig file to allow editors/IDEs to auto apply the correct settings | Florian Orben | 2015-11-11 | 1 | -0/+21 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1396 from 42wim/useractivity | Joram Wilander | 2015-11-11 | 1 | -1/+0 |
|\ \ \ \ | | | | | | | | | | | Do not clear LastActivityAt for GetProfiles | ||||
| * | | | | Do not clear LastActivityAt for GetProfiles | Wim | 2015-11-11 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1390 from florianorben/fix-unable-to-change-pass | Joram Wilander | 2015-11-11 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix: Unable to change password | ||||
| * | | | | Fix: Unable to change password | Florian Orben | 2015-11-11 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Update Troubleshooting.md | it33 | 2015-11-10 | 1 | -2/+2 |
| | | | | |||||
* | | | | Update Troubleshooting.md | it33 | 2015-11-10 | 1 | -6/+6 |
| | | | | |||||
* | | | | Update Troubleshooting.md | it33 | 2015-11-10 | 1 | -2/+16 |
| | | | | |||||
* | | | | Update Troubleshooting.md | it33 | 2015-11-10 | 1 | -0/+4 |
| | | | | |||||
* | | | | Rename messaging.md to Messaging.md | it33 | 2015-11-10 | 1 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #1392 from mattermost/messaging-help | it33 | 2015-11-10 | 1 | -0/+34 |
|\ \ \ \ | |/ / / |/| | | | Create messaging.md | ||||
| * | | | Create messaging.md | it33 | 2015-11-10 | 1 | -0/+34 |
|/ / / | |||||
* | | | Merge pull request #1351 from florianorben/latex-support | Corey Hulen | 2015-11-10 | 87 | -78/+115 |
|\ \ \ | |/ / |/| | | Add latex support | ||||
| * | | add textgeneration unit test | Florian Orben | 2015-11-10 | 1 | -0/+15 |
| | | | |||||
| * | | fix indentation to use tabs | Florian Orben | 2015-11-10 | 2 | -80/+80 |
| | | | |||||
| * | | Add latex support | Florian Orben | 2015-11-10 | 86 | -2/+24 |
|/ / | | | | | | | | | | | Adds latex highlighting support via https://www.npmjs.com/package/katex as requested in https://mattermost.uservoice.com/forums/306457-general/suggestions/10160757-add-latex-support | ||||
* | | Merge pull request #1384 from rompic/master | it33 | 2015-11-10 | 1 | -1/+1 |
|\ \ | |/ |/| | fixed link to ubuntu production doc | ||||
| * | fixed link to ubuntu production doc | rompic | 2015-11-10 | 1 | -1/+1 |
|/ | | | | | the current link doesn't exist. alternatively: https://github.com/mattermost/platform/blob/v1.1.1/doc/install/Production-Ubuntu.md | ||||
* | Merge pull request #1365 from hmhealey/eslintbabel | Christopher Speller | 2015-11-10 | 2 | -1/+3 |
|\ | | | | | Switched eslint to use babel-eslint parser | ||||
| * | Switched eslint to use babel-eslint parser | hmhealey | 2015-11-09 | 2 | -1/+3 |
| | | |||||
* | | Merge pull request #1377 from jdhoek/bug/spelling | Joram Wilander | 2015-11-10 | 2 | -9/+9 |
|\ \ | | | | | | | Spelling: replace 'Ex' with 'E.g.' in placeholders | ||||
| * | | Spelling: replace 'Ex' with 'E.g.' in placeholders | Jeroen Hoek | 2015-11-10 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | When abbreviating "For example" in English, "e.g." is used. See also: https://english.stackexchange.com/questions/16197/whats-the-difference-between-e-g-and-ex | ||||
* | | | Merge pull request #1370 from mattermost/plt-1008 | Christopher Speller | 2015-11-10 | 2 | -1/+18 |
|\ \ \ | | | | | | | | | PLT-1008 Add skip tutorial button to intro screens | ||||
| * | | | Add skip tutorial button to intro screens | JoramWilander | 2015-11-09 | 2 | -1/+18 |
| |/ / | |||||
* | | | Merge pull request #1363 from mattermost/plt-664 | Christopher Speller | 2015-11-10 | 4 | -22/+35 |
|\ \ \ | | | | | | | | | PLT-664 Omit unneeded fields from user object in getProfiles service | ||||
| * | | | Omit unneeded fields from user object in getProfiles service and remove ↵ | JoramWilander | 2015-11-09 | 4 | -22/+35 |
| |/ / | | | | | | | | | | ImgCount field from Post model | ||||
* | | | Merge pull request #1374 from mattermost/lfbrock-patch-1 | Joram Wilander | 2015-11-10 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Update CHANGELOG.md to fix typos | ||||
| * | | Update CHANGELOG.md to fix typos | lfbrock | 2015-11-09 | 1 | -1/+1 |
|/ / | |||||
* | | Fixing build | Christopher Speller | 2015-11-09 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #1350 from rgarmsen2295/plt-597 | Christopher Speller | 2015-11-09 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-597 Moves the 'Email verified' toast to above the sign-in prompt on the login screen | ||||
| * | | Moved 'Email verified' toast to above the sign-in prompt on the login screen | Reed Garmsen | 2015-11-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1346 from Tsynapse/patch-3 | Christopher Speller | 2015-11-09 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Updated Postgres instructions | ||||
| * | | | Updated Postgres instructions | Jason | 2015-11-06 | 1 | -0/+10 |
| | | | | | | | | | | | | Included altering the listening addresses and allowing incoming connections to the database. | ||||
* | | | | Removing old DB upgrade code | Christopher Speller | 2015-11-09 | 4 | -73/+0 |
| | | | | |||||
* | | | | Updating version to v1.2.0 | Christopher Speller | 2015-11-09 | 1 | -0/+1 |
| | | | | |||||
* | | | | Updating dockerfile for release v1.2.0-rc1 | Christopher Speller | 2015-11-09 | 8 | -6/+35 |
| | | | | |||||
* | | | | Merge pull request #1367 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2015-11-09 | 6 | -6/+14 |
|\ \ \ \ | | | | | | | | | | | Updating tutorial tip and adding div tags to webhook labels. | ||||
| * | | | | Updating variable tipColor | Asaad Mahmood | 2015-11-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Updating tutorial tip | Asaad Mahmood | 2015-11-09 | 6 | -6/+14 |
| | | | | |