summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* PLT-1572 Adding more info to the error message=Corey Hulen2016-01-053-6/+6
|
* Merge pull request #1804 from rgarmsen2295/plt-1536Corey Hulen2016-01-051-7/+13
|\ | | | | PLT-1536 Fixed issue where font would not reset even after cancelling or exiting settings
| * Fixed issue where font would remain changed even after cancelling changesReed Garmsen2016-01-041-7/+13
| |
* | Update Upgrade-Guide.mdit332016-01-051-1/+18
| |
* | Merge pull request #1805 from ejm2172/patch-1it332016-01-041-1/+1
|\ \ | |/ |/| Added word "team"
| * Added word "team"Earl Myers2016-01-041-1/+1
|/
* Merge pull request #1801 from hmhealey/plt1602Christopher Speller2016-01-042-17/+35
|\ | | | | PLT-1602 Fix ViewImageModal incorrectly assuming it has a file's info in certain cases
| * Fixed ViewImage modal to clear its loaded state when its file list changeshmhealey2016-01-042-9/+19
| |
| * Changed the ViewImageModal to only store info for the current imagehmhealey2016-01-041-8/+16
| |
* | Merge pull request #1745 from mattermost/plt-1118Christopher Speller2016-01-0420-267/+1214
|\ \ | | | | | | PLT-1118 Add ability to switch between SSO and email account
| * | Add ability to switch between SSO and email accountJoramWilander2015-12-1720-267/+1214
| | |
* | | Merge pull request #1715 from rgarmsen2295/plt-1148Joram Wilander2016-01-043-3/+26
|\ \ \ | |_|/ |/| | PLT-1148 Opens links within help text in a new tab rather than the current tab
| * | Made links in help text open in a new tabReed Garmsen2016-01-043-3/+26
|/ /
* | Merge pull request #1788 from hjf288/GIT-1682Corey Hulen2016-01-044-124/+171
|\ \ | | | | | | GIT-1682: Complete the SSL configuration section of the documentation…
| * | Add missing DH param generation instructions to SSL sectionHjf2882015-12-293-4/+4
| | |
| * | GIT-1682: Complete the SSL configuration section of the documentation and ↵Hjf2882015-12-284-120/+167
| | | | | | | | | | | | normalise the spacing in the NGINX config examples
* | | Merge pull request #1785 from mattermost/plt-1492Corey Hulen2016-01-041-11/+14
|\ \ \ | | | | | | | | PLT-1492 Fix default for teammate name display setting
| * | | Fix default for teammate name display settingJoramWilander2015-12-281-11/+14
| |/ /
* | | Merge pull request #1784 from mattermost/plt-1591Corey Hulen2016-01-041-3/+6
|\ \ \ | | | | | | | | PLT-1591 Fix appearance settings scroll bug
| * | | Fix appearance settings scroll bugJoramWilander2015-12-281-3/+6
| |/ /
* | | Merge pull request #1800 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-046-26/+48
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | Multiple UI ImprovementsAsaad Mahmood2016-01-046-26/+48
| | | |
* | | | Merge pull request #1770 from mattermost/GIT-1766Christopher Speller2016-01-041-1/+1
|\ \ \ \ | | | | | | | | | | GIT-1766 fixing typo
| * | | | GIT-1766 fixing typo=Corey Hulen2015-12-231-1/+1
| | | | |
* | | | | Merge pull request #1769 from mattermost/PLT-1488Christopher Speller2016-01-042-1/+4
|\ \ \ \ \ | | | | | | | | | | | | PLT-1488 fixing error message from session revoke
| * | | | | Fixing multi team issue=Corey Hulen2015-12-231-1/+1
| | | | | |
| * | | | | PLT-1488 fixing error message from session revoke=Corey Hulen2015-12-231-0/+3
| |/ / / /
* | | | | Merge pull request #1763 from benburkert/non-s3-regionChristopher Speller2016-01-042-17/+45
|\ \ \ \ \ | |_|/ / / |/| | | | support unofficial S3 regions
| * | | | support unofficial S3 regionsBen Burkert2015-12-212-17/+45
| | | | | | | | | | | | | | | | | | | | Adds support for S3 clones like Ceph.
* | | | | Merge pull request #1787 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-031-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Improving spacing for bullet points.
| * | | | | Fixing bulletsAsaad Mahmood2015-12-281-1/+1
| | | | | |
| * | | | | Fixing bulletsAsaad Mahmood2015-12-281-1/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #1786 from hjf288/PLT-853Corey Hulen2016-01-032-2/+2
|\ \ \ \ \ | | | | | | | | | | | | PLT-853: Correct mail templates to show "You've joined the [teamname] team"...
| * | | | | Correct mail templates to show 'You've been invited to [teamname] team' ↵Hjf2882015-12-282-2/+2
| |/ / / / | | | | | | | | | | | | | | | rather than you've been invited when signing up
* | | | | Merge pull request #1790 from hjf288/PLT-1587Corey Hulen2016-01-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | PLT-1587 - REGRESSION: Mattermost v1.3.0 System Console does not save Email Settings
| * | | | | Correct typo in email_settings.jsx that prevents enabling the 'Send push ↵Hjf2882015-12-291-1/+1
| |/ / / / | | | | | | | | | | | | | | | notifications' option
* | | | | Merge pull request #1794 from esethna/patch-48Corey Hulen2016-01-034-3/+5
|\ \ \ \ \ | | | | | | | | | | | | Docs and help text changes
| * | | | | Update README.md index for docs/help menuEric Sethna2015-12-301-0/+2
| | | | | | | | | | | | | | | | | | Add "notifications" and "creating teams" to readme index
| * | | | | Update team_settings.jsxEric Sethna2015-12-301-1/+1
| | | | | | | | | | | | | | | | | | help text for restrict domains
| * | | | | Update team_general_tab.jsxEric Sethna2015-12-301-1/+1
| | | | | | | | | | | | | | | | | | help text for invite code in team settings
| * | | | | Update Team-Settings.mdEric Sethna2015-12-301-1/+1
| | | | | | | | | | | | | | | | | | fix typo
| * | | | | Update Team-Settings.mdEric Sethna2015-12-301-1/+1
|/ / / / / | | | | | | | | | | Update documentation on the Invite Code.
* / / / / Update Configuration-Settings.mdit332015-12-291-1/+1
|/ / / /
* | | | Merge pull request #1740 from hmhealey/plt730Joram Wilander2015-12-286-23/+224
|\ \ \ \ | | | | | | | | | | PLT-730/PLT-731 Added remaining mobile UI V2 components
| * | | | Added theme styling to floating timestamphmhealey2015-12-161-2/+2
| | | | |
| * | | | Cleaned up floating post componentshmhealey2015-12-161-35/+54
| | | | |
| * | | | Added scroll to bottom arrows for mobilehmhealey2015-12-163-3/+42
| | | | |
| * | | | Hid floating timestamp header on non-mobilehmhealey2015-12-162-0/+6
| | | | |
| * | | | Added DelayedAction class to use to handle stopping scrollinghmhealey2015-12-163-2/+46
| | | | |
| * | | | Added floating post timestamphmhealey2015-12-163-18/+111
| | | | |