summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Added a small margin where the PostsView will be considered to be at the ↵hmhealey2016-01-201-1/+4
| | | | | | | | | | | | | | | | | | | | bottom even if it's not exactly at the bottom
| * | | | Removed some vestigial code from the post textboxhmhealey2016-01-201-19/+0
| | | | |
| * | | | Changed the post textbox resizing code to be more reliable and not rely on ↵hmhealey2016-01-202-24/+30
| |/ / / | | | | | | | | | | | | magic numbers
* | | | Merge pull request #1924 from loafoe/masterChristopher Speller2016-01-212-1/+12
|\ \ \ \ | | | | | | | | | | [#1923] Make Websocket ports configurable
| * | | | Fix indentationAndy Lo-A-Foe2016-01-201-7/+7
| | | | |
| * | | | Optionally specify ws:// and wss:// port in configAndy Lo-A-Foe2016-01-192-1/+12
| | |/ / | |/| |
* | | | Merge pull request #1927 from rgarmsen2295/plt-1668Christopher Speller2016-01-219-44/+57
|\ \ \ \ | |_|_|/ |/| | | PLT-1668 Removes duplicate short username error message
| * | | Removed extraneous error when providing a short usernameReed Garmsen2016-01-209-44/+57
| |/ /
* | | Merge pull request #1922 from cloudron-io/check_auth_serviceHarrison Healey2016-01-211-2/+2
|\ \ \ | | | | | | | | Check auth_service when constructing messages
| * | | Check auth_service for constructing messagegirish@cloudron.io2016-01-191-1/+1
| | | |
| * | | Check auth_service to describe user login messagegirish@cloudron.io2016-01-191-1/+1
| | | |
* | | | Merge pull request #1882 from trashcan/PLT-1232-more-channel-infoHarrison Healey2016-01-211-2/+10
|\ \ \ \ | | | | | | | | | | PLT-1232: More channel info
| * | | | Show correct channel URL in channel info modalPat Lathem2016-01-131-1/+4
| | | | |
| * | | | Rename 'Channel Handle' to Channel URL'Pat Lathem2016-01-131-1/+1
| | | | |
| * | | | Add channel purposePat Lathem2016-01-131-0/+5
| | | | |
* | | | | Merge pull request #1893 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-2130-15/+55
|\ \ \ \ \ | | | | | | | | | | | | Updating logo
| * | | | | Fixing height for iconAsaad Mahmood2016-01-201-1/+1
| | | | | |
| * | | | | Updating status icon cssAsaad Mahmood2016-01-201-1/+3
| | | | | |
| * | | | | Fixing status icon in IE11Asaad Mahmood2016-01-201-0/+1
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2016-01-201-3/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | ui-improvements
| * | | | | Updating favicon fileAsaad Mahmood2016-01-151-1/+1
| | | | | |
| * | | | | Updating favicon fileAsaad Mahmood2016-01-151-1/+1
| | | | | |
| * | | | | Adding gradient bg behind logoAsaad Mahmood2016-01-1518-0/+0
| | | | | |
| * | | | | Adding bg behind logosAsaad Mahmood2016-01-1518-0/+0
| | | | | |
| * | | | | Updating logoAsaad Mahmood2016-01-1528-14/+51
| | |_|/ / | |/| | |
* | | | | Merge pull request #1886 from rgarmsen2295/plt-549cJoram Wilander2016-01-211-2/+10
|\ \ \ \ \ | | | | | | | | | | | | PLT-549 Fixed react warning issue with setState in RHS
| * | | | | Fixed react warning issue with setState in RHSReed Garmsen2016-01-131-2/+10
| | | | | |
* | | | | | Merge pull request #1885 from rgarmsen2295/plt-406Joram Wilander2016-01-212-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | PLT-406 Fixes issues with drag and drop overlay in IE11
| * | | | | Fix issue with file overlay getting stuck in ie11Reed Garmsen2016-01-131-0/+1
| | | | | |
| * | | | | Fix issue with drag n drop overlay in ie11Reed Garmsen2016-01-121-0/+4
| | | | | |
* | | | | | Revert " PLT-7 adding loc for db calls"Corey Hulen2016-01-202-51/+50
| | | | | |
* | | | | | PLT-7 adding loc db calls for users table=Corey Hulen2016-01-202-10/+10
| | | | | |
* | | | | | PLT-7 adding loc db calls for posts table=Corey Hulen2016-01-201-1/+1
| | | | | |
* | | | | | PLT-7 adding loc db calls for session table=Corey Hulen2016-01-201-3/+3
| | | | | |
* | | | | | PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-201-10/+10
| | | | | |
* | | | | | PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-201-6/+6
| | | | | |
* | | | | | PLT-7 adding loc db calls for webhooks table=Corey Hulen2016-01-201-1/+1
| | | | | |
* | | | | | PLT-7 adding loc db calls for team table=Corey Hulen2016-01-201-13/+13
| | | | | |
* | | | | | PLT-7 adding loc for db calls audits and prefs=Corey Hulen2016-01-201-6/+7
| |_|_|/ / |/| | | |
* | | | | Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-141-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | Release 1.4
| * | | | Encode url query properly for SSO switchingJoramWilander2016-01-141-3/+3
| | | | |
* | | | | Fix error messageJoramWilander2016-01-141-5/+10
| | | | |
* | | | | Minor update to about modalJoramWilander2016-01-141-4/+1
| | | | |
* | | | | Added license validation and settingsJoramWilander2016-01-1411-27/+397
| |_|/ / |/| | |
* | | | Merge pull request #1855 from rgarmsen2295/plt-1006Corey Hulen2016-01-134-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 tooltipReed Garmsen2016-01-114-7/+45
| | | | |
* | | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-135-6/+20
|\ \ \ \ \ | | | | | | | | | | | | Adding away icon and changing online and offline icons
| * | | | | Adding away icon and changing online and offline iconsAsaad Mahmood2016-01-115-6/+20
| | | | | |
* | | | | | Merge pull request #1850 from mattermost/preview-modeCorey Hulen2016-01-131-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Documenting how Preview Mode is disabled
| * | | | | Update email_settings.jsxit332016-01-091-1/+1
| | | | | |