summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2233 from hmhealey/plt2010Christopher Speller2016-02-243-167/+154
|\
| * Removed unnecessary state from PostBodyAdditionalContenthmhealey2016-02-231-23/+3
| * Improved handling when an embedded image cannot be loadedhmhealey2016-02-231-7/+26
| * Refactored embedded image/video code and prevented them from being displayed ...hmhealey2016-02-233-167/+155
* | Fix profiles issue with RHSJoramWilander2016-02-244-6/+19
|/
* Merge pull request #2215 from hmhealey/plt1678Corey Hulen2016-02-232-43/+22
|\
| * Refactored how links are extracted to remove code blocks and markdown imageshmhealey2016-02-232-43/+22
* | Merge pull request #2231 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-02-233-15/+11
|\ \ | |/ |/|
| * Ui ImprovementsAsaad Mahmood2016-02-233-15/+11
* | Merge pull request #2229 from mattermost/plt-1770Harrison Healey2016-02-2320-328/+253
|\ \ | |/ |/|
| * Refactor listener out of user profile and fix thread logicJoramWilander2016-02-2318-270/+218
| * Move post_body profile change listener into posts viewJoramWilander2016-02-224-21/+28
| * Refactor user store listener out of channel headerJoramWilander2016-02-223-53/+23
* | Fix for PLT-1945, PLT-2012, PLT-2045 & PLT-2067Elias Nahum2016-02-234-7/+4
* | Ported RenameChannelModal to React-Bootstraphmhealey2016-02-224-159/+207
|/
* Merge pull request #2208 from mattermost/client-upgradesHarrison Healey2016-02-2290-406/+449
|\
| * Updating some client deps + eslintChristopher Speller2016-02-2290-406/+449
* | PLT-1800 Replace webhooks documentation URLNicolas Clerc2016-02-212-3/+3
|/
* Merge pull request #2191 from hmhealey/plt1256Joram Wilander2016-02-184-95/+116
|\
| * Ported PostDeletedModal to React-Bootstraphmhealey2016-02-184-95/+116
* | Removed ability to copy a permalink on mobileReed Garmsen2016-02-183-52/+58
* | Merge pull request #2183 from mattermost/file-upload-fixCorey Hulen2016-02-173-3/+4
|\ \
| * | Fix loc error with cancelling in progress uploadsJoramWilander2016-02-173-3/+4
* | | Merge pull request #2181 from mattermost/plt-1707Christopher Speller2016-02-173-116/+117
|\ \ \ | |/ / |/| |
| * | Added help text to sso switching and removed redundant divsJoramWilander2016-02-173-116/+117
* | | Merge pull request #2179 from mattermost/fix-droidCorey Hulen2016-02-171-12/+16
|\ \ \ | |_|/ |/| |
| * | Fixing JS bug with droid=Corey Hulen2016-02-171-12/+16
* | | Added license audit parsing to audit tableReed Garmsen2016-02-161-12/+54
| |/ |/|
* | Other minor improvementsAsaad Mahmood2016-02-151-0/+9
* | Fixing custom theme header click eventAsaad Mahmood2016-02-151-2/+7
* | Multiple UI ImprovementsAsaad Mahmood2016-02-154-13/+126
|/
* Merge pull request #2146 from ttyniwa/feature/PLT-1908Corey Hulen2016-02-141-17/+110
|\
| * Add a warning when demoting yourself from System Administrator from the team ...Tatsuya Niwa2016-02-111-17/+110
* | Merge pull request #2123 from hmhealey/plt1711Joram Wilander2016-02-141-0/+1
|\ \
| * | Prevent the admin console from switching to a team that is being removed from...hmhealey2016-02-091-0/+1
| |/
* | Merge pull request #2138 from rgarmsen2295/plt-1672Joram Wilander2016-02-143-1/+46
|\ \
| * | Added permalink feature to posts in the RHSReed Garmsen2016-02-123-1/+46
* | | Merge branch 'release-2.0'Christopher Speller2016-02-134-7/+9
|\ \ \ | |/ / |/| |
| * | Merge pull request #2161 from mattermost/load-more-fixChristopher Speller2016-02-131-1/+1
| |\ \
| | * | Fix load more messages being broken by getPostsSince callJoramWilander2016-02-121-1/+1
| * | | Fix badge and tab */(1) not disappearing until switching away from channelJoramWilander2016-02-123-6/+8
| |/ /
* | | Adding import instead of require for fastclickAsaad Mahmood2016-02-121-1/+1
* | | Merge branch 'master' of https://github.com/mattermost/platform into ui-fixesAsaad Mahmood2016-02-129-32/+53
|\| |
| * | Merge pull request #2158 from mattermost/fix-socket-locChristopher Speller2016-02-111-7/+7
| |\ \
| | * | Fixing so the loc tool can use these=Corey Hulen2016-02-111-7/+7
| * | | Merge pull request #2155 from ZBoxApp/PLT-1948Christopher Speller2016-02-112-5/+7
| |\ \ \ | | |/ / | |/| |
| | * | eslint no-shadow resolvedElias Nahum2016-02-112-2/+2
| | * | Fix duplicate am/pm on last password updateElias Nahum2016-02-112-5/+7
| * | | Merge pull request #2150 from ZBoxApp/PLT-1963Christopher Speller2016-02-111-4/+5
| |\ \ \
| | * | | Fixing intl console error on Outgoing webhook editElias Nahum2016-02-111-4/+5
| | |/ /