Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | 2 | -1/+12 | |
|\ \ \ \ | | | | | | | | | | | [#1923] Make Websocket ports configurable | |||||
| * | | | | 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 | 2 | -1/+12 | |
| | |/ / | |/| | | ||||||
* | | | | 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 | 1 | -3/+3 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | 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 #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 | |
| | | | | | | ||||||
* | | | | | | Revert " PLT-7 adding loc for db calls" | Corey Hulen | 2016-01-20 | 2 | -51/+50 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for users table | =Corey Hulen | 2016-01-20 | 2 | -10/+10 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for posts table | =Corey Hulen | 2016-01-20 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for session table | =Corey Hulen | 2016-01-20 | 1 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 1 | -10/+10 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for oauth table | =Corey Hulen | 2016-01-20 | 1 | -6/+6 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for webhooks table | =Corey Hulen | 2016-01-20 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc db calls for team table | =Corey Hulen | 2016-01-20 | 1 | -13/+13 | |
| | | | | | | ||||||
* | | | | | | PLT-7 adding loc for db calls audits and prefs | =Corey Hulen | 2016-01-20 | 1 | -6/+7 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Merge pull request #1894 from mattermost/release-1.4 | Corey Hulen | 2016-01-14 | 1 | -3/+3 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Release 1.4 | |||||
| * | | | | Encode url query properly for SSO switching | JoramWilander | 2016-01-14 | 1 | -3/+3 | |
| | | | | | ||||||
* | | | | | Fix error message | JoramWilander | 2016-01-14 | 1 | -5/+10 | |
| | | | | | ||||||
* | | | | | Minor update to about modal | JoramWilander | 2016-01-14 | 1 | -4/+1 | |
| | | | | | ||||||
* | | | | | Added license validation and settings | JoramWilander | 2016-01-14 | 11 | -27/+397 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #1855 from rgarmsen2295/plt-1006 | Corey Hulen | 2016-01-13 | 4 | -7/+45 | |
|\ \ \ \ | | | | | | | | | | | PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip | |||||
| * | | | | Changed statistics to show usernames with an email tooltip | Reed Garmsen | 2016-01-11 | 4 | -7/+45 | |
| | | | | | ||||||
* | | | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-13 | 5 | -6/+20 | |
|\ \ \ \ \ | | | | | | | | | | | | | Adding away icon and changing online and offline icons | |||||
| * | | | | | Adding away icon and changing online and offline icons | Asaad Mahmood | 2016-01-11 | 5 | -6/+20 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #1850 from mattermost/preview-mode | Corey Hulen | 2016-01-13 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Documenting how Preview Mode is disabled | |||||
| * | | | | | Update email_settings.jsx | it33 | 2016-01-09 | 1 | -1/+1 | |
| | | | | | |