Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1886 from rgarmsen2295/plt-549c | Joram Wilander | 2016-01-21 | 1 | -2/+10 |
|\ | | | | | PLT-549 Fixed react warning issue with setState in RHS | ||||
| * | Fixed react warning issue with setState in RHS | Reed Garmsen | 2016-01-13 | 1 | -2/+10 |
| | | |||||
* | | Merge pull request #1885 from rgarmsen2295/plt-406 | Joram Wilander | 2016-01-21 | 2 | -0/+5 |
|\ \ | | | | | | | PLT-406 Fixes issues with drag and drop overlay in IE11 | ||||
| * | | Fix issue with file overlay getting stuck in ie11 | Reed Garmsen | 2016-01-13 | 1 | -0/+1 |
| | | | |||||
| * | | Fix issue with drag n drop overlay in ie11 | Reed Garmsen | 2016-01-12 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #1884 from hmhealey/plt1403 | Joram Wilander | 2016-01-21 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | PLT-1403 Removed incorrect test case for autolinking urls with angle brackets | ||||
| * | | | Removed incorrect test case for autolinking urls with angle brackets | hmhealey | 2016-01-20 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge pull request #1883 from rosskusler/master | Joram Wilander | 2016-01-21 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | fixed typo in URL to emoji.codes | ||||
| * | | | | fixed typo in URL to emoji.codes | Ross Kusler | 2016-01-13 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1867 from apskim/patch-1 | Joram Wilander | 2016-01-21 | 1 | -0/+22 |
|\ \ \ \ | | | | | | | | | | | Parse Slack links in the attachment pretext and fields (Fix #1868) | ||||
| * | | | | Parse Slack links in the attachment fields | Alex Polozov | 2016-01-11 | 1 | -0/+16 |
| | | | | | |||||
| * | | | | Parse Slack links in the attachment pretext | Alex Polozov | 2016-01-11 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Merge pull request #1934 from mattermost/PLT-7-server-db | Corey Hulen | 2016-01-20 | 6 | -13/+47 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-7-server-db | ||||
| * | | | | tweaking | =Corey Hulen | 2016-01-20 | 1 | -6/+5 |
| | | | | | |||||
| * | | | | tweak | =Corey Hulen | 2016-01-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | PLT-7-server-db | =Corey Hulen | 2016-01-20 | 7 | -13/+48 |
|/ / / / | |||||
* | | | | Merge pull request #1932 from mattermost/revert-1930-PLT-7-server-db | Corey Hulen | 2016-01-20 | 56 | -1297/+1255 |
|\ \ \ \ | | | | | | | | | | | Revert " PLT-7 adding loc for db calls" | ||||
| * | | | | Revert " PLT-7 adding loc for db calls" | Corey Hulen | 2016-01-20 | 56 | -1297/+1255 |
|/ / / / | |||||
* | | | | Merge pull request #1930 from mattermost/PLT-7-server-db | Corey Hulen | 2016-01-20 | 56 | -1255/+1297 |
|\ \ \ \ | | | | | | | | | | | PLT-7 adding loc for db calls | ||||
| * | | | | PLT-7 adding loc db calls for users table | =Corey Hulen | 2016-01-20 | 33 | -320/+323 |
| | | | | | |||||
| * | | | | PLT-7 adding loc db calls for posts table | =Corey Hulen | 2016-01-20 | 10 | -181/+182 |
| | | | | | |||||
| * | | | | PLT-7 adding loc db calls for session table | =Corey Hulen | 2016-01-20 | 11 | -72/+75 |
| | | | | | |||||
| * | | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 19 | -292/+303 |
| | | | | | |||||
| * | | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 7 | -67/+71 |
| | | | | | |||||
| * | | | | PLT-7 adding loc db calls for webhooks table | =Corey Hulen | 2016-01-20 | 8 | -86/+88 |
| | | | | | |||||
| * | | | | PLT-7 adding loc db calls for team table | =Corey Hulen | 2016-01-20 | 12 | -109/+113 |
| | | | | | |||||
| * | | | | PLT-7 adding loc db calls for system table | =Corey Hulen | 2016-01-20 | 5 | -20/+22 |
| | | | | | |||||
| * | | | | PLT-7 adding loc for db calls audits and prefs | =Corey Hulen | 2016-01-20 | 15 | -108/+120 |
|/ / / / | |||||
* | | | | Merge pull request #1926 from mattermost/PLT-7-context | Corey Hulen | 2016-01-19 | 11 | -10/+193 |
|\ \ \ \ | | | | | | | | | | | PLT-7 Adding translation function to context | ||||
| * | | | | Fxing version | =Corey Hulen | 2016-01-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | PLT-7 Adding translation function to context | =Corey Hulen | 2016-01-19 | 12 | -11/+194 |
|/ / / / | |||||
* | | | | Merge pull request #1921 from mattermost/PLT-7-server-libs | Corey Hulen | 2016-01-19 | 41 | -0/+12241 |
|\ \ \ \ | | | | | | | | | | | PLT-7 adding server side libraries | ||||
| * | | | | PLT-7 adding server side libraries | =Corey Hulen | 2016-01-19 | 41 | -0/+12241 |
|/ / / / | |||||
* | | | | Merge pull request #1915 from pawelad/patch-1 | Corey Hulen | 2016-01-19 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | Update Amazon-Elastic-Beanstalk.md | ||||
| * | | | | Update Amazon-Elastic-Beanstalk.md | Paweł Adamczak | 2016-01-18 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | Updated 'Dockerrun.aws.zip' link to newer, existing version | ||||
* | | | | | Merge pull request #1920 from pawelad/master | Corey Hulen | 2016-01-19 | 1 | -0/+0 |
|\ \ \ \ \ | | | | | | | | | | | | | #1916 - Fixed Dockerrun.aws.zip 1.4 | ||||
| * | | | | | #1916 - Fixed Dockerrun.aws.zip 1.4 | Paweł Adamczak | 2016-01-19 | 1 | -0/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #1907 from cifvts/patch-4 | Corey Hulen | 2016-01-19 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Bump download link to version to 1.4.0 | ||||
| * | | | | Bump download link to version to 1.4.0 | Andrea Agosti | 2016-01-18 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Remove extra config info | JoramWilander | 2016-01-14 | 1 | -24/+1 |
| | | | | |||||
* | | | | Merge pull request #1894 from mattermost/release-1.4 | Corey Hulen | 2016-01-14 | 2 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Release 1.4 | ||||
| * | | | | Fixing dockerfile for release | =Corey Hulen | 2016-01-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1892 from mattermost/sso-email-fix | Corey Hulen | 2016-01-14 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Encode url query properly for SSO switching | ||||
| | * | | | | Encode url query properly for SSO switching | JoramWilander | 2016-01-14 | 1 | -3/+3 |
| |/ / / / | |||||
* | | | | | Merge pull request #1888 from mattermost/fix-droid | Corey Hulen | 2016-01-14 | 1 | -3/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixing android push | ||||
| * \ \ \ \ | Merge branch 'master' into fix-droid | =Corey Hulen | 2016-01-14 | 2 | -2/+2 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Fix old l4g references | JoramWilander | 2016-01-14 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Fixing android push | =Corey Hulen | 2016-01-14 | 1 | -3/+10 |
|/ / / / / | |||||
* | | | | | Minor fix | JoramWilander | 2016-01-14 | 1 | -5/+0 |
| | | | | | |||||
* | | | | | Merge pull request #1887 from mattermost/editions | Joram Wilander | 2016-01-14 | 24 | -43/+900 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Editions |