Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 2 | -0/+36 |
| | |||||
* | Some refactoring | Christopher Speller | 2015-12-16 | 2 | -1/+22 |
| | |||||
* | Merge pull request #1733 from hmhealey/plt1437 | Christopher Speller | 2015-12-16 | 1 | -4/+4 |
|\ | | | | | PLT-1437 PreferenceStore api changes and fixing CreatePost warning | ||||
| * | Improved PreferenceStore api when getting values | hmhealey | 2015-12-15 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #1710 from mattermost/plt-1498 | Christopher Speller | 2015-12-16 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1498 Add hashtag testing and allow special german characters | ||||
| * | | Add hashtag testing and allow special german characters | JoramWilander | 2015-12-11 | 1 | -1/+1 |
| | | | |||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-15 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge pull request #1730 from mattermost/PLT-1404 | Joram Wilander | 2015-12-15 | 1 | -0/+1 |
|\ \ | | | | | | | PLT-1404 signal login to other tabs | ||||
| * | | PLT-1404 signal login to other tags | =Corey Hulen | 2015-12-14 | 1 | -0/+1 |
| |/ | |||||
* / | Multiple UI Improvements | Asaad Mahmood | 2015-12-11 | 1 | -23/+23 |
|/ | |||||
* | Merge pull request #1652 from hmhealey/plt1319 | Corey Hulen | 2015-12-11 | 2 | -1/+8 |
|\ | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists | ||||
| * | Changed Sidebar direct channel list to be driven by preferences | hmhealey | 2015-12-08 | 1 | -1/+6 |
| | | |||||
| * | Added preference_changed web socket event | hmhealey | 2015-12-07 | 1 | -1/+3 |
| | | |||||
* | | Merge pull request #1684 from hmhealey/plt1184 | Joram Wilander | 2015-12-11 | 1 | -1/+6 |
|\ \ | | | | | | | PLT-1184 Fixed EditChannelHeaderModal's contents not being updated when a change is made | ||||
| * | | Fixed EditChannelHeaderModal's contents not always being updated when a ↵ | hmhealey | 2015-12-10 | 1 | -1/+6 |
| | | | | | | | | | | | | change is made | ||||
* | | | Revert "add helper method to add ephemeral messages; also switch 'delete ↵ | Christopher Speller | 2015-12-10 | 2 | -19/+1 |
| | | | | | | | | | | | | mess…" | ||||
* | | | add helper method to add ephemeral messages; also switch 'delete message' to ↵ | Florian Orben | 2015-12-09 | 2 | -1/+19 |
| | | | | | | | | | | | | this new method | ||||
* | | | Fix OEmbeds when switching channel, vine/soundcloud heights, and youtube embeds | JoramWilander | 2015-12-09 | 1 | -2/+2 |
|/ / | |||||
* | | Multiple UI Improvements | Asaad Mahmood | 2015-12-09 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #1639 from hmhealey/plt1063 | Christopher Speller | 2015-12-08 | 2 | -6/+3 |
|\ \ | | | | | | | 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 |
| | | | |||||
| * | | 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 #1641 from florianorben/display_system_username | Joram Wilander | 2015-12-08 | 1 | -0/+1 |
|\ \ | | | | | | | Display username 'System' for system messages | ||||
| * | | Display username 'System' for system messages | Florian Orben | 2015-12-07 | 1 | -0/+1 |
| |/ | |||||
* / | Multiple UI Improvements | Asaad Mahmood | 2015-12-07 | 1 | -0/+1 |
|/ | |||||
* | 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 #1626 from mattermost/PLT-1355 | Corey Hulen | 2015-12-04 | 1 | -0/+4 |
|\ \ | | | | | | | PLT-1355 Move link preview into pre-release feature | ||||
| * | | PLT-1355 Move link preview into pre-release feature | =Corey Hulen | 2015-12-04 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #1630 from florianorben/autocomplete-on-tab | Corey Hulen | 2015-12-04 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | autocomplete component should enter suggestions on 'tab' | ||||
| * | | | autocomplete component should enter suggestions on 'tab' | Florian Orben | 2015-12-04 | 1 | -1/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #1623 from mattermost/fixed-height-embeds | Corey Hulen | 2015-12-04 | 1 | -9/+11 |
|\ \ \ | |/ / |/| / | |/ | Fix embeds and add default fixed height | ||||
| * | Fix embeds and add default fixed height | JoramWilander | 2015-12-04 | 1 | -9/+11 |
| | | |||||
* | | Merge pull request #1613 from florianorben/PLT-1326 | Corey Hulen | 2015-12-04 | 2 | -1/+7 |
|\ \ | | | | | | | 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 | 2 | -1/+7 |
| | | | | | | | | | | | | notifications | ||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-04 | 1 | -1/+5 |
| |/ |/| | |||||
* | | Merge pull request #1612 from mattermost/fix-build-update | Christopher Speller | 2015-12-04 | 1 | -3/+7 |
|\ \ | | | | | | | 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 |
| |/ | |||||
* | | Merge pull request #1600 from hmhealey/plt1152 | Joram Wilander | 2015-12-04 | 1 | -19/+20 |
|\ \ | | | | | | | PLT-1152 Fix cross-contamination between invite member modals | ||||
| * | | Renamed channel_intro_mssages.jsx to channel_intro_messages.jsx | hmhealey | 2015-12-03 | 1 | -0/+0 |
| | | | |||||
| * | | Removed some internal state from ChannelMembersModal and ChannelInviteModal | hmhealey | 2015-12-03 | 1 | -0/+1 |
| | | | |||||
| * | | Switched ChannelInviteModal to use a ToggleModalButton wherever possible | hmhealey | 2015-12-03 | 1 | -19/+19 |
| | | | |||||
* | | | Merge pull request #1605 from hmhealey/plt1370 | Joram Wilander | 2015-12-04 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | PLT-1370 Changed SuggestionBox to clear its suggestions on losing focus | ||||
| * | | Changed SuggestionBox to clear its suggestions on losing focus | hmhealey | 2015-12-03 | 1 | -0/+1 |
| | | | |||||
* | | | Changed font changing code to use jquery to fix Safari weirdness | hmhealey | 2015-12-03 | 1 | -9/+13 |
|/ / | |||||
* / | Fixed emoticon code to use an ES6 map properly | hmhealey | 2015-12-03 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #1579 from hmhealey/plt1298 | Christopher Speller | 2015-12-03 | 2 | -6/+30 |
|\ | | | | | PLT-1298 Converted Command and @Mention autocomplete to new suggestion components |