Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1107 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-19 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Updating scroll on admin console | |||||
| * | | | | | | | Updating scroll on admin console | Asaad Mahmood | 2015-10-19 | 1 | -0/+3 | |
| | | | | | | | | ||||||
* | | | | | | | | Clarifying creds aren't real in docs | it33 | 2015-10-19 | 1 | -1/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #1104 from florianorben/fix_arrow_left_right | Harrison Healey | 2015-10-19 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | No longer try to navigate to next/prev image if image preview modal is not open | |||||
| * | | | | | | | | No longer try to navigate to next/prev image if image preview modal is not open | Florian Orben | 2015-10-19 | 1 | -3/+4 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1102 from florianorben/fix_email_tooltip | Harrison Healey | 2015-10-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixes wrong tooltip on user profile | |||||
| * | | | | | | | | | Fixes wrong tooltip on user profile | Florian Orben | 2015-10-19 | 1 | -2/+2 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1101 from stasvovk/admin_console_urls | Harrison Healey | 2015-10-19 | 5 | -6/+26 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | #962: change url when a user navigates between tabs in admin console | |||||
| * | | | | | | | | change url when a user navigates between tabs [#962] | Stas Vovk | 2015-10-18 | 5 | -6/+26 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #1087 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-19 | 6 | -83/+101 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | Improving direct messages modal and some improvements for popovers | |||||
| * | | | | | | | Updating scroll on LHS | Asaad Mahmood | 2015-10-19 | 1 | -1/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Updating userEntries div to tr td | Asaad Mahmood | 2015-10-18 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-18 | 6 | -17/+19 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements | |||||
| * | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-16 | 15 | -102/+152 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/popover_list_members.jsx web/react/components/user_profile.jsx | |||||
| * | | | | | | | | Fixing more direct channel modal scrolling | Asaad Mahmood | 2015-10-16 | 3 | -1/+23 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-16 | 24 | -149/+488 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements | |||||
| * | | | | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-16 | 8 | -88/+82 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Update Troubleshooting.md | it33 | 2015-10-18 | 1 | -0/+5 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Update README.md | it33 | 2015-10-18 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | IE 10 support deprecated | it33 | 2015-10-18 | 1 | -0/+6 | |
| |_|_|_|/ / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Emphasize self-hosting | it33 | 2015-10-18 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Add Enterprise Support, link to releases | it33 | 2015-10-18 | 1 | -1/+9 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #1090 from jvasallo/master | Joram Wilander | 2015-10-17 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Updated Email Check Regex to handle some extra cases | |||||
| * | | | | | | | | Updated Email Check Regex to RFC5322 Standard | Joel Vasallo | 2015-10-16 | 1 | -1/+2 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #1096 from rgarmsen2295/plt-153 | Joram Wilander | 2015-10-17 | 1 | -2/+8 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | PLT-153 Added better recognition of Android devices in the Active Sessions UI |