Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename doc/usage/Slack-Import.md to doc/help/Slack-Import.md | it33 | 2015-10-08 | 1 | -0/+0 |
| | |||||
* | Update README.md | it33 | 2015-10-08 | 1 | -9/+22 |
| | |||||
* | Update Incoming-Webhooks.md | it33 | 2015-10-08 | 1 | -6/+12 |
| | |||||
* | Merge pull request #973 from mattermost/new-webhook-docs | it33 | 2015-10-08 | 2 | -62/+74 |
|\ | | | | | Update and rename Incoming.md to Incoming-Webhooks.md | ||||
| * | Update and rename Incoming.md to Incoming-Webhooks.md | it33 | 2015-10-07 | 2 | -62/+74 |
| | | |||||
* | | Update README.md | it33 | 2015-10-08 | 1 | -1/+1 |
| | | |||||
* | | Create README.md | it33 | 2015-10-08 | 1 | -0/+12 |
| | | |||||
* | | Create Manage-Team.md | it33 | 2015-10-08 | 1 | -0/+37 |
| | | |||||
* | | Merge pull request #984 from hmhealey/linkfix | Corey Hulen | 2015-10-08 | 1 | -1/+1 |
|\ \ | | | | | | | Fixed html used for autolinking | ||||
| * | | Fixed html used for autolinking | hmhealey | 2015-10-08 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #983 from mattermost/fix-db-upgrade | Harrison Healey | 2015-10-08 | 4 | -9/+3 |
|\ \ | | | | | | | Fixing db upgrade for 1.1 | ||||
| * | | Fixing db upgrade for 1.1 | =Corey Hulen | 2015-10-08 | 4 | -9/+3 |
| | | | |||||
* | | | Merge pull request #977 from mattermost/lfbrock-patch-1 | Corey Hulen | 2015-10-08 | 1 | -0/+64 |
|\ \ \ | |/ / |/| | | Updated to include v1.1.0 | ||||
| * | | Update CHANGELOG.md | lfbrock | 2015-10-08 | 1 | -0/+1 |
| | | | |||||
| * | | Update to include v1.1.0 | lfbrock | 2015-10-08 | 1 | -0/+63 |
| | | | |||||
* | | | Renaming SpinPunch, Inc. to Mattermost, Inc. | it33 | 2015-10-08 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #982 from hmhealey/plt547 | Harrison Healey | 2015-10-08 | 1 | -24/+24 |
|\ \ \ | | | | | | | | | PLT-547 Changed emoticons so that they must be surrounded by whitespace | ||||
| * | | | Fixed parsing of :'( emoticon | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changed emoticons so that they much be surrounded by whitespace | hmhealey | 2015-10-08 | 1 | -24/+24 |
| | | | | |||||
| * | | | Switched :p emoticon | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #981 from mattermost/plt-517 | Christopher Speller | 2015-10-08 | 303 | -303/+303 |
|\ \ \ \ | | | | | | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright | ||||
| * | | | | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 303 | -303/+303 |
| |/ / / | |||||
* | | | | Merge pull request #978 from mattermost/plt-355 | Corey Hulen | 2015-10-08 | 5 | -114/+111 |
|\ \ \ \ | | | | | | | | | | | PLT-355 Fixing ability to dynamicly update members list. | ||||
| * | | | | Fixing ability to dynamicly update members list. | Christopher Speller | 2015-10-08 | 5 | -114/+111 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #971 from mattermost/PLT-567 | Corey Hulen | 2015-10-08 | 3 | -6/+30 |
|\ \ \ \ | | | | | | | | | | | PLT-567 auto join open channels | ||||
| * | | | | Fixing issue with lastIndexOf | =Corey Hulen | 2015-10-08 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Adding removing blank target for browser links | =Corey Hulen | 2015-10-08 | 2 | -2/+7 |
| | | | | | |||||
| * | | | | PLT-567 auto join open channels | =Corey Hulen | 2015-10-07 | 2 | -5/+24 |
| |/ / / | |||||
* | | | | Merge pull request #979 from mattermost/it33-patch-1 | Corey Hulen | 2015-10-08 | 1 | -6/+2 |
|\ \ \ \ | |_|/ / |/| | | | Removing unneeded <br> in welcome text | ||||
| * | | | Tweaking welcome text in Town-Square | it33 | 2015-10-08 | 1 | -6/+2 |
|/ / / | |||||
* | | | Merge pull request #966 from mattermost/GIT-960 | Christopher Speller | 2015-10-08 | 3 | -11/+17 |
|\ \ \ | | | | | | | | | GIT-960 show error when you cannot create a team | ||||
| * | | | GIT-960 show error when you cannot create a team | =Corey Hulen | 2015-10-07 | 3 | -11/+17 |
| |/ / | |||||
* | | | Merge pull request #944 from mattermost/PLT-518 | Christopher Speller | 2015-10-08 | 11 | -59/+198 |
|\ \ \ | | | | | | | | | PLT-518 check for security bulletins | ||||
| * | | | Moving to url.Values | =Corey Hulen | 2015-10-07 | 1 | -11/+3 |
| | | | | |||||
| * | | | Moving to url.Values | =Corey Hulen | 2015-10-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changing to url values | =Corey Hulen | 2015-10-07 | 2 | -17/+9 |
| | | | | |||||
| * | | | PLT-518 check for security bulletins | =Corey Hulen | 2015-10-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | PLT-518 check for security bulletins | =Corey Hulen | 2015-10-05 | 11 | -48/+203 |
| | | | | |||||
* | | | | Merge pull request #931 from rgarmsen2295/plt-112 | Christopher Speller | 2015-10-08 | 9 | -15/+157 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-112 Improves email change verification process | ||||
| * | | | Added new email to email change notification | Reed Garmsen | 2015-10-06 | 3 | -26/+19 |
| | | | | |||||
| * | | | Resending the verification email now sends the appropriate version of the ↵ | Reed Garmsen | 2015-10-05 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | email depending on whether it's a change or first signup | ||||
| * | | | Added better verification when a user changes his or her email | Reed Garmsen | 2015-10-05 | 4 | -7/+57 |
| | | | | |||||
| * | | | Initial cosmetic changes to the process of verifying a changed email | Reed Garmsen | 2015-10-05 | 7 | -8/+102 |
| | | | | |||||
* | | | | Merge pull request #970 from mattermost/GIT-957 | Harrison Healey | 2015-10-08 | 16 | -15/+15 |
|\ \ \ \ | | | | | | | | | | | GIT-957 fixing email templates and logos | ||||
| * | | | | GIT-957 fixing email templates and logos | =Corey Hulen | 2015-10-07 | 16 | -15/+15 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #952 from tomitm/PLT-445 | Harrison Healey | 2015-10-08 | 3 | -11/+84 |
|\ \ \ \ | | | | | | | | | | | PLT-445 Create About dialog | ||||
| * | | | | Use ReactBootstrap.Modal instead. | Tomi M | 2015-10-07 | 4 | -50/+58 |
| | | | | | |||||
| * | | | | PLT-445 Create About dialog | Tomi M | 2015-10-06 | 5 | -11/+76 |
| | | | | | |||||
* | | | | | Merge pull request #948 from rgarmsen2295/plt-167 | Harrison Healey | 2015-10-08 | 3 | -9/+41 |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-167 Fixes issue with trying to comment on a deleted post | ||||
| * | | | | Now handles commenting on a deleted post gracefully, and checks for any ↵ | Reed Garmsen | 2015-10-07 | 3 | -20/+19 |
| | | | | | | | | | | | | | | | | | | | | areas where data may no longer exist once a post has been deleted |