summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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-171-7/+1
| |/ / / | | | | | | | | | | | | much room
* | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-1610-97/+126
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ui-improvements Conflicts: web/react/components/popover_list_members.jsx web/react/components/user_profile.jsx
| * | | Fixing some client warningsChristopher Speller2015-10-1611-103/+132
| |/ /
* | | Fixing more direct channel modal scrollingAsaad Mahmood2015-10-161-1/+13
| | |
* | | 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-1692-603/+1207
| | |\ \ | | | | | | | | | | | | | | | | | | | | 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 #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-166-43/+47
|/ / / /
* | | | 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
| |/ |/|
* | 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-1513-71/+90
| |
* | Merge pull request #1057 from hmhealey/plt520Christopher Speller2015-10-154-137/+300
|\ \ | | | | | | PLT-520 Updated More Direct Channels modal and converted it to ReactBootstrap
| * | Updated More Direct Channels modal and converted it to ReactBootstraphmhealey2015-10-144-137/+300
| |/
* | Merge pull request #1055 from florianorben/PLT-42Christopher Speller2015-10-151-0/+12
|\ \ | | | | | | 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-141-0/+12
| |/
* | 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
| | |
| * | Added all remaining audit descriptions to supported auditsReed Garmsen2015-10-141-47/+59
| | |
| * | Added more individual audit handling, primarily involving the userReed Garmsen2015-10-141-5/+51
| | |
| * | Added more supported audits to audit logReed Garmsen2015-10-141-73/+140
| | |
| * | Finished structure for formatting audits and began writing individual ↵Reed Garmsen2015-10-141-61/+132
| | | | | | | | | | | | formatting for each audit
| * | Initial changes to audit log along with structure for handling different ↵Reed Garmsen2015-10-141-16/+75
| |/ | | | | | | audit types
* / Don't auto-add http:// to mailto: and ftp: markdown linksFlorian Orben2015-10-142-2/+2
|/
* Fixed overwritten CSS class in the sidebarhmhealey2015-10-141-1/+1
|
* Merge pull request #1046 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-146-24/+37
|\ | | | | Multiple UI Improvements
| * Multiple UI ImprovementsAsaad Mahmood2015-10-146-24/+37
| |
* | Merge release branch 'release-1.1.0'Christopher Speller2015-10-143-18/+50
|\ \ | |/ |/|
| * Fix webhook name not overriding in LHS and update webhook help text.JoramWilander2015-10-132-8/+40
| |
| * Fixing user settings dialog so it desn't ask you to check your email unless ↵Christopher Speller2015-10-131-10/+10
| | | | | | | | you changed it
* | Merge pull request #993 from apaatsio/bootstrap-help-blockChristopher Speller2015-10-143-3/+3
|\ \ | | | | | | Use help-block class from Bootstrap
| * | Use help-block class from BootstrapAntti Ahti2015-10-093-3/+3
| | | | | | | | | | | | | | | | | | Use help-block class provided by Bootstrap instead of using a custom form__hint class. We still override some styles from the Bootstrap class, though.