Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Minor formatting adjustments | it33 | 2015-10-20 | 1 | -46/+45 |
| | |||||
* | Merge pull request #1126 from mattermost/upgrade-guide | it33 | 2015-10-20 | 1 | -0/+16 |
|\ | | | | | Create Upgrade-Guide.md | ||||
| * | Create Upgrade-Guide.md | it33 | 2015-10-20 | 1 | -0/+16 |
| | | |||||
* | | Merge branch 'release-1.1.0' | Christopher Speller | 2015-10-20 | 5 | -9/+189 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #1125 from mattermost/changelog-update | Christopher Speller | 2015-10-20 | 1 | -4/+169 |
| |\ | | | | | | | Update CHANGELOG.md | ||||
| | * | Update CHANGELOG.md | it33 | 2015-10-20 | 1 | -4/+169 |
| |/ | |||||
| * | Merge pull request #1115 from mattermost/salt-fix | Christopher Speller | 2015-10-20 | 1 | -8/+8 |
| |\ | | | | | | | Allowing salts longer than 32 chars | ||||
| | * | Allowing salts longer than 32 chars | =Corey Hulen | 2015-10-19 | 1 | -8/+8 |
| | | | |||||
| * | | Merge pull request #1119 from mattermost/fix-db-upgrade | Harrison Healey | 2015-10-20 | 3 | -1/+19 |
| |\ \ | | |/ | |/| | Hotfix to allow db schema .7 to be upgraded to 1.1 | ||||
| | * | Hotfix to allow .7 to be upgraded to 1.1 | =Corey Hulen | 2015-10-20 | 3 | -1/+19 |
| |/ | |||||
* | | Merge pull request #1100 from girishso/wink_emoji | Joram Wilander | 2015-10-20 | 1 | -0/+1 |
|\ \ | | | | | | | PLT-699: translate ;) to wink emoji | ||||
| * | | translate ;) to wink emoji | Girish S | 2015-10-18 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #1116 from sharms/master | Joram Wilander | 2015-10-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixed missing colon | ||||
| * | | | Fixed missing colon | Steven Harms | 2015-10-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1084 from apaatsio/handle-window-resize-properly | Joram Wilander | 2015-10-20 | 6 | -34/+95 |
|\ \ \ \ | | | | | | | | | | | Handle window resize in React way | ||||
| * | | | | Handle window resize events in React way | Antti Ahti | 2015-10-20 | 6 | -34/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling. See http://facebook.github.io/react/tips/dom-event-listeners.html | ||||
* | | | | | Merge pull request #1113 from hmhealey/plt716 | Joram Wilander | 2015-10-20 | 8 | -68/+420 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-716/717 Added from:, in:, and channel: search filters | ||||
| * | | | | | Fixed incorrectly escaped * in wildcard search for postgres | hmhealey | 2015-10-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Added from:, in:, and channel: search modifiers | hmhealey | 2015-10-19 | 8 | -68/+420 |
| | | | | | | |||||
* | | | | | | Merge pull request #1095 from rgarmsen2295/plt-661 | Joram Wilander | 2015-10-20 | 6 | -25/+25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-661 Changed all goroutine functions to use '...AndForget' as the naming convention | ||||
| * | | | | | | Changed all goroutine functions to use '...AndForget' as the standard naming ↵ | Reed Garmsen | 2015-10-19 | 6 | -25/+25 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | system | ||||
* | | | | | | Create Gitlab-Integration-Service-for-Mattermost.md | it33 | 2015-10-20 | 1 | -0/+9 |
| |_|/ / / |/| | | | | |||||
* | | | | | Minor formatting adjustment | it33 | 2015-10-19 | 1 | -9/+9 |
|/ / / / | |||||
* | | | | Merge pull request #1114 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-19 | 4 | -10/+12 |
|\ \ \ \ | | | | | | | | | | | Ui improvements | ||||
| * | | | | Updating direct messages title | Asaad Mahmood | 2015-10-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-19 | 20 | -201/+328 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | ui-improvements | ||||
| * | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-19 | 4 | -9/+11 |
| | | | | | | |||||
* | | | | | | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 26 | -113/+1612 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | PLT-235 Implement outgoing webhooks. | ||||
| * | | | | | Update db index for outgoing webhook | JoramWilander | 2015-10-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Generalized webhook post code and added it to outgoing webhooks | JoramWilander | 2015-10-19 | 2 | -35/+46 |
| | | | | | | |||||
| * | | | | | Refactor to hit database less often. | JoramWilander | 2015-10-19 | 7 | -161/+89 |
| | | | | | | |||||
| * | | | | | Remove special team logic. | JoramWilander | 2015-10-19 | 1 | -29/+19 |
| | | | | | | |||||
| * | | | | | Show/hide integrations properly based off config settings. | JoramWilander | 2015-10-19 | 2 | -51/+55 |
| | | | | | | |||||
| * | | | | | Fix postgres query and minor UI updates for outgoing webhooks. | JoramWilander | 2015-10-19 | 3 | -10/+7 |
| | | | | | | |||||
| * | | | | | Remove temporary test code. | JoramWilander | 2015-10-19 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Fix minor style for gofmt. | JoramWilander | 2015-10-19 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add api unit tests for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -0/+217 |
| | | | | | | |||||
| * | | | | | Added store tests for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -5/+222 |
| | | | | | | |||||
| * | | | | | Add model test for outgoing webhooks. | JoramWilander | 2015-10-19 | 2 | -0/+97 |
| | | | | | | |||||
| * | | | | | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 20 | -23/+1065 |
| | | | | | | |||||
* | | | | | | Merge pull request #1109 from mattermost/setup-dev | Harrison Healey | 2015-10-19 | 1 | -2/+6 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Updating developer machine setup | ||||
| * | | | | | | Fixing formatting and typos | =Corey Hulen | 2015-10-19 | 1 | -6/+6 |
| | | | | | | | |||||
| * | | | | | | Fixing formatting and typos | =Corey Hulen | 2015-10-19 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Updating developer machine setup | =Corey Hulen | 2015-10-19 | 1 | -0/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 10 | -184/+277 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-554 Small refactor of websocket code on client and server | ||||
| * | | | | | | | Remove unnecessary bind | JoramWilander | 2015-10-16 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | Fix typing socket constant | JoramWilander | 2015-10-16 | 2 | -3/+3 |
| | | | | | | | | |||||
| * | | | | | | | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 10 | -182/+276 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1067 from layzerar/fix_email_encoding | Corey Hulen | 2015-10-19 | 1 | -3/+11 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Fix email encoding issue | ||||
| * | | | | | | | Fix email encoding issue | Melvi Ts | 2015-10-16 | 1 | -3/+11 |
| | | | | | | | |