Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | 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 | 6 | -150/+229 | |
| | | | | | ||||||
| * | | | | 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 | 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 | |
| | |/ / | ||||||
| * | | | 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 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 | |||||
| | | * | | | 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 | 2 | -13/+2 | |
| | |/ / / | | | | | | | | | | | | | | | | much room | |||||
| | * | | | Add semi-colon | Pat Lathem | 2015-10-16 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Add z-index to command-box so that elements behind it do not show through ↵ | Pat Lathem | 2015-10-16 | 1 | -0/+1 | |
| | |/ / | | | | | | | | | | | | | autocomplete popup | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-16 | 12 | -101/+138 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/popover_list_members.jsx web/react/components/user_profile.jsx | |||||
| | * | | Merge pull request #1089 from mattermost/client-warning-fixes | Corey Hulen | 2015-10-16 | 11 | -103/+132 | |
| | |\ \ | | | | | | | | | | | Fixing some client warnings | |||||
| | | * | | Fixing some client warnings | Christopher Speller | 2015-10-16 | 11 | -103/+132 | |
| | | |/ | ||||||
| * | | | 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 | 13 | -31/+266 | |
| |\ \ \ | | | |/ | | |/| | | | | | ui-improvements | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-16 | 8 | -88/+82 | |
| | | | | ||||||
* | | | | Refactoring web classes to use multi-session | =Corey Hulen | 2015-10-16 | 3 | -82/+100 | |
| | | | | ||||||
* | | | | Fixing merge | =Corey Hulen | 2015-10-16 | 22 | -44/+395 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Merge pull request #1085 from mattermost/plt-633 | Harrison Healey | 2015-10-16 | 2 | -4/+12 | |
| |\ \ \ | | |_|/ | |/| | | PLT-633 Add default username and icon to incoming webhooks. | |||||
| | * | | Add default username and icon to incoming webhooks. | JoramWilander | 2015-10-16 | 2 | -4/+12 | |
| | | | | ||||||
| * | | | Merge pull request #1054 from stasvovk/PLT-637 | Christopher Speller | 2015-10-16 | 7 | -14/+220 | |
| |\ \ \ | | | | | | | | | | | 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 | 118 | -16980/+14346 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | ||||||
| | * | | | | fixed style guide error | Stas Vovk | 2015-10-15 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | 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 | 5 | -14/+38 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #1083 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-10-16 | 3 | -3/+6 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | Adding momentum scrolling on IOS | |||||
| | * | | | | Adding momentum scrolling on IOS | Asaad Mahmood | 2015-10-16 | 3 | -3/+6 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Merge pull request #1079 from hmhealey/initprefs | Christopher Speller | 2015-10-16 | 5 | -13/+25 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | 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 | 5 | -13/+25 | |
| | | | | | ||||||
| * | | | | 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 | 5 | -3/+97 | |
| | | | |