Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1464 from hmhealey/plt733 | Christopher Speller | 2015-11-19 | 1 | -7/+14 |
|\ | | | | | PLT-733 Changed file uploads to scroll currently uploading files into view | ||||
| * | Changed file uploads to scroll currently uploading files into view | hmhealey | 2015-11-18 | 1 | -7/+14 |
| | | |||||
* | | Merge pull request #1463 from florianorben/hide_help_link_on_mobile | Christopher Speller | 2015-11-19 | 1 | -1/+1 |
|\ \ | | | | | | | hide 'help' link on mobile screens | ||||
| * | | hide 'help' link on mobile screens | Florian Orben | 2015-11-18 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1460 from esethna/patch-14 | Christopher Speller | 2015-11-19 | 1 | -2/+2 |
|\ \ | | | | | | | Update create_post.jsx | ||||
| * | | Update create_post.jsx | Eric Sethna | 2015-11-18 | 1 | -2/+2 |
| |/ | | | | | Add Enter key instructions to the Sending Messages pop-over. | ||||
* | | Removing postInfo from post.jsx | Asaad Mahmood | 2015-11-19 | 1 | -2/+0 |
| | | |||||
* | | Posts structure improvement | Asaad Mahmood | 2015-11-19 | 20 | -791/+529 |
|/ | |||||
* | Converted DeletePostModal to React-Bootstrap | hmhealey | 2015-11-18 | 11 | -97/+140 |
| | |||||
* | Merge pull request #1423 from hmhealey/plt737 | Christopher Speller | 2015-11-18 | 11 | -322/+254 |
|\ | | | | | PLT-737 Converted first set of Modals to ReactBootstrap | ||||
| * | Removed Modal base class | hmhealey | 2015-11-17 | 8 | -59/+37 |
| | | |||||
| * | Converted DeleteChannelModal to React-Bootstrap | hmhealey | 2015-11-17 | 4 | -93/+53 |
| | | |||||
| * | Converted ChannelNotificationsModal to React-Bootstrap | hmhealey | 2015-11-17 | 4 | -91/+49 |
| | | |||||
| * | Converted ChannelInfoModal to React-Bootstrap | hmhealey | 2015-11-17 | 4 | -89/+53 |
| | | |||||
| * | Renamed onModalDismissed to onHide to keep it consistent with React-Bootstrap | hmhealey | 2015-11-17 | 3 | -18/+19 |
| | | |||||
| * | Added ToggleModalButton component | hmhealey | 2015-11-17 | 2 | -39/+71 |
| | | |||||
| * | Added Modal base class that extends ReactBootstrap.Modal | hmhealey | 2015-11-17 | 5 | -20/+59 |
| | | |||||
* | | Merge pull request #1455 from alexgaribay/PLT-866 | Joram Wilander | 2015-11-18 | 1 | -9/+7 |
|\ \ | | | | | | | PLT-866: Update text on sign-in page | ||||
| * | | PLT-866: Update text on sign-in page | Alex Garibay | 2015-11-17 | 1 | -9/+7 |
| | | | |||||
* | | | Merge pull request #1403 from florianorben/PLT-327 | Corey Hulen | 2015-11-17 | 7 | -14/+125 |
|\ \ \ | |/ / |/| | | PLT-327: Add help text for Markdown | ||||
| * | | PLT-327: Add help text for Markdown | Florian Orben | 2015-11-17 | 7 | -14/+125 |
| |/ | |||||
* / | force reload on server update | =Corey Hulen | 2015-11-17 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #1438 from florianorben/PLT-924 | Christopher Speller | 2015-11-17 | 3 | -56/+101 |
|\ | | | | | PLT-924: Combine sequential messages from same user to look like one … | ||||
| * | PLT-924: Combine sequential messages from same user to look like one message ↵ | Florian Orben | 2015-11-16 | 3 | -56/+101 |
| | | | | | | | | (still edits as separate messages) | ||||
* | | Merge pull request #1445 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-16 | 15 | -67/+112 |
|\ \ | | | | | | | Multiple UI Improvements | ||||
| * | | Removing height variable | Asaad Mahmood | 2015-11-16 | 1 | -1/+0 |
| | | | |||||
| * | | Updating timestamp in RHS | Asaad Mahmood | 2015-11-16 | 2 | -6/+15 |
| | | | |||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-11-16 | 15 | -64/+101 |
| | | | |||||
* | | | Merge pull request #1437 from rgarmsen2295/plt-1086 | Harrison Healey | 2015-11-16 | 4 | -65/+87 |
|\ \ \ | | | | | | | | | PLT-1086 Enables the ability to rename the default channel (Town Square) | ||||
| * | | | Fixed unit test issues | Reed Garmsen | 2015-11-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Allow admins to change the display name for the default channel | Reed Garmsen | 2015-11-13 | 4 | -65/+87 |
| | | | | |||||
* | | | | Merge release branch 'release-1.2' | Christopher Speller | 2015-11-16 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | allow incoming webhooks even if it doesnt have a text on it if attachment ↵ | Florian Orben | 2015-11-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | field is present | ||||
* | | | | | Merge pull request #1433 from florianorben/PLT-862 | Corey Hulen | 2015-11-16 | 3 | -19/+23 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-862: Show images from website links below messages | ||||
| * | | | | PLT-862: Show images from website links below messages | Florian Orben | 2015-11-13 | 3 | -19/+23 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1428 from mattermost/PLT-951 | Christopher Speller | 2015-11-16 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | PLT-951 updating help text | ||||
| * | | | | PLT-951 updating help text | =Corey Hulen | 2015-11-13 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1426 from mattermost/plt-551 | Christopher Speller | 2015-11-16 | 1 | -82/+82 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-551 Fix cancel button on username setting and other general improvements | ||||
| * | | | | | Fix cancel button on username setting and other general improvements | JoramWilander | 2015-11-13 | 1 | -82/+82 |
| | | | | | | |||||
* | | | | | | Merge pull request #1424 from mattermost/plt-1113 | Christopher Speller | 2015-11-16 | 1 | -13/+14 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | PLT-1113 Tutorial tip dots are now clickable | ||||
| * | | | | | Tutorial tip dots are now clickable | JoramWilander | 2015-11-13 | 1 | -13/+14 |
| |/ / / / | |||||
* | | | | | Merge pull request #1431 from hmhealey/plt1149 | Joram Wilander | 2015-11-14 | 1 | -5/+7 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-1149 Fixed some console errors related to the search autocomplete | ||||
| * | | | | Fixed some console errors with the search autocomplete when there are no ↵ | hmhealey | 2015-11-13 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | suggestions to show | ||||
* | | | | | Merge release branch 'release-1.2' | Christopher Speller | 2015-11-13 | 3 | -3/+9 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Added null check when accessing post text | hmhealey | 2015-11-13 | 1 | -2/+3 |
| | | | | |||||
| * | | | Updating bad connection css | Asaad Mahmood | 2015-11-13 | 1 | -1/+2 |
| | | | | |||||
| * | | | UI changes for Direct messages and Bad connection | Asaad Mahmood | 2015-11-13 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #1422 from hmhealey/plt906 | Christopher Speller | 2015-11-13 | 1 | -8/+14 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-906 Improved client-side handling when ExtraInfo.MemberCount may not be set | ||||
| * | | | Made code for the member popover count a bit more robust to hopefully ↵ | hmhealey | 2015-11-13 | 1 | -8/+14 |
| | | | | | | | | | | | | | | | | prevent issues involving old data | ||||
* | | | | Merge pull request #1415 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-13 | 6 | -20/+29 |
|\ \ \ \ | |_|_|/ |/| | | | Multiple UI improvements |