Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing merge conflicts | =Corey Hulen | 2015-10-19 | 5 | -29/+363 |
|\ | |||||
| * | Merge pull request #1108 from mattermost/plt-235 | Harrison Healey | 2015-10-19 | 4 | -28/+361 |
| |\ | | | | | | | PLT-235 Implement outgoing webhooks. | ||||
| | * | 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 | 2 | -9/+6 |
| | | | |||||
| | * | Implement outgoing webhooks. | JoramWilander | 2015-10-19 | 3 | -5/+337 |
| | | | |||||
* | | | Merging from master | =Corey Hulen | 2015-10-19 | 22 | -304/+261 |
|\| | | |||||
| * | | Merge pull request #1072 from mattermost/plt-554 | Corey Hulen | 2015-10-19 | 4 | -145/+38 |
| |\ \ | | | | | | | | | PLT-554 Small refactor of websocket code on client and server | ||||
| | * | | Fix typing socket constant | JoramWilander | 2015-10-16 | 1 | -2/+2 |
| | | | | |||||
| | * | | Small refactor of websocket code on client and server | JoramWilander | 2015-10-16 | 4 | -143/+36 |
| | | | | |||||
| * | | | 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 |
| | | | | | |||||
| * | | | | 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 | 2 | -3/+10 |
| |\ \ \ \ | | |_|/ / | |/| | | | #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 | 2 | -3/+10 |
| | |/ / | |||||
| * | | | 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 | 3 | -10/+15 |
| |\| | | | | | | | | | | | | | | ui-improvements | ||||
| | * | | 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 | ||||
| | | * | | Added proper recognition of android devices in the Active Sessions UI | Reed Garmsen | 2015-10-16 | 1 | -2/+8 |
| | | | | | |||||
| | * | | | Merge pull request #1097 from rgarmsen2295/plt-693 | Joram Wilander | 2015-10-17 | 1 | -1/+6 |
| | |\ \ \ | | | | | | | | | | | | | PLT-693 Fixes back button on username page during team signup when email is turned off | ||||
| | | * | | | Fixes back button on username page during team signup when email is turned off | Reed Garmsen | 2015-10-16 | 1 | -1/+6 |
| | | |/ / | |||||
| | * / / | PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too ↵ | Florian Orben | 2015-10-17 | 1 | -7/+1 |
| | |/ / | | | | | | | | | | | | | much room | ||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-16 | 10 | -97/+126 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/popover_list_members.jsx web/react/components/user_profile.jsx | ||||
| | * | | Fixing some client warnings | Christopher Speller | 2015-10-16 | 11 | -103/+132 |
| | |/ | |||||
| * | | Fixing more direct channel modal scrolling | Asaad Mahmood | 2015-10-16 | 1 | -1/+13 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-16 | 7 | -9/+220 |
| |\| | | | | | | | | | | ui-improvements | ||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-10-16 | 6 | -43/+47 |
| | | | |||||
* | | | Fixing merge | =Corey Hulen | 2015-10-16 | 10 | -15/+284 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #1054 from stasvovk/PLT-637 | Christopher Speller | 2015-10-16 | 5 | -0/+198 |
| |\ \ | | | | | | | | | PLT-638: added display tab under account settings. added 24h time option | ||||
| | * | | Merge remote-tracking branch 'upstream/master' into PLT-637 | Stas Vovk | 2015-10-16 | 76 | -550/+1096 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx | ||||
| | * | | update posts time in the right sidebar when user changes time format | Stas Vovk | 2015-10-15 | 1 | -0/+14 |
| | | | | |||||
| | * | | added file with display settings | Stas Vovk | 2015-10-14 | 1 | -0/+168 |
| | | | | |||||
| | * | | added display tab under account settings. added 24h time option | Stas Vovk | 2015-10-14 | 3 | -0/+16 |
| | | | | |||||
| * | | | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 1 | -5/+1 |
| |\ \ \ | | | | | | | | | | | Added an initial call to get all user preferences on page load | ||||
| | * | | | Added an initial call to get all user preferences on page load | hmhealey | 2015-10-15 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | Merge pull request #1049 from apaatsio/full-teams-data | Joram Wilander | 2015-10-16 | 1 | -4/+21 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Use display name instead of name in team switcher menu | ||||
| | * | | | Fix lint | Antti Ahti | 2015-10-15 | 1 | -5/+4 |
| | | | | | |||||
| | * | | | Treat teams as an array instead of object | Antti Ahti | 2015-10-15 | 1 | -8/+5 |
| | | | | | |||||
| | * | | | Sort teams by display name | Antti Ahti | 2015-10-15 | 1 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | First we need to convert the object to array, because objects cannot be sorted. | ||||
| | * | | | Use team display name in team switcher menu | Antti Ahti | 2015-10-14 | 1 | -5/+8 |
| | | |/ | | |/| | | | | | | | | | | | | | - /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu | ||||
| * | | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last message | Florian Orben | 2015-10-15 | 2 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix bug where channel_id was not set if update_post ajax was "too fast" - fix bug js error if there is no last post, i.e. empty channel - renamed lastPostId to postId so it has a nicer api to be triggered from everywhere - fix a typo - automatically focus textarea on modal open | ||||
| * | | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last message | Florian Orben | 2015-10-15 | 3 | -3/+50 |
| | | | | |||||
* | | | | Inital support for multi-tab loging | =Corey Hulen | 2015-10-16 | 26 | -66/+62 |
|/ / / | |||||
* | | | Adding ReactDOM as a global | Christopher Speller | 2015-10-15 | 1 | -6/+0 |
| | | | |||||
* | | | Fixing most deprication warnings | Christopher Speller | 2015-10-15 | 69 | -332/+378 |
| |/ |/| | |||||
* | | Removing my navbar popover changes since Chris has already done the popover ↵ | Asaad Mahmood | 2015-10-15 | 1 | -15/+16 |
| | | | | | | | | changes in his PR | ||||
* | | Changing user popover trigger from hover click to just click | Asaad Mahmood | 2015-10-15 | 1 | -1/+1 |
| | |