mirror of
https://github.com/mattermost/mattermost.git
synced 2025-02-25 18:55:24 -06:00
* #4665 Added EmojiPicker Work primarily by @broernr-de and @harrison on pre-release.mattermost.com * Final fixes to handle custom emojis from internal review and single merge error * ESLint fixes * CSS changes and other code to support emoji picker in reply window * Fix for file upload and emoji picker icon positions on post and comment. RHS emoji picker appearing see-through at this time. * Fix for two ESLint issues. * covered most of feedback: RHS emoji picker looks correct color-wise RHS emoji picker dynamically positions against height of thread size (post + reply messages) escape closes emoji window search box focused on open ESLint fixes against other files oversized emoji preview fixes * Adding in 'outside click' eventing to dismiss the emoji window * Changing some formatting to fix mismatch between my local eslant rules and jenkins. * adding alternative import method due to downstream testing errors * yet another attempt to retain functionality and pass tests - skipping import of browser store * fix for feedback items 5 and 7: * move search to float on top with stylistic changes * whitespace in the header (+1 squashed commit) Squashed commits: [6a26d32] changes that address items 1, 2, 6, 8, and 9 of latest feedback * Fix for attachment preview location on mobile * Fix for latest rounds of feedback * fixing eslint issue * making emojipicker sprite based, fixing alignments * Fix for emoji quality, fixing some behavior (hover background and cursor settings) undoing config changes * Preview feature for emojis * Adjustments to config file, and changing layout/design of attachment and emoji icon. * manual revert from master branch for config.json * reverting paperclip and fixing alignments. Additionally fixing inadvertent display of picker on mobile. * CSS changes to try to fix the hover behavior - currently working for emoji picker (when enabled), but hover for attachment isn't working * Made suggested changes by jwilander except for jQuery removal * Adding hover for both icons * removal of some usages of jQuery * Fix for two layout issues on IE11/Edge * UI improvements for emoji picker * Fix for many minor display issues * fix for additional appearance items * fix to two minor UI items * A little extra padding for IE11 * fix for IE11 scroll issue, and removing align attribute on img tag which was throwing js error * fixes some display issues on firefox * fix for uneven sides of emojis * fix for eslint issues that I didn't introduce * fix for missing bottom edge of RHS emojipicker. also fixing text overlapping icons on text area (including RHS) * Update "emoji selector" to "emoji picker" * changes for code review - removal of ..getDOMNode - use sprite imagery for emoji preview - remove lastBlurAt from state as it wasn't used * fixes for: - fake custom emoji preview in picker - RHS scrollbar on preview * fix for minor alignment of preview emoji
127 lines
3.6 KiB
JSON
127 lines
3.6 KiB
JSON
{
|
|
"name": "mattermost-webapp",
|
|
"browser": {
|
|
"./client/web_client.jsx": "./client/browser_web_client.jsx"
|
|
},
|
|
"version": "0.0.1",
|
|
"private": true,
|
|
"dependencies": {
|
|
"autolinker": "1.4.2",
|
|
"bootstrap": "3.3.7",
|
|
"bootstrap-colorpicker": "2.5.1",
|
|
"chart.js": "2.5.0",
|
|
"compass-mixins": "0.12.10",
|
|
"fastclick": "1.0.6",
|
|
"flux": "3.1.2",
|
|
"font-awesome": "4.7.0",
|
|
"highlight.js": "9.10.0",
|
|
"inobounce": "0.1.4",
|
|
"intl": "1.2.5",
|
|
"jasny-bootstrap": "3.1.3",
|
|
"jquery": "3.1.1",
|
|
"marked": "mattermost/marked#8f5902fff9bad793cd6c66e0c44002c9e79e1317",
|
|
"match-at": "0.1.0",
|
|
"object-assign": "4.1.1",
|
|
"pdfjs-dist": "1.7.363",
|
|
"perfect-scrollbar": "0.6.16",
|
|
"react": "15.4.2",
|
|
"react-addons-pure-render-mixin": "15.4.2",
|
|
"react-bootstrap": "0.30.8",
|
|
"react-custom-scrollbars": "4.0.2",
|
|
"react-dom": "15.4.2",
|
|
"react-intl": "2.2.3",
|
|
"react-router": "2.8.1",
|
|
"react-select": "1.0.0-rc.3",
|
|
"superagent": "3.5.0",
|
|
"twemoji": "2.2.5",
|
|
"velocity-animate": "1.4.3",
|
|
"webrtc-adapter": "3.2.0",
|
|
"xregexp": "3.1.1"
|
|
},
|
|
"devDependencies": {
|
|
"babel-core": "6.24.0",
|
|
"babel-eslint": "7.1.1",
|
|
"babel-jest": "19.0.0",
|
|
"babel-loader": "6.4.0",
|
|
"babel-plugin-transform-runtime": "6.23.0",
|
|
"babel-polyfill": "6.23.0",
|
|
"babel-preset-es2015": "6.24.0",
|
|
"babel-preset-react": "6.23.0",
|
|
"babel-preset-stage-0": "6.22.0",
|
|
"copy-webpack-plugin": "4.0.1",
|
|
"cross-env": "3.2.3",
|
|
"css-loader": "0.27.3",
|
|
"enzyme": "2.7.1",
|
|
"enzyme-to-json": "1.5.0",
|
|
"eslint": "3.17.1",
|
|
"eslint-plugin-react": "6.10.0",
|
|
"exports-loader": "0.6.4",
|
|
"extract-text-webpack-plugin": "2.1.0",
|
|
"file-loader": "0.10.1",
|
|
"html-loader": "0.4.5",
|
|
"html-webpack-plugin": "2.28.0",
|
|
"identity-obj-proxy": "3.0.0",
|
|
"image-webpack-loader": "3.2.0",
|
|
"imports-loader": "0.7.1",
|
|
"jest": "19.0.2",
|
|
"jest-cli": "19.0.2",
|
|
"jquery-deferred": "0.3.1",
|
|
"jsdom": "9.12.0",
|
|
"jsdom-global": "2.1.1",
|
|
"json-loader": "0.5.4",
|
|
"node-sass": "4.5.0",
|
|
"raw-loader": "0.5.1",
|
|
"react-addons-test-utils": "15.4.2",
|
|
"react-dom": "15.4.2",
|
|
"sass-loader": "6.0.3",
|
|
"style-loader": "0.13.2",
|
|
"react-outside-event": "1.2.4",
|
|
"url-loader": "0.5.8",
|
|
"webpack": "2.2.1",
|
|
"webpack-node-externals": "1.5.4"
|
|
},
|
|
"jest": {
|
|
"snapshotSerializers": [
|
|
"<rootDir>/node_modules/enzyme-to-json/serializer"
|
|
],
|
|
"testPathIgnorePatterns": [
|
|
"/node_modules/",
|
|
"/non_npm_dependencies/"
|
|
],
|
|
"collectCoverageFrom": [
|
|
"actions/**/*.{js,jsx}",
|
|
"client/**/*.{js,jsx}",
|
|
"components/**/*.{js,jsx}",
|
|
"routes/**/*.{js,jsx}",
|
|
"stores/**/*.{js,jsx}",
|
|
"utils/**/*.{js,jsx}"
|
|
],
|
|
"coverageReporters": [
|
|
"lcov",
|
|
"text-summary"
|
|
],
|
|
"moduleNameMapper": {
|
|
"^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "identity-obj-proxy",
|
|
"^.+\\.(css|less|scss)$": "identity-obj-proxy",
|
|
"^.+\\.(json)$": "identity-obj-proxy"
|
|
},
|
|
"moduleDirectories": [
|
|
"",
|
|
"node_modules",
|
|
"non_npm_dependencies"
|
|
],
|
|
"transformIgnorePatterns": [
|
|
"node_modules/(?!react-native|react-router)"
|
|
]
|
|
},
|
|
"scripts": {
|
|
"check": "eslint --ext \".jsx\" --ignore-pattern node_modules --quiet .",
|
|
"build": "cross-env NODE_ENV=production webpack",
|
|
"run": "cross-env NODE_ENV=production webpack --progress --watch",
|
|
"run-fullmap": "webpack --progress --watch",
|
|
"test": "jest",
|
|
"test:watch": "jest --watch",
|
|
"test:coverage": "jest --coverage"
|
|
}
|
|
}
|