Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #2233 from hmhealey/plt2010 | Christopher Speller | 2016-02-24 | 3 | -167/+154 | |
|\ \ \ | |_|/ |/| | | PLT-2010/PLT-2071 Refactored Post Embed Components | |||||
| * | | Removed unnecessary state from PostBodyAdditionalContent | hmhealey | 2016-02-23 | 1 | -23/+3 | |
| | | | ||||||
| * | | Improved handling when an embedded image cannot be loaded | hmhealey | 2016-02-23 | 1 | -7/+26 | |
| | | | ||||||
| * | | Refactored embedded image/video code and prevented them from being displayed ↵ | hmhealey | 2016-02-23 | 3 | -167/+155 | |
| |/ | | | | | | | on deleted posts | |||||
* / | Fix profiles issue with RHS | JoramWilander | 2016-02-24 | 4 | -6/+19 | |
|/ | ||||||
* | Merge pull request #2215 from hmhealey/plt1678 | Corey Hulen | 2016-02-23 | 2 | -43/+22 | |
|\ | | | | | PLT-1678 Refactored how links are extracted to remove code blocks and markdown images | |||||
| * | Refactored how links are extracted to remove code blocks and markdown images | hmhealey | 2016-02-23 | 2 | -43/+22 | |
| | | ||||||
* | | Merge pull request #2231 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-02-23 | 3 | -15/+11 | |
|\ \ | |/ |/| | Ui Improvements | |||||
| * | Ui Improvements | Asaad Mahmood | 2016-02-23 | 3 | -15/+11 | |
| | | ||||||
* | | Merge pull request #2229 from mattermost/plt-1770 | Harrison Healey | 2016-02-23 | 20 | -328/+253 | |
|\ \ | |/ |/| | PLT-1770 Refactor store listeners out of highly used components | |||||
| * | Refactor listener out of user profile and fix thread logic | JoramWilander | 2016-02-23 | 18 | -270/+218 | |
| | | ||||||
| * | Move post_body profile change listener into posts view | JoramWilander | 2016-02-22 | 4 | -21/+28 | |
| | | ||||||
| * | Refactor user store listener out of channel header | JoramWilander | 2016-02-22 | 3 | -53/+23 | |
| | | ||||||
* | | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067 | Elias Nahum | 2016-02-23 | 4 | -7/+4 | |
| | | | | | | | | | | - Missing locs on server - Fix spanish locs | |||||
* | | Ported RenameChannelModal to React-Bootstrap | hmhealey | 2016-02-22 | 4 | -159/+207 | |
|/ | ||||||
* | Merge pull request #2208 from mattermost/client-upgrades | Harrison Healey | 2016-02-22 | 90 | -406/+449 | |
|\ | | | | | Updating some client deps + eslint | |||||
| * | Updating some client deps + eslint | Christopher Speller | 2016-02-22 | 90 | -406/+449 | |
| | | ||||||
* | | PLT-1800 Replace webhooks documentation URL | Nicolas Clerc | 2016-02-21 | 2 | -3/+3 | |
|/ | ||||||
* | Merge pull request #2191 from hmhealey/plt1256 | Joram Wilander | 2016-02-18 | 4 | -95/+116 | |
|\ | | | | | PLT-1256 Ported PostDeletedModal to React-Bootstrap | |||||
| * | Ported PostDeletedModal to React-Bootstrap | hmhealey | 2016-02-18 | 4 | -95/+116 | |
| | | ||||||
* | | Removed ability to copy a permalink on mobile | Reed Garmsen | 2016-02-18 | 3 | -52/+58 | |
| | | ||||||
* | | Merge pull request #2183 from mattermost/file-upload-fix | Corey Hulen | 2016-02-17 | 3 | -3/+4 | |
|\ \ | | | | | | | Fix loc error with cancelling in progress uploads | |||||
| * | | Fix loc error with cancelling in progress uploads | JoramWilander | 2016-02-17 | 3 | -3/+4 | |
| | | | ||||||
* | | | Merge pull request #2181 from mattermost/plt-1707 | Christopher Speller | 2016-02-17 | 3 | -116/+117 | |
|\ \ \ | |/ / |/| | | PLT-1707 Added help text to sso switching and removed redundant divs | |||||
| * | | Added help text to sso switching and removed redundant divs | JoramWilander | 2016-02-17 | 3 | -116/+117 | |
| | | | ||||||
* | | | Merge pull request #2179 from mattermost/fix-droid | Corey Hulen | 2016-02-17 | 1 | -12/+16 | |
|\ \ \ | |_|/ |/| | | Fixing JS bug with droid | |||||
| * | | Fixing JS bug with droid | =Corey Hulen | 2016-02-17 | 1 | -12/+16 | |
| | | | ||||||
* | | | Added license audit parsing to audit table | Reed Garmsen | 2016-02-16 | 1 | -12/+54 | |
| |/ |/| | ||||||
* | | Other minor improvements | Asaad Mahmood | 2016-02-15 | 1 | -0/+9 | |
| | | ||||||
* | | Fixing custom theme header click event | Asaad Mahmood | 2016-02-15 | 1 | -2/+7 | |
| | | ||||||
* | | Multiple UI Improvements | Asaad Mahmood | 2016-02-15 | 4 | -13/+126 | |
|/ | ||||||
* | Merge pull request #2146 from ttyniwa/feature/PLT-1908 | Corey Hulen | 2016-02-14 | 1 | -17/+110 | |
|\ | | | | | PLT-1908 Add a warning when demoting yourself from System Administrator from the team Manage Members menu | |||||
| * | Add a warning when demoting yourself from System Administrator from the team ↵ | Tatsuya Niwa | 2016-02-11 | 1 | -17/+110 | |
| | | | | | | | | Manage Members menu | |||||
* | | Merge pull request #2123 from hmhealey/plt1711 | Joram Wilander | 2016-02-14 | 1 | -0/+1 | |
|\ \ | | | | | | | PLT-1711 Prevent the admin console from switching to a team that is being remo… | |||||
| * | | Prevent the admin console from switching to a team that is being removed ↵ | hmhealey | 2016-02-09 | 1 | -0/+1 | |
| |/ | | | | | | | from the sidebar | |||||
* | | Merge pull request #2138 from rgarmsen2295/plt-1672 | Joram Wilander | 2016-02-14 | 3 | -1/+46 | |
|\ \ | | | | | | | PLT-1672 Added permalink feature to posts in the RHS | |||||
| * | | Added permalink feature to posts in the RHS | Reed Garmsen | 2016-02-12 | 3 | -1/+46 | |
| | | | ||||||
* | | | Merge branch 'release-2.0' | Christopher Speller | 2016-02-13 | 4 | -7/+9 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Merge pull request #2161 from mattermost/load-more-fix | Christopher Speller | 2016-02-13 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | RC3 Fix load more messages being broken by getPostsSince call | |||||
| | * | | Fix load more messages being broken by getPostsSince call | JoramWilander | 2016-02-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Fix badge and tab */(1) not disappearing until switching away from channel | JoramWilander | 2016-02-12 | 3 | -6/+8 | |
| |/ / | ||||||
* | | | Adding import instead of require for fastclick | Asaad Mahmood | 2016-02-12 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes | Asaad Mahmood | 2016-02-12 | 9 | -32/+53 | |
|\| | | ||||||
| * | | Merge pull request #2158 from mattermost/fix-socket-loc | Christopher Speller | 2016-02-11 | 1 | -7/+7 | |
| |\ \ | | | | | | | | | Fixing so the loc tool can use these | |||||
| | * | | Fixing so the loc tool can use these | =Corey Hulen | 2016-02-11 | 1 | -7/+7 | |
| | | | | ||||||
| * | | | Merge pull request #2155 from ZBoxApp/PLT-1948 | Christopher Speller | 2016-02-11 | 2 | -5/+7 | |
| |\ \ \ | | |/ / | |/| | | PLT-1948: Fix duplicate am/pm on last password update | |||||
| | * | | eslint no-shadow resolved | Elias Nahum | 2016-02-11 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Fix duplicate am/pm on last password update | Elias Nahum | 2016-02-11 | 2 | -5/+7 | |
| | | | | ||||||
| * | | | Merge pull request #2150 from ZBoxApp/PLT-1963 | Christopher Speller | 2016-02-11 | 1 | -4/+5 | |
| |\ \ \ | | | | | | | | | | | PLT-1963: Fixing intl console error on Outgoing webhook edit | |||||
| | * | | | Fixing intl console error on Outgoing webhook edit | Elias Nahum | 2016-02-11 | 1 | -4/+5 | |
| | |/ / |