Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | | 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 |
| |/ / / / | |||||
* | | | | | Merge pull request #1099 from florianorben/PLT-463 | Joram Wilander | 2015-10-17 | 2 | -13/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too much room | ||||
| * | | | | PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too ↵ | Florian Orben | 2015-10-17 | 2 | -13/+2 |
|/ / / / | | | | | | | | | | | | | much room | ||||
* | | | | Merge pull request #1092 from trashcan/fix-autocomplete-transparency | Joram Wilander | 2015-10-16 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | Add z-index to command-box so that elements behind it do not show through | ||||
| * | | | 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 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 | 3 | -4/+17 |
|\ \ \ \ | |/ / / |/| | | | PLT-633 Add default username and icon to incoming webhooks. | ||||
| * | | | Add default username and icon to incoming webhooks. | JoramWilander | 2015-10-16 | 3 | -4/+17 |
| | | | | |||||
* | | | | Adding single-line Docker install | it33 | 2015-10-16 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge pull request #1088 from hmhealey/initprefs | Harrison Healey | 2015-10-16 | 1 | -1/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Fixed preference test that was failing | ||||
| * | | | Fixed preference test that was failing | hmhealey | 2015-10-16 | 1 | -1/+2 |
|/ / / | |||||
* | | | 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 | 133 | -17054/+14467 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -13/+179 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 11 | -13/+179 |
| | | | | | | |||||
| * | | | | | Removed preference migration code | hmhealey | 2015-10-15 | 3 | -99/+39 |
| | | | | | | |||||
* | | | | | | Merge pull request #1078 from hmhealey/plt701 | Christopher Speller | 2015-10-16 | 3 | -100/+42 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | PLT-701 Removed preference migration code | ||||
| * | | | | | Removed preference migration code | hmhealey | 2015-10-15 | 3 | -100/+42 |
| | | | | | | |||||
* | | | | | | Merge pull request #1049 from apaatsio/full-teams-data | Joram Wilander | 2015-10-16 | 5 | -20/+45 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | 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. |