Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #1933 from hmhealey/plt1661 | Corey Hulen | 2016-01-21 | 3 | -42/+32 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Added a small margin where the PostsView will be considered to be at the bott... | hmhealey | 2016-01-20 | 1 | -1/+4 | |
| * | | | | | | Removed some vestigial code from the post textbox | hmhealey | 2016-01-20 | 1 | -19/+0 | |
| * | | | | | | Changed the post textbox resizing code to be more reliable and not rely on ma... | hmhealey | 2016-01-20 | 2 | -24/+30 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1924 from loafoe/master | Christopher Speller | 2016-01-21 | 5 | -1/+32 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update documentation for WebsocketSecurePort | Andy Lo-A-Foe | 2016-01-20 | 1 | -1/+1 | |
| * | | | | | | Fix indentation | Andy Lo-A-Foe | 2016-01-20 | 1 | -7/+7 | |
| * | | | | | | Optionally specify ws:// and wss:// port in config | Andy Lo-A-Foe | 2016-01-19 | 5 | -1/+32 | |
* | | | | | | | Merge pull request #1927 from rgarmsen2295/plt-1668 | Christopher Speller | 2016-01-21 | 9 | -44/+57 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | ||||||
| * | | | | | | Removed extraneous error when providing a short username | Reed Garmsen | 2016-01-20 | 9 | -44/+57 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge pull request #1922 from cloudron-io/check_auth_service | Harrison Healey | 2016-01-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 ui-impro... | Asaad Mahmood | 2016-01-20 | 58 | -41/+12444 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| * | | | | | | | | 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 have b... | Pat Lathem | 2016-01-14 | 2 | -2/+2 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #1886 from rgarmsen2295/plt-549c | Joram Wilander | 2016-01-21 | 1 | -2/+10 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | 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 | 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 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 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | 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" | 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 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 |