summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge pull request #1096 from rgarmsen2295/plt-153Joram Wilander2015-10-171-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 UIReed Garmsen2015-10-161-2/+8
| | | | |
| * | | | Merge pull request #1097 from rgarmsen2295/plt-693Joram Wilander2015-10-171-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 offReed Garmsen2015-10-161-1/+6
| | |/ / /
| * / / / PLT-463: Remove AUTHOR from YouTube preview not helpful and takes up too ↵Florian Orben2015-10-172-13/+2
| |/ / / | | | | | | | | | | | | much room
| * | | Add semi-colonPat Lathem2015-10-161-1/+1
| | | |
| * | | Add z-index to command-box so that elements behind it do not show through ↵Pat Lathem2015-10-161-0/+1
| |/ / | | | | | | | | | autocomplete popup
* | | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-1612-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-fixesCorey Hulen2015-10-1611-103/+132
| |\ \ | | | | | | | | Fixing some client warnings
| | * | Fixing some client warningsChristopher Speller2015-10-1611-103/+132
| | |/
| * | Merge pull request #1085 from mattermost/plt-633Harrison Healey2015-10-162-4/+12
| |\ \ | | |/ | |/| PLT-633 Add default username and icon to incoming webhooks.
| | * Add default username and icon to incoming webhooks.JoramWilander2015-10-162-4/+12
| | |
* | | Fixing more direct channel modal scrollingAsaad Mahmood2015-10-163-1/+23
| | |
* | | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-1613-31/+266
|\| | | | | | | | | | | ui-improvements
| * | Merge pull request #1054 from stasvovk/PLT-637Christopher Speller2015-10-167-14/+220
| |\ \ | | | | | | | | PLT-638: added display tab under account settings. added 24h time option
| | * \ Merge remote-tracking branch 'upstream/master' into PLT-637Stas Vovk2015-10-16118-16980/+14346
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/utils/constants.jsx
| | * | | update posts time in the right sidebar when user changes time formatStas Vovk2015-10-151-0/+14
| | | | |
| | * | | fixed style guide errorStas Vovk2015-10-151-1/+1
| | | | |
| | * | | added file with display settingsStas Vovk2015-10-141-0/+168
| | | | |
| | * | | added display tab under account settings. added 24h time optionStas Vovk2015-10-145-14/+38
| | | | |
| * | | | Merge pull request #1083 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-163-3/+6
| |\ \ \ \ | | | | | | | | | | | | Adding momentum scrolling on IOS
| * \ \ \ \ Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-165-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 loadhmhealey2015-10-155-13/+25
| | | | | |
| * | | | | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-161-4/+21
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Use display name instead of name in team switcher menu
| | * | | | Fix lintAntti Ahti2015-10-151-5/+4
| | | | | |
| | * | | | Treat teams as an array instead of objectAntti Ahti2015-10-151-8/+5
| | | | | |
| | * | | | Sort teams by display nameAntti Ahti2015-10-151-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | First we need to convert the object to array, because objects cannot be sorted.
| | * | | | Use team display name in team switcher menuAntti Ahti2015-10-141-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 ImprovementsAsaad Mahmood2015-10-168-88/+82
| |_|_|/ |/| | |
* | | | Adding momentum scrolling on IOSAsaad Mahmood2015-10-163-3/+6
|/ / /
* | | PLT-74: Enable Up Arrow keyboard shortcut to edit your last messageFlorian Orben2015-10-152-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 messageFlorian Orben2015-10-155-3/+97
| | |
* | | Adding ReactDOM as a globalChristopher Speller2015-10-152-6/+1
| | |
* | | Fixing most deprication warningsChristopher Speller2015-10-1579-377/+423
| | |
* | | Upgrading react and react-bootstrap. 0.13.3 to 0.14 and 0.25.1 to 0.27.1Christopher Speller2015-10-159-13768/+11448
| | |
* | | Upgrading perfect scrollbar from 0.6.5 to 0.6.7Christopher Speller2015-10-154-53/+168
| | |
* | | Upgrading jquery from 1.11.1 to 2.1.4Christopher Speller2015-10-154-2541/+1443
| |/ |/|
* | Merge pull request #1077 from mattermost/mark-testsChristopher Speller2015-10-151-4/+7
|\ \ | | | | | | Marking when user ran the unit tests
| * | Marking when user ran the unit tests=Corey Hulen2015-10-151-4/+7
| | |
* | | Removing my navbar popover changes since Chris has already done the popover ↵Asaad Mahmood2015-10-151-15/+16
| | | | | | | | | | | | changes in his PR
* | | Changing user popover trigger from hover click to just clickAsaad Mahmood2015-10-151-1/+1
| | |
* | | Multiple UI ImprovementsAsaad Mahmood2015-10-1522-82/+112
| | |
* | | Merge pull request #1057 from hmhealey/plt520Christopher Speller2015-10-155-137/+346
|\ \ \ | |/ / |/| | PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap
| * | Updated More Direct Channels modal and converted it to ReactBootstraphmhealey2015-10-145-137/+346
| |/
* | Merge pull request #1055 from florianorben/PLT-42Christopher Speller2015-10-152-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 uploadingFlorian Orben2015-10-142-0/+17
| |/
* | Merge pull request #1065 from apaatsio/clarify-system-menuHarrison Healey2015-10-151-1/+5
|\ \ | | | | | | Add titles to clarify icons in system console
| * | Add titles to clarify icons in system consoleAntti Ahti2015-10-151-1/+5
| | | | | | | | | | | | | | | | | | The + and x icons in the team section can easily be misinterpreted as "Create team" and "Delete team". Added clarifying title text that the user can see when hovering on the icon.
* | | Merge pull request #1058 from rgarmsen2295/plt-434Joram Wilander2015-10-151-20/+279
|\ \ \ | |/ / |/| | PLT-434 Improve Audit History Format
| * | Properly handle missing session IDs regardless of caseReed Garmsen2015-10-141-5/+9
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 08:24:37 +0000