Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1645 from mattermost/plt-1365 | Christopher Speller | 2015-12-08 | 1 | -1/+1 |
|\ | | | | | PLT-1365 Don't display system console on mobile | ||||
| * | Don't display system console on mobile | JoramWilander | 2015-12-07 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1639 from hmhealey/plt1063 | Christopher Speller | 2015-12-08 | 3 | -7/+4 |
|\ \ | | | | | | | PLT-1063 Switched marked to forked version | ||||
| * | | Removed special handling of snake_case words since that's now done by marked | hmhealey | 2015-12-07 | 1 | -5/+3 |
| | | | |||||
| * | | Switched marked to mattermost/marked | hmhealey | 2015-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | Removed :* smiley since it conflicts heavily with the markdown parser | hmhealey | 2015-12-07 | 1 | -1/+0 |
| |/ | |||||
* | | Merge pull request #1636 from mattermost/plt-1354 | Christopher Speller | 2015-12-08 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1354 Show channel member count up to 100 now | ||||
| * | | Show channel member count up to 100 now | JoramWilander | 2015-12-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1628 from florianorben/fix-font-load-on-first-page-visit | Joram Wilander | 2015-12-08 | 2 | -0/+13 |
|\ \ | | | | | | | fix font not being changed on first page visit (if preferences havent been loaded before) | ||||
| * | | fix font not being changed on first page visit (if preferences havent been ↵ | Florian Orben | 2015-12-04 | 2 | -0/+13 |
| | | | | | | | | | | | | loaded before) | ||||
* | | | Merge pull request #1640 from florianorben/collapse_fix | Joram Wilander | 2015-12-08 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix a typo that was breaking combination of sequential messages | ||||
| * | | | fix that was breaking combination of sequential messages | Florian Orben | 2015-12-07 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #1641 from florianorben/display_system_username | Joram Wilander | 2015-12-08 | 3 | -2/+3 |
|\ \ \ | | | | | | | | | Display username 'System' for system messages | ||||
| * | | | Display username 'System' for system messages | Florian Orben | 2015-12-07 | 3 | -2/+3 |
| |/ / | |||||
* | | | Fixing es lint error | Asaad Mahmood | 2015-12-08 | 1 | -5/+0 |
| | | | |||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-07 | 14 | -14/+27 |
|/ / | |||||
* | | Merge pull request #1627 from florianorben/ux-formatting-task-list | Joram Wilander | 2015-12-07 | 1 | -1/+1 |
|\ \ | | | | | | | fix misaligned checkbox; remove list-style from list-elements with checkboxes | ||||
| * | | fix misaligned checkbox; remove list-style from list-elements with checkboxes | Florian Orben | 2015-12-05 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #1616 from florianorben/PLT-1380 | Christopher Speller | 2015-12-07 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1380: Post system message when user updates channel header | ||||
| * | | PLT-1380: Post system message when user updates channel header | Florian Orben | 2015-12-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1626 from mattermost/PLT-1355 | Corey Hulen | 2015-12-04 | 3 | -7/+14 |
|\ \ \ | | | | | | | | | PLT-1355 Move link preview into pre-release feature | ||||
| * | | | PLT-1355 Move link preview into pre-release feature | =Corey Hulen | 2015-12-04 | 3 | -7/+14 |
| | | | | |||||
* | | | | Merge pull request #1630 from florianorben/autocomplete-on-tab | Corey Hulen | 2015-12-04 | 2 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | autocomplete component should enter suggestions on 'tab' | ||||
| * | | | | autocomplete component should enter suggestions on 'tab' | Florian Orben | 2015-12-04 | 2 | -2/+3 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1623 from mattermost/fixed-height-embeds | Corey Hulen | 2015-12-04 | 5 | -80/+151 |
|\ \ \ \ | | |/ / | |/| | | Fix embeds and add default fixed height | ||||
| * | | | Fix embeds and add default fixed height | JoramWilander | 2015-12-04 | 5 | -80/+151 |
| | | | | |||||
* | | | | Merge pull request #1571 from mattermost/PLT-1310 | Corey Hulen | 2015-12-04 | 1 | -29/+52 |
|\ \ \ \ | |_|/ / |/| | | | PLT-1310 moving permalink to dropdown | ||||
| * | | | re-org'ing list | =Corey Hulen | 2015-12-01 | 1 | -31/+31 |
| | | | | |||||
| * | | | Fixing typo | =Corey Hulen | 2015-12-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | PLT-1310 moving permalink to dropdown | =Corey Hulen | 2015-12-01 | 1 | -13/+36 |
| | | | | |||||
* | | | | Merge pull request #1613 from florianorben/PLT-1326 | Corey Hulen | 2015-12-04 | 8 | -8/+60 |
|\ \ \ \ | | |_|/ | |/| | | PLT-1326: Enable channel posts of type join or leave not trigger unread notifications | ||||
| * | | | PLT-1326: Enable channel posts of type join or leave not trigger unread ↵ | Florian Orben | 2015-12-04 | 8 | -8/+60 |
| | | | | | | | | | | | | | | | | notifications | ||||
* | | | | Updating UI for suggestions list | Asaad Mahmood | 2015-12-04 | 1 | -9/+13 |
| | | | | |||||
* | | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-04 | 10 | -22/+23 |
| |_|/ |/| | | |||||
* | | | Merge pull request #1612 from mattermost/fix-build-update | Christopher Speller | 2015-12-04 | 2 | -4/+8 |
|\ \ \ | | | | | | | | | Fixing mattermost to refresh the page when a new version is detected | ||||
| * | | | Fixing detect build | =Corey Hulen | 2015-12-03 | 1 | -1/+0 |
| | | | | |||||
| * | | | Fixing detect build | =Corey Hulen | 2015-12-03 | 1 | -3/+8 |
| | | | | |||||
| * | | | Fixing mattermost to refresh the page when a new version is detected | =Corey Hulen | 2015-12-03 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #1611 from mattermost/PLT-1301 | Christopher Speller | 2015-12-04 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | PLT-1310 fixing regression caused by fix for PLT-1310 | ||||
| * | | | PLT-1310 fixing regression caused by this bug | =Corey Hulen | 2015-12-03 | 1 | -0/+9 |
| |/ / | |||||
* | | | Merge pull request #1600 from hmhealey/plt1152 | Joram Wilander | 2015-12-04 | 8 | -100/+53 |
|\ \ \ | | | | | | | | | PLT-1152 Fix cross-contamination between invite member modals | ||||
| * | | | Renamed channel_intro_mssages.jsx to channel_intro_messages.jsx | hmhealey | 2015-12-03 | 2 | -1/+1 |
| | | | | |||||
| * | | | Removed some internal state from ChannelMembersModal and ChannelInviteModal | hmhealey | 2015-12-03 | 7 | -53/+23 |
| | | | | |||||
| * | | | Switched ChannelInviteModal to use a ToggleModalButton wherever possible | hmhealey | 2015-12-03 | 6 | -47/+30 |
| | | | | |||||
* | | | | Merge pull request #1604 from hmhealey/plt1285 | Joram Wilander | 2015-12-04 | 1 | -1/+20 |
|\ \ \ \ | | | | | | | | | | | PLT-1285 Fixed IE11 tabs preventing themselves from logging out | ||||
| * | | | | Fixed IE11 tabs preventing themselves from logging out | hmhealey | 2015-12-03 | 1 | -1/+20 |
| |/ / / | |||||
* | | | | Merge pull request #1605 from hmhealey/plt1370 | Joram Wilander | 2015-12-04 | 6 | -33/+19 |
|\ \ \ \ | | | | | | | | | | | PLT-1370 Changed SuggestionBox to clear its suggestions on losing focus | ||||
| * | | | | Changed SuggestionBox to clear its suggestions on losing focus | hmhealey | 2015-12-03 | 6 | -33/+19 |
| | | | | | |||||
* | | | | | reorder display settings; remove 'button thingy' in font options | Florian Orben | 2015-12-04 | 1 | -6/+3 |
| |_|/ / |/| | | | |||||
* | | | | Changed font changing code to use jquery to fix Safari weirdness | hmhealey | 2015-12-03 | 1 | -9/+13 |
|/ / / |