Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | 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 | |
| | |/ / | ||||||
| * | | | 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 | |
| | | | | ||||||
* | | | | 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 | |||||
| * | | | 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 | |||||
| * \ \ \ \ \ | 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 | |||||
* | | | | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-16 | 8 | -88/+82 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Adding momentum scrolling on IOS | Asaad Mahmood | 2015-10-16 | 3 | -3/+6 | |
|/ / / / | ||||||
* | | | | 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 | |
| |_|/ |/| | | ||||||
* | | | Adding ReactDOM as a global | Christopher Speller | 2015-10-15 | 2 | -6/+1 | |
| | | | ||||||
* | | | Fixing most deprication warnings | Christopher Speller | 2015-10-15 | 79 | -377/+423 | |
| | | | ||||||
* | | | Upgrading react and react-bootstrap. 0.13.3 to 0.14 and 0.25.1 to 0.27.1 | Christopher Speller | 2015-10-15 | 9 | -13768/+11448 | |
| | | | ||||||
* | | | Upgrading perfect scrollbar from 0.6.5 to 0.6.7 | Christopher Speller | 2015-10-15 | 4 | -53/+168 | |
| | | | ||||||
* | | | Upgrading jquery from 1.11.1 to 2.1.4 | Christopher Speller | 2015-10-15 | 4 | -2541/+1443 | |
| |/ |/| | ||||||
* | | Merge pull request #1077 from mattermost/mark-tests | Christopher Speller | 2015-10-15 | 1 | -4/+7 | |
|\ \ | | | | | | | Marking when user ran the unit tests | |||||
| * | | Marking when user ran the unit tests | =Corey Hulen | 2015-10-15 | 1 | -4/+7 | |
| | | | ||||||
* | | | 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 | |
| | | | ||||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-15 | 22 | -82/+112 | |
| | | | ||||||
* | | | Merge pull request #1057 from hmhealey/plt520 | Christopher Speller | 2015-10-15 | 5 | -137/+346 | |
|\ \ \ | |/ / |/| | | PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap | |||||
| * | | Updated More Direct Channels modal and converted it to ReactBootstrap | hmhealey | 2015-10-14 | 5 | -137/+346 | |
| |/ | ||||||
* | | Merge pull request #1055 from florianorben/PLT-42 | Christopher Speller | 2015-10-15 | 2 | -0/+17 | |
|\ \ | | | | | | | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading | |||||
| * | | PLT-42: Add "File uploading" text left of "Add Comment" when file is uploading | Florian Orben | 2015-10-14 | 2 | -0/+17 | |
| |/ | ||||||
* | | Merge pull request #1065 from apaatsio/clarify-system-menu | Harrison Healey | 2015-10-15 | 1 | -1/+5 | |
|\ \ | | | | | | | Add titles to clarify icons in system console |