Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Merge pull request #1001 from mattermost/missed-pr | it33 | 2015-10-11 | 2 | -2/+2 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Missed PR - Help text update to webhooks | |||||
| | * | | | | | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Update user_settings_integrations.jsx | it33 | 2015-10-09 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Update manage_incoming_hooks.jsx | it33 | 2015-10-09 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Update CHANGELOG.md | it33 | 2015-10-11 | 1 | -3/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #998 from mattermost/lfbrock-patch-1 | it33 | 2015-10-11 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixing incorrect markdown | |||||
| * | | | | | | Fixing incorrect markdown | lfbrock | 2015-10-09 | 1 | -1/+1 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #1002 from mattermost/beta-label | it33 | 2015-10-10 | 1 | -3/+3 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Adding beta label to Slack Import | |||||
| * | | | | | | Adding beta label to Slack Import | it33 | 2015-10-10 | 1 | -3/+3 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1003 from mattermost/heading-alignment | it33 | 2015-10-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Aligning heading with text | |||||
| * | | | | | | Aligning heading with text | it33 | 2015-10-10 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #1004 from mattermost/bug-fix | it33 | 2015-10-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | bugfix should be two words | |||||
| * | | | | | bugfix should be two words | it33 | 2015-10-10 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge branch 'release-1.1.0' | Christopher Speller | 2015-10-09 | 11 | -108/+109 | |
|\| | | | | ||||||
| * | | | | Fixing broken travis release build | Christopher Speller | 2015-10-08 | 2 | -3/+14 | |
| | | | | | ||||||
| * | | | | Adding release 1.1.0 version | Christopher Speller | 2015-10-08 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | Creating dockerfiles for release 1.1.0 | Christopher Speller | 2015-10-08 | 8 | -105/+94 | |
| |/ / / | ||||||
* | | / | Update README.md | it33 | 2015-10-09 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | Update README.md | it33 | 2015-10-08 | 1 | -0/+2 | |
| | | | ||||||
* | | | Update Slack-Import.md | it33 | 2015-10-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Update README.md | it33 | 2015-10-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | 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 |