Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1263 from yuvipanda/add-me | Corey Hulen | 2015-11-02 | 1 | -0/+30 |
|\ | | | | | Add a /me command | ||||
| * | PLT-394: Add a /me command | YuviPanda | 2015-11-01 | 1 | -0/+30 |
| | | | | | | | | | | | | | | - Just italicizes the message to mark it as 'action' - Same behavior as slack - Is super useful for people moving from IRC, since /me is often burnt into muscle memory | ||||
* | | Merge pull request #1204 from toyorg/patch-3 | Corey Hulen | 2015-11-02 | 1 | -2/+10 |
|\ \ | | | | | | | Added Gmail and Office 365 SMTP info | ||||
| * | | Added Gmail and Office 365 SMTP info | Michal | 2015-10-28 | 1 | -2/+10 |
| | | | | | | | | | Based on Google support and Microsoft Technet. | ||||
* | | | Create documentation-guidelines.md | it33 | 2015-11-02 | 1 | -0/+185 |
| | | | | | | | | | Moving from internal site here, though still in draft form | ||||
* | | | Merge pull request #1260 from vinnymac/fix/browser-detection | Harrison Healey | 2015-11-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix isBrowserEdge typo | ||||
| * | | | fix isBrowserEdge typo | Vincent Taverna | 2015-11-01 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1264 from girishso/team-name-lt4 | Christopher Speller | 2015-11-02 | 2 | -2/+5 |
|\ \ \ | | | | | | | | | PLT-835: Show error message when team name is fewer than 4 characters | ||||
| * | | | Update the UI to check for 4 characters to match the server | Girish S | 2015-11-02 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | fixes PLT-692 | ||||
| * | | | Show error message when team name is fewer than 4 characters | Girish S | 2015-11-02 | 1 | -0/+3 |
| |/ / | | | | | | | | | | | | | I have still kept the length validation in team_signup_url_page.jsx in case user chooses the url shorter than 4 characters | ||||
* | | | Merge pull request #1222 from rgarmsen2295/plt-550 | Joram Wilander | 2015-11-02 | 2 | -1/+6 |
|\ \ \ | | | | | | | | | PLT-550 Fixed various issues with commenting on recently deleted posts | ||||
| * | | | Fixed various issues with commenting on recently deleted posts | Reed Garmsen | 2015-10-30 | 2 | -1/+6 |
| | | | | |||||
* | | | | Merge pull request #1257 from florianorben/align_channel_header | Christopher Speller | 2015-11-02 | 3 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | correctly align channel header with sidebar header | ||||
| * | | | | correctly align channel header with sidebar header | Florian Orben | 2015-10-31 | 3 | -2/+8 |
| | | | | | |||||
* | | | | | Merge pull request #1253 from rgarmsen2295/plt-799 | Christopher Speller | 2015-11-02 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-799 Turn-off browser auto-completion in the search bar | ||||
| * | | | | | Turn-off default auto-completion in the search bar | Reed Garmsen | 2015-10-30 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #1246 from trashcan/fix-spelling | Christopher Speller | 2015-11-02 | 14 | -60/+60 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix spelling of "encountered" and "environment" | ||||
| * | | | | | | Go fmt and rename file with 'enviroment' in filename | Pat Lathem | 2015-10-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix spelling of environment | Pat Lathem | 2015-10-30 | 5 | -28/+28 |
| | | | | | | | |||||
| * | | | | | | Fix spelling of encountered | Pat Lathem | 2015-10-30 | 9 | -31/+31 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #1136 from esethna/patch-10 | Christopher Speller | 2015-11-02 | 1 | -23/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update AWS EBS Install Instuctions | ||||
| * | | | | | | Update AWS EBS Install Instuctions V4 | esethna | 2015-10-29 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | Clarified instance type and removed step 13. | ||||
| * | | | | | | Update AWS EBS Install Instuctions V3 | esethna | 2015-10-26 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | Remove step to change health reporting | ||||
| * | | | | | | Update AWS EBS Install Instuctions V2 | esethna | 2015-10-22 | 1 | -11/+19 |
| | | | | | | | | | | | | | | | | | | | | | Made adjustments based on Christopher's and Lindsay's feedback. Thanks guys! | ||||
| * | | | | | | Update AWS EBS Install Instuctions | esethna | 2015-10-21 | 1 | -23/+16 |
| | | | | | | | | | | | | | | | | | | | | | Added step 10 which blocked setup in previous version. Tweaked formatting and clarity. | ||||
* | | | | | | | Update about.html | it33 | 2015-11-01 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Update CHANGELOG.md | it33 | 2015-11-01 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | Minor changes and correcting typos | ||||
* | | | | | | | Update CHANGELOG.md | it33 | 2015-11-01 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | Added new team settings options | ||||
* | | | | | | | Update CHANGELOG.md | it33 | 2015-11-01 | 1 | -2/+71 |
| |_|_|_|/ / |/| | | | | | | | | | | | Preparing for feature complete update | ||||
* | | | | | | Update Outgoing-Webhooks.md | it33 | 2015-11-01 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Update Incoming-Webhooks.md | it33 | 2015-11-01 | 1 | -3/+3 |
| |_|_|/ / |/| | | | | | | | | | Noting known issues for v1.1 | ||||
* | | | | | Merge pull request #1248 from mattermost/it33-patch-1 | Corey Hulen | 2015-10-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed typo | ||||
| * | | | | | Fixed typo | it33 | 2015-10-30 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #1251 from rgarmsen2295/plt-941 | Corey Hulen | 2015-10-30 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-941 Adds Safari 7 and IE10 to the list of unsupported browsers | ||||
| * | | | | Added Safari 7 and IE10 to the list of unsupported browsers | Reed Garmsen | 2015-10-30 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #1250 from mattermost/eslint-fix | Harrison Healey | 2015-10-30 | 4 | -10/+8 |
|\ \ \ \ | |/ / / |/| | | | Fixing eslint not recursing | ||||
| * | | | Fixing eslint not recursing | Christopher Speller | 2015-10-30 | 4 | -10/+8 |
|/ / / | |||||
* | | | Merge pull request #1242 from apaatsio/check-errors-on-create-table | Joram Wilander | 2015-10-30 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | Log errors in table creation | ||||
| * | | | Log errors in table creation | Antti Ahti | 2015-10-30 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | This is really helpful if you somehow mess up the schema definitions. | ||||
* | | | | Merge pull request #1240 from mattermost/lfbrock-patch-1-1 | Corey Hulen | 2015-10-30 | 1 | -0/+21 |
|\ \ \ \ | | | | | | | | | | | Update Requirements.md to include mail clients | ||||
| * | | | | Update Requirements.md to include mail clients | lfbrock | 2015-10-30 | 1 | -0/+21 |
| | | | | | |||||
* | | | | | Merge pull request #1238 from girishso/webhook-creator-notifs | Corey Hulen | 2015-10-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | display webhook notifications to the creator of webhook | ||||
| * | | | | | display webhook notifications to the creator of webhook | Girish S | 2015-10-30 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #1236 from girishso/webhook-notification | Corey Hulen | 2015-10-30 | 1 | -1/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Show usernames overridden by Incoming Webhooks in notification messages. | ||||
| * | | | | | Show usernames overridden by Incoming Webhooks in notification messages. | Girish S | 2015-10-30 | 1 | -1/+3 |
| |/ / / / | | | | | | | | | | | | | | | | fixes PLT-856 | ||||
* | | | | | Merge pull request #1211 from mattermost/PLT-340 | Joram Wilander | 2015-10-30 | 28 | -145/+781 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-340 allow team directory and open invites | ||||
| * | | | | | Adding error when enabling team dir without global prop being set. | =Corey Hulen | 2015-10-29 | 1 | -2/+9 |
| | | | | | | |||||
| * | | | | | Moving single team redirect to backend | =Corey Hulen | 2015-10-28 | 2 | -8/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-28 | 7 | -60/+65 |
| |\ \ \ \ \ | |||||
| * | | | | | | PLT-340 allow team directory and open invites | =Corey Hulen | 2015-10-27 | 1 | -1/+7 |
| | | | | | | |