Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Renaming "Handle" to "Channel URL" or "URL" | it33 | 2015-09-20 | 1 | -2/+2 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #731 from asaadmahmoodspin/new-channel | Christopher Speller | 2015-09-21 | 2 | -6/+10 | |
|\ \ \ \ | | | | | | | | | | | Updating new channel UI | |||||
| * | | | | Updating new channel UI | Asaad Mahmood | 2015-09-21 | 2 | -6/+10 | |
| |/ / / | ||||||
* | | | | Merge pull request #723 from hmhealey/plt17 | Christopher Speller | 2015-09-21 | 4 | -21/+84 | |
|\ \ \ \ | |/ / / |/| | | | PLT-17 Added Markdown support to the text formatter | |||||
| * | | | Cleaned up markdown formatting code and removed debug statements | hmhealey | 2015-09-19 | 2 | -7/+9 | |
| | | | | ||||||
| * | | | Deferred to marked.js's html sanitization when markdown is enabled | hmhealey | 2015-09-19 | 1 | -2/+12 | |
| | | | | ||||||
| * | | | Changed markdown link parsing to automatically add an explicit protocol to urls | hmhealey | 2015-09-19 | 2 | -1/+16 | |
| | | | | ||||||
| * | | | Prevented our url autolinking from breaking markdown links | hmhealey | 2015-09-19 | 1 | -6/+34 | |
| | | | | ||||||
| * | | | Added marked library to text_formatting.jsx | hmhealey | 2015-09-19 | 3 | -3/+13 | |
| | | | | ||||||
| * | | | Removed underscores surrounding formatting tokens since they won't work with ↵ | hmhealey | 2015-09-19 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | markdown | |||||
| * | | | Removed unnecessary conversion of newlines to html line breaks | hmhealey | 2015-09-19 | 1 | -6/+4 | |
| |/ / | ||||||
* | | | Adjusting CLA request template | it33 | 2015-09-19 | 1 | -1/+10 | |
| | | | ||||||
* | | | Added note on build version info improvement | it33 | 2015-09-19 | 1 | -0/+4 | |
| | | | ||||||
* | | | Merge pull request #724 from mattermost/GIT-721 | Corey Hulen | 2015-09-19 | 1 | -2/+2 | |
|\ \ \ | |/ / |/| | | GIT-721 Removing sql ping log message | |||||
| * | | GIT-721 Removing sql ping log | =Corey Hulen | 2015-09-19 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #720 from mattermost/it33-patch-4 | Corey Hulen | 2015-09-18 | 1 | -1/+1 | |
|\ \ | | | | | | | Adjusting description of emoji codes feature | |||||
| * | | Adjusting description of emoji codes feature | it33 | 2015-09-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #709 from mattermost/PLT-11 | Harrison Healey | 2015-09-18 | 28 | -531/+993 | |
|\ \ \ | | | | | | | | | PLT-11 adding config for logs to UI | |||||
| * \ \ | merging | =Corey Hulen | 2015-09-18 | 22 | -27/+515 | |
| |\ \ \ | ||||||
| * \ \ \ | fixing merge | =Corey Hulen | 2015-09-18 | 5 | -10/+19 | |
| |\ \ \ \ | ||||||
| * | | | | | Moving logout item | =Corey Hulen | 2015-09-17 | 1 | -6/+6 | |
| | | | | | | ||||||
| * | | | | | PLT-11 adding config for logs to UI | =Corey Hulen | 2015-09-17 | 17 | -293/+208 | |
| | | | | | | ||||||
| * | | | | | PLT-11 Adding ability to save config file | =Corey Hulen | 2015-09-17 | 14 | -295/+842 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #718 from mattermost/it33-patch-3 | Corey Hulen | 2015-09-18 | 1 | -2/+4 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Adding build status indicator to README.md | |||||
| * | | | | Adding build status indicator to README.md | it33 | 2015-09-18 | 1 | -2/+4 | |
| | | | | | ||||||
* | | | | | Merge pull request #719 from lfbrock/patch-8 | it33 | 2015-09-18 | 1 | -2/+17 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Updated changlog to include new contributors and features | |||||
| * | | | | Updated changlog to include new contributors and features | lfbrock | 2015-09-18 | 1 | -2/+17 | |
|/ / / / | ||||||
* | | | | Merge pull request #717 from mattermost/fix-loadtest | Corey Hulen | 2015-09-18 | 2 | -3/+4 | |
|\ \ \ \ | |_|_|/ |/| | | | Fix authentication for server load tests. | |||||
| * | | | Fix authentication for loadtests. | JoramWilander | 2015-09-18 | 2 | -3/+4 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #699 from mattermost/PLT-92 | Joram Wilander | 2015-09-18 | 21 | -28/+500 | |
|\ \ \ | | | | | | | | | PLT-92 Adding server side versioning to the binary | |||||
| * | | | moving to security tab | =Corey Hulen | 2015-09-17 | 2 | -12/+11 | |
| | | | | ||||||
| * | | | fixing versioning | =Corey Hulen | 2015-09-17 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Making changes to versioning | =Corey Hulen | 2015-09-17 | 13 | -69/+86 | |
| | | | | ||||||
| * | | | Merge branch 'master' into PLT-92 | =Corey Hulen | 2015-09-17 | 973 | -55/+89408 | |
| |\ \ \ | ||||||
| * | | | | Fixing postgres issue and bumping version number | =Corey Hulen | 2015-09-16 | 2 | -3/+50 | |
| | | | | | ||||||
| * | | | | Adding version to UI | =Corey Hulen | 2015-09-16 | 2 | -1/+13 | |
| | | | | | ||||||
| * | | | | Adding database schema version | =Corey Hulen | 2015-09-16 | 7 | -3/+222 | |
| | | | | | ||||||
| * | | | | Outputing version to logs on server start | =Corey Hulen | 2015-09-16 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | fixing build | =Corey Hulen | 2015-09-16 | 2 | -1/+2 | |
| | | | | | ||||||
| * | | | | PLT-92 Adding server side versioning to the binary | =Corey Hulen | 2015-09-16 | 13 | -23/+199 | |
| | | | | | ||||||
* | | | | | Merge pull request #716 from hmhealey/plt299 | Corey Hulen | 2015-09-18 | 1 | -1/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-299 Fixed incorrect check if a url starts with an explicit protocol | |||||
| * | | | | | Fixed incorrect check if a url starts with an explicit protocol | hmhealey | 2015-09-18 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #714 from mattermost/test-matrix | Corey Hulen | 2015-09-18 | 2 | -0/+16 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Adding go 1.5.1 and postgress to travis build | |||||
| * | | | | Adding go 1.5.1 and postgress to travis build | Christopher Speller | 2015-09-18 | 2 | -0/+16 | |
| | | | | | ||||||
* | | | | | Merge pull request #713 from mattermost/it33-patch-3 | Christopher Speller | 2015-09-18 | 1 | -1/+6 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Adding template for contributor list request | |||||
| * | | | | Adding template for contributor list request | it33 | 2015-09-18 | 1 | -1/+6 | |
| | | | | | ||||||
* | | | | | Merge pull request #712 from mattermost/postgres-oauth-fix | Christopher Speller | 2015-09-18 | 1 | -0/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | With Postgres return false when checking if column exists, if the table does not exist. | |||||
| * | | | | Return false when checking if column exists, if the table does not exist ↵ | JoramWilander | 2015-09-18 | 1 | -0/+4 | |
|/ / / / | | | | | | | | | | | | | with postgres. | |||||
* | | | | Merge pull request #665 from chengweiv5/fix-coding-style | Christopher Speller | 2015-09-18 | 4 | -10/+10 | |
|\ \ \ \ | |_|_|/ |/| | | | Fix coding style: replace tab with whitespace in mattermost config | |||||
| * | | | Fix coding style: replace tab with whitespace in mattermost config | Chengwei Yang | 2015-09-13 | 4 | -10/+10 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> |