summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | 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
| | | | |
* | | | | Merge pull request #1755 from hmhealey/plt1108Joram Wilander2015-12-2811-231/+416
|\ \ \ \ \ | | | | | | | | | | | | PLT-1108 Refactored ViewImage modal and made it automatically play animated gifs
| * | | | | Fixed TestGetFile unit testhmhealey2015-12-183-5/+16
| | | | | |
| * | | | | Changed 'Previewing' to 'Loading' in ViewImage modalhmhealey2015-12-181-1/+1
| | | | | |
| * | | | | Refactored ViewImage modal and made it automatically play animated gifshmhealey2015-12-186-200/+254
| | | | | |
| * | | | | Added additional information to getFileInfo api callhmhealey2015-12-183-26/+146
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1757 from hmhealey/plt1482Joram Wilander2015-12-281-3/+7
|\ \ \ \ \ | | | | | | | | | | | | PLT-1482 Changed how the sidebar opens the more channels modal
| * | | | | Changed how the sidebar opens the more channels modalhmhealey2015-12-181-3/+7
| | | | | |
* | | | | | Update CHANGELOG.mdit332015-12-261-0/+1
| | | | | |
* | | | | | Merge pull request #1773 from hvnsweeting/masterit332015-12-261-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | fix typo: Ngnix -> NGINX
| * | | | | fix typo: Ngnix -> NGINXHung Nguyen Viet2015-12-251-1/+1
|/ / / / /
* | | | | Merge pull request #1768 from mattermost/lfbrock-patch-2Corey Hulen2015-12-231-0/+19
|\ \ \ \ \ | | | | | | | | | | | | Update test-markdown-lists.md
| * | | | | Update test-markdown-lists.mdlfbrock2015-12-231-0/+19
|/ / / / /
* | | | | Merge pull request #1762 from mattermost/fix-signupCorey Hulen2015-12-221-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fixing signup
| * | | | Fixing signup=Corey Hulen2015-12-211-0/+4
|/ / / /
* | | | Merge pull request #1760 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-12-219-15/+37
|\ \ \ \ | | | | | | | | | | Multiple UI Improvements
| * | | | Multiple UI ImprovementsAsaad Mahmood2015-12-219-15/+37
|/ / / /
* | | | Merge pull request #1756 from mattermost/lfbrock-emojisCorey Hulen2015-12-181-21/+21
|\ \ \ \ | | | | | | | | | | PLT-1122 Fixed black_large_square emoticon. Also fixed emoji mapping.
| * | | | Fixed emoji mapping.Lindsay Brock2015-12-181-21/+21
| |/ / /
* | | | Merge pull request #1746 from esethna/patch-47Corey Hulen2015-12-181-0/+38
|\ \ \ \ | | | | | | | | | | Create Creating-Teams.md
| * | | | Create Creating-Teams.mdEric Sethna2015-12-171-0/+38
| | |/ / | |/| | | | | | Info on methods to create teams, restrictions on name and url, and info on account permissions across teams
* | | | Merge pull request #1754 from mattermost/lfbrock-patch-1Corey Hulen2015-12-181-95/+129
|\ \ \ \ | | | | | | | | | | Update release process
| * | | | Update release-process.mdlfbrock2015-12-181-1/+1
| | | | |
| * | | | Update release-process.mdlfbrock2015-12-181-13/+12
| | | | |
| * | | | Update release-process.mdlfbrock2015-12-171-81/+82
| | | | |