Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | switch to only use emoji one smileys; remove setting to switch | Florian Orben | 2015-12-01 | 6 | -109/+13 |
| | |||||
* | Allow to switch between default and emoji-one emoji style | Florian Orben | 2015-12-01 | 6 | -9/+117 |
| | |||||
* | Merge pull request #1512 from rgarmsen2295/plt-995b | Joram Wilander | 2015-12-01 | 8 | -44/+52 |
|\ | | | | | PLT-995 Applies name display preference setting in more places | ||||
| * | Enabled name display settings in more places | Reed Garmsen | 2015-12-01 | 8 | -44/+52 |
| | | |||||
* | | Merge pull request #1555 from mattermost/PLT-902 | Corey Hulen | 2015-12-01 | 1 | -1/+66 |
|\ \ | |/ |/| | PLT-902 switching to push proxy server | ||||
| * | PLT-902 switching to push proxy server | =Corey Hulen | 2015-11-30 | 1 | -1/+66 |
| | | |||||
* | | Merge pull request #1548 from mattermost/plt-1268 | Christopher Speller | 2015-12-01 | 2 | -9/+40 |
|\ \ | | | | | | | PLT-1268 Fix webhook post aggregation and pending/failed post aggregation | ||||
| * | | Fix webhook post aggregation and pending/failed post aggregation | JoramWilander | 2015-11-30 | 2 | -9/+40 |
| | | | |||||
* | | | Merge pull request #1546 from mattermost/plt-1281 | Christopher Speller | 2015-12-01 | 2 | -2/+4 |
|\ \ \ | |_|/ |/| | | PLT-1281 Make sure to have latest posts for the view when switching to a channel | ||||
| * | | Make sure to have latests posts for the view whhen switching to a channel | JoramWilander | 2015-11-30 | 2 | -2/+4 |
| | | | |||||
* | | | Merge pull request #1547 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-30 | 2 | -15/+23 |
|\ \ \ | | | | | | | | | Ui improvements | ||||
| * | | | Improving image modal and removing console log | Asaad Mahmood | 2015-11-30 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fixing LHS scroll and Image previews | Asaad Mahmood | 2015-11-30 | 2 | -14/+22 |
| | |/ | |/| | |||||
* | | | Merge pull request #1543 from florianorben/GFM-Tasklist | Corey Hulen | 2015-11-30 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Support Tasklists like GitHub does | ||||
| * | | | refactor not to use nested ternary statements | Florian Orben | 2015-11-30 | 1 | -3/+5 |
| | | | | |||||
| * | | | support gfm tasklists | Florian Orben | 2015-11-30 | 1 | -0/+8 |
| |/ / | |||||
* | | | Merge pull request #1538 from florianorben/PLT-199 | Corey Hulen | 2015-11-30 | 1 | -1/+3 |
|\ \ \ | |/ / |/| | | PLT-199: Add scroll bar to center channel | ||||
| * | | PLT-199: Add scroll bar to center channel | Florian Orben | 2015-11-28 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #1542 from florianorben/PLT-1121 | Harrison Healey | 2015-11-30 | 1 | -57/+57 |
|\ \ \ | |_|/ |/| | | PLT-1121: One element, non-ordered lists and one element, ordered, ne… | ||||
| * | | PLT-1121: One element, non-ordered lists and one element, ordered, nested ↵ | Florian Orben | 2015-11-30 | 1 | -57/+57 |
| | | | | | | | | | | | | lists aren't rendered correctly | ||||
* | | | Merge pull request #1539 from florianorben/PLT-1170 | Christopher Speller | 2015-11-30 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | PLT-1170: Support enter key in DeletePostModal | ||||
| * | | | PLT-1170: Support enter key in DeletePostModal | Florian Orben | 2015-11-28 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1533 from hmhealey/plt1290 | Joram Wilander | 2015-11-30 | 1 | -1/+13 |
|\ \ \ | |_|/ |/| | | PLT-1290 Fix up arrow to edit posts | ||||
| * | | Re-added PostStore.getPost | hmhealey | 2015-11-27 | 1 | -0/+12 |
| | | | |||||
| * | | Fixed getCommentCount | hmhealey | 2015-11-27 | 1 | -1/+1 |
| |/ | |||||
* | | rename 'featureToggle' to 'isFeatureEnable' and move definition of available ↵ | Florian Orben | 2015-11-27 | 5 | -36/+27 |
| | | | | | | | | prerelease-features to constants.jsx | ||||
* | | move preview-link-toggle outside of component markup | Florian Orben | 2015-11-27 | 1 | -8/+14 |
| | | |||||
* | | only show advanced settings section if there are any pre-release features | Florian Orben | 2015-11-27 | 3 | -51/+59 |
| | | |||||
* | | PLT-1125: allow to toggle features in frontend | Florian Orben | 2015-11-27 | 3 | -16/+135 |
|/ | |||||
* | Fixed Add Members menu option on mobile | hmhealey | 2015-11-26 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1514 from rgarmsen2295/plt-1271 | Corey Hulen | 2015-11-24 | 1 | -7/+10 |
|\ | | | | | PLT-1271 Fixed issue with changing a channel's notification settings | ||||
| * | Fixed regression with setting channel notification settings | Reed Garmsen | 2015-11-24 | 1 | -7/+10 |
| | | |||||
* | | Fixing pending post deletion on other clients. | Christopher Speller | 2015-11-24 | 1 | -2/+4 |
|/ | |||||
* | Merge pull request #1506 from mattermost/PLT-1223 | Christopher Speller | 2015-11-24 | 1 | -2/+2 |
|\ | | | | | PLT-1223 fixing help links | ||||
| * | PLT-1223 fixing help links | =Corey Hulen | 2015-11-23 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #1502 from mattermost/disable-all | Christopher Speller | 2015-11-24 | 4 | -14/+19 |
|\ \ | | | | | | | Disabling the all mention | ||||
| * | | fixing eslint | =Corey Hulen | 2015-11-23 | 2 | -0/+4 |
| | | | |||||
| * | | Disabling the all mention | =Corey Hulen | 2015-11-23 | 4 | -14/+15 |
| |/ | |||||
* | | Merge pull request #1490 from hmhealey/plt1070 | Christopher Speller | 2015-11-24 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1070 Added /loadtest url command | ||||
| * | | Fixed CommandList to not sometimes include an empty row | hmhealey | 2015-11-23 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1488 from hmhealey/plt1259 | Christopher Speller | 2015-11-24 | 6 | -154/+119 |
|\ \ | | | | | | | PLT-1259 Converted TeamMembersModal to React-Bootstrap | ||||
| * | | Converted TeamMembers (now called TeamMembersModal) to React-Bootstrap | hmhealey | 2015-11-23 | 6 | -154/+119 |
| |/ | |||||
* | | Merge pull request #1482 from esethna/patch-20 | Christopher Speller | 2015-11-24 | 1 | -2/+2 |
|\ \ | | | | | | | Update user_settings_general.jsx | ||||
| * | | Update user_settings_general.jsx | Eric Sethna | 2015-11-20 | 1 | -2/+2 |
| | | | | | | | | | Clarify email help text | ||||
* | | | Fixes issue where an admin could not delete a root post in the RHS | Reed Garmsen | 2015-11-23 | 1 | -30/+52 |
| |/ |/| | |||||
* | | Moved show static methods out of modals and into EventHelpers | hmhealey | 2015-11-23 | 11 | -47/+42 |
| | | |||||
* | | Converted GetLinkModal to React-Bootstrap and added GetTeamInviteLinkModal | hmhealey | 2015-11-23 | 10 | -108/+163 |
| | | |||||
* | | Cleaned up how channel intro messages display set channel header button | hmhealey | 2015-11-23 | 1 | -28/+17 |
| | | |||||
* | | Renamed EditChannelModal to EditChannelHeaderModal | hmhealey | 2015-11-23 | 4 | -12/+12 |
| | | |||||
* | | Ported EditChannelModal to React-Bootstrap | hmhealey | 2015-11-23 | 7 | -187/+161 |
| | |