Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge pull request #1849 from hmhealey/plt1578 | Corey Hulen | 2016-01-11 | 1 | -0/+15 | |
| |\ \ | | |/ | |/| | PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs | |||||
| | * | Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs | hmhealey | 2016-01-11 | 1 | -0/+15 | |
| | | | ||||||
| * | | Merge pull request #1824 from hmhealey/plt1525 | Joram Wilander | 2016-01-11 | 2 | -3/+11 | |
| |\ \ | | |/ | |/| | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel | |||||
| | * | Made ChannelInviteModal pull all channel members before rendering | hmhealey | 2016-01-07 | 2 | -3/+11 | |
| | | | ||||||
| * | | Removed ability to drag n' drop text; drag n' drop ui no longer appears when ↵ | Reed Garmsen | 2016-01-06 | 1 | -0/+6 | |
| |/ | | | | | | | non-files are dragged | |||||
* | | Fixing unit tests | =Corey Hulen | 2016-01-09 | 1 | -1/+1 | |
| | | ||||||
* | | partial fix for UI | =Corey Hulen | 2016-01-08 | 2 | -7/+29 | |
|/ | ||||||
* | Merge pull request #1819 from hmhealey/plt1401 | Joram Wilander | 2016-01-06 | 1 | -3/+3 | |
|\ | | | | | PLT-1401 Removed email regex | |||||
| * | Removed email regex | hmhealey | 2016-01-06 | 1 | -3/+3 | |
| | | ||||||
* | | Removed temporary fix for old filenames that used absolute urls pointing to ↵ | hmhealey | 2016-01-06 | 1 | -16/+2 | |
| | | | | | | | | the get file api | |||||
* | | Changed Audio/Video preview to just display a file info when encountering a ↵ | hmhealey | 2016-01-06 | 1 | -0/+19 | |
|/ | | | | file that cannot be played | |||||
* | Merge pull request #1801 from hmhealey/plt1602 | Christopher Speller | 2016-01-04 | 1 | -0/+10 | |
|\ | | | | | PLT-1602 Fix ViewImageModal incorrectly assuming it has a file's info in certain cases | |||||
| * | Fixed ViewImage modal to clear its loaded state when its file list changes | hmhealey | 2016-01-04 | 1 | -0/+10 | |
| | | ||||||
* | | Merge pull request #1745 from mattermost/plt-1118 | Christopher Speller | 2016-01-04 | 2 | -0/+36 | |
|\ \ | |/ |/| | PLT-1118 Add ability to switch between SSO and email account | |||||
| * | Add ability to switch between SSO and email account | JoramWilander | 2015-12-17 | 2 | -0/+36 | |
| | | ||||||
* | | Merge pull request #1769 from mattermost/PLT-1488 | Christopher Speller | 2016-01-04 | 1 | -0/+3 | |
|\ \ | | | | | | | PLT-1488 fixing error message from session revoke | |||||
| * | | PLT-1488 fixing error message from session revoke | =Corey Hulen | 2015-12-23 | 1 | -0/+3 | |
| | | | ||||||
* | | | Merge pull request #1740 from hmhealey/plt730 | Joram Wilander | 2015-12-28 | 2 | -2/+29 | |
|\ \ \ | | | | | | | | | PLT-730/PLT-731 Added remaining mobile UI V2 components | |||||
| * | | | Added theme styling to floating timestamp | hmhealey | 2015-12-16 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Added DelayedAction class to use to handle stopping scrolling | hmhealey | 2015-12-16 | 1 | -0/+27 | |
| | | | | ||||||
* | | | | Merge pull request #1755 from hmhealey/plt1108 | Joram Wilander | 2015-12-28 | 3 | -1/+32 | |
|\ \ \ \ | |_|/ / |/| | | | PLT-1108 Refactored ViewImage modal and made it automatically play animated gifs | |||||
| * | | | Refactored ViewImage modal and made it automatically play animated gifs | hmhealey | 2015-12-18 | 3 | -1/+32 | |
| | |/ | |/| | ||||||
* | | | Multiple UI Improvements | Asaad Mahmood | 2015-12-21 | 1 | -2/+3 | |
| | | | ||||||
* | | | Merge pull request #1756 from mattermost/lfbrock-emojis | Corey Hulen | 2015-12-18 | 1 | -21/+21 | |
|\ \ \ | | | | | | | | | PLT-1122 Fixed black_large_square emoticon. Also fixed emoji mapping. | |||||
| * | | | Fixed emoji mapping. | Lindsay Brock | 2015-12-18 | 1 | -21/+21 | |
| |/ / | ||||||
* / / | Multiple UI Improvements | Asaad Mahmood | 2015-12-18 | 1 | -2/+3 | |
|/ / | ||||||
* / | 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 |