Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1922 from cloudron-io/check_auth_service | Harrison Healey | 2016-01-21 | 1 | -2/+2 |
|\ | | | | | Check auth_service when constructing messages | ||||
| * | Check auth_service for constructing message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 |
| | | |||||
| * | Check auth_service to describe user login message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1882 from trashcan/PLT-1232-more-channel-info | Harrison Healey | 2016-01-21 | 1 | -2/+10 |
|\ \ | | | | | | | PLT-1232: More channel info | ||||
| * | | Show correct channel URL in channel info modal | Pat Lathem | 2016-01-13 | 1 | -1/+4 |
| | | | |||||
| * | | Rename 'Channel Handle' to Channel URL' | Pat Lathem | 2016-01-13 | 1 | -1/+1 |
| | | | |||||
| * | | Add channel purpose | Pat Lathem | 2016-01-13 | 1 | -0/+5 |
| | | | |||||
* | | | Merge pull request #1893 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-01-21 | 30 | -15/+55 |
|\ \ \ | | | | | | | | | Updating logo | ||||
| * | | | Fixing height for icon | Asaad Mahmood | 2016-01-20 | 1 | -1/+1 |
| | | | | |||||
| * | | | Updating status icon css | Asaad Mahmood | 2016-01-20 | 1 | -1/+3 |
| | | | | |||||
| * | | | Fixing status icon in IE11 | Asaad Mahmood | 2016-01-20 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2016-01-20 | 58 | -41/+12444 |
| |\ \ \ | | | | | | | | | | | | | | | | ui-improvements | ||||
| * | | | | Updating favicon file | Asaad Mahmood | 2016-01-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Updating favicon file | Asaad Mahmood | 2016-01-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Adding gradient bg behind logo | Asaad Mahmood | 2016-01-15 | 18 | -0/+0 |
| | | | | | |||||
| * | | | | Adding bg behind logos | Asaad Mahmood | 2016-01-15 | 18 | -0/+0 |
| | | | | | |||||
| * | | | | Updating logo | Asaad Mahmood | 2016-01-15 | 28 | -14/+51 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1891 from trashcan/PLT-1515-password-change-wording | Joram Wilander | 2016-01-21 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Improve wording of password change email to indicate that it might not be user initiated | ||||
| * | | | | Improve wording of password change email to indicate that it might not have ↵ | Pat Lathem | 2016-01-14 | 2 | -2/+2 |
| | |_|/ | |/| | | | | | | | | | | been user initiated | ||||
* | | | | 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 |
|/ / / / / / |