| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1940 from ZBoxApp/PLT-7-go | Corey Hulen | 2016-01-21 | 11 | -146/+917 |
| |\ | | | | | Refactoring api to use translations (chunk 1) | ||||
| | * | Fix bug to load the default locale if no system locale is found | Elias Nahum | 2016-01-21 | 1 | -17/+6 |
| | | | |||||
| | * | Remove settings from config.json | Elias Nahum | 2016-01-21 | 1 | -23/+0 |
| | | | |||||
| | * | Refactoring api to use translations (chunk 1) | Elias Nahum | 2016-01-21 | 11 | -140/+945 |
| | | | | | | | | | | | | | | | | | - Add spanish translations - Files in order by name from admin to export - Does not include api templates and tests - Fix web_test to load translations - Fix i18n to fallback to DEFAULT_LOCALE if no system locale found | ||||
| * | | Merge pull request #1937 from hmhealey/plt1695 | Corey Hulen | 2016-01-21 | 1 | -1/+5 |
| |\ \ | | | | | | | PLT-1695 Completely disabled broken pasting of images on IE11 | ||||
| | * | | Completely disabled broken pasting of images on IE11 | hmhealey | 2016-01-20 | 1 | -1/+5 |
| | |/ | |||||
| * | | Merge pull request #1935 from hmhealey/plt1664 | Corey Hulen | 2016-01-21 | 1 | -1/+1 |
| |\ \ | | | | | | | PLT-1664 Fix unread channel indicators so that they work on IE11 | ||||
| | * | | Changed UnreadChannelIndicator display style so that it uses a value that ↵ | hmhealey | 2016-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | IE11 supports | ||||
| * | | | Merge pull request #1933 from hmhealey/plt1661 | Corey Hulen | 2016-01-21 | 3 | -42/+32 |
| |\ \ \ | | | | | | | | | PLT-1661/PLT-1745 Scrolling fixes | ||||
| | * | | | Added a small margin where the PostsView will be considered to be at the ↵ | hmhealey | 2016-01-20 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | bottom even if it's not exactly at the bottom | ||||
| | * | | | 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 ↵ | hmhealey | 2016-01-20 | 2 | -24/+30 |
| | |/ / | | | | | | | | | | magic numbers | ||||
| * | | | Merge pull request #1924 from loafoe/master | Christopher Speller | 2016-01-21 | 5 | -1/+32 |
| |\ \ \ | | | | | | | | | [#1923] Make Websocket ports configurable | ||||
| | * | | | 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 |
| |\ \ \ \ | | | | | | | | | | | PLT-1668 Removes duplicate short username error message | ||||
| | * | | | | 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 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 | ||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |