summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Merging from master=Corey Hulen2015-10-1926-314/+460
| |\ \ \ \ \ \
| * | | | | | | Refactoring web classes to use multi-session=Corey Hulen2015-10-161-3/+4
| | | | | | | |
| * | | | | | | Fixing merge=Corey Hulen2015-10-1617-37/+377
| |\ \ \ \ \ \ \
| * | | | | | | | Inital support for multi-tab loging=Corey Hulen2015-10-1635-229/+259
| | | | | | | | |
* | | | | | | | | Updating mattermost logoAsaad Mahmood2015-10-221-1/+1
| | | | | | | | |
* | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2015-10-223-25/+23
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changing the UI for the active item in the nav - Updating the UI for drag and drop - Fixing z-index for date selector
* | | | | | | | Changed markdown renderer to only parse emoticons twicehmhealey2015-10-222-1/+15
| | | | | | | |
* | | | | | | | Fixed improperly quoted html attributes for emoticonshmhealey2015-10-221-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #1135 from trashcan/PLT-521Harrison Healey2015-10-221-2/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | PLT-521: Fix emoji with underscores
| * | | | | | Pass eslint testsPat Lathem2015-10-211-3/+3
| | | | | | |
| * | | | | | Missing semicolonPat Lathem2015-10-211-1/+1
| | | | | | |
| * | | | | | Remove stray emoticons.jsx importPat Lathem2015-10-211-1/+0
| | | | | | |
| * | | | | | Add a call to doFormatText inside of the markdown paragraph handlerPat Lathem2015-10-211-0/+3
| | | | | | |
* | | | | | | Change stop symbol to another one since chrome-win can't display itFlorian Orben2015-10-212-2/+2
| | | | | | |
* | | | | | | apply portrait/landscape/quadrat format to playing gif to always display it ↵Florian Orben2015-10-211-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in best possible way
* | | | | | | Add stop button to stop animated gifsFlorian Orben2015-10-213-42/+106
| | | | | | |
* | | | | | | Horizontally align images if image height > image widthFlorian Orben2015-10-211-3/+15
| | | | | | |
* | | | | | | PLT-616: Enable playing of animated GIF in thumbnails and previewFlorian Orben2015-10-213-4/+120
| | | | | | |
* | | | | | | Merge pull request #1131 from mattermost/PLT-350Christopher Speller2015-10-212-4/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-350 allow ability to disable restricted team names
| * | | | | | | PLT-350 allow ability to disable restricted team names=Corey Hulen2015-10-202-4/+40
| |/ / / / / /
* | | | | | | Merge pull request #1103 from florianorben/PLT-751Harrison Healey2015-10-212-3/+34
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | PLT-751: Enable arrow to edit posts in comment threads
| * | | | | | Allow to update root comment in RHS via arrow up shortcutFlorian Orben2015-10-191-1/+1
| | | | | | |
| * | | | | | PLT-751: Enable arrow to edit posts in comment threadsFlorian Orben2015-10-192-3/+34
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #1120 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-10-201-3/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | PLT-318 - Updating files overlay design
| * | | | | PLT-318 - Updating files overlay designAsaad Mahmood2015-10-201-3/+13
| | | | | |
* | | | | | Merge pull request #1100 from girishso/wink_emojiJoram Wilander2015-10-201-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-699: translate ;) to wink emoji
| * | | | | | translate ;) to wink emojiGirish S2015-10-181-0/+1
| | | | | | |
* | | | | | | Handle window resize events in React wayAntti Ahti2015-10-206-34/+95
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the React-way of handling resize events. Essentially store the window size in component state instead of doing some custom handling. See http://facebook.github.io/react/tips/dom-event-listeners.html
* | | | | | Merge pull request #1114 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-192-7/+8
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Ui improvements
| * | | | | Updating direct messages titleAsaad Mahmood2015-10-191-1/+1
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/mattermost/platform into ↵Asaad Mahmood2015-10-1911-162/+251
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | ui-improvements
| * | | | | Multiple UI ImprovementsAsaad Mahmood2015-10-192-6/+7
| | | | | |
* | | | | | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-196-28/+420
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | PLT-235 Implement outgoing webhooks.
| * | | | | Show/hide integrations properly based off config settings.JoramWilander2015-10-192-51/+55
| | | | | |
| * | | | | Fix postgres query and minor UI updates for outgoing webhooks.JoramWilander2015-10-192-9/+6
| | | | | |
| * | | | | Implement outgoing webhooks.JoramWilander2015-10-195-5/+396
| | |/ / / | |/| | |
* | | | | Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-196-152/+230
|\ \ \ \ \ | | | | | | | | | | | | PLT-554 Small refactor of websocket code on client and server
| * | | | | Remove unnecessary bindJoramWilander2015-10-161-1/+0
| | | | | |
| * | | | | Fix typing socket constantJoramWilander2015-10-162-3/+3
| | | | | |
| * | | | | Small refactor of websocket code on client and serverJoramWilander2015-10-166-150/+229
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1107 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-10-191-0/+3
|\ \ \ \ \ | | |_|/ / | |/| | | Updating scroll on admin console
| * | | | Updating scroll on admin consoleAsaad Mahmood2015-10-191-0/+3
| | | | |
* | | | | Merge pull request #1104 from florianorben/fix_arrow_left_rightHarrison Healey2015-10-191-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 openFlorian Orben2015-10-191-3/+4
| | |_|/ / | |/| | |
* | | | | Merge pull request #1102 from florianorben/fix_email_tooltipHarrison Healey2015-10-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fixes wrong tooltip on user profile
| * | | | | Fixes wrong tooltip on user profileFlorian Orben2015-10-191-2/+2
| |/ / / /
* | | | | Merge pull request #1101 from stasvovk/admin_console_urlsHarrison Healey2015-10-193-5/+15
|\ \ \ \ \ | |_|/ / / |/| | | | #962: change url when a user navigates between tabs in admin console
| * | | | change url when a user navigates between tabs [#962]Stas Vovk2015-10-183-5/+15
| |/ / /
* | | | Updating scroll on LHSAsaad Mahmood2015-10-191-1/+3
| | | |
* | | | Updating userEntries div to tr tdAsaad Mahmood2015-10-181-1/+1
| | | |