Christopher Speller 77709ccdda Merge release-4.2

2017-09-06 20:43:18 -07:00

..

actions

PLT-7468 Moved more error pages to use predefined error types (#7378)

2017-09-05 17:40:35 -04:00

client

Move remaining actions over to use redux and v4 endpoints (#6720)

2017-06-26 08:16:57 -04:00

components

Merge release-4.2

2017-09-06 20:43:18 -07:00

config

Fix web app manifest (#3582)

2016-07-19 12:28:04 -04:00

dispatcher

PLT-5860 Updated copyright date (#6058)

2017-04-12 08:27:57 -04:00

fonts

remove font setting and default to Open Sans (#6643)

2017-06-30 23:29:14 +08:00

i18n

[PLT-959] Browser Compatibility (#6945)

2017-09-06 13:23:14 -07:00

images

[PLT-959] Browser Compatibility (#6945)

2017-09-06 13:23:14 -07:00

non_npm_dependencies

remove font setting and default to Open Sans (#6643)

2017-06-30 23:29:14 +08:00

plugins

Fix webapp plugins for production builds (#7392)

2017-09-06 20:39:44 -07:00

reducers

Experimental implementation for webapp plugins (#7185)

2017-08-29 09:54:02 -04:00

routes

Experimental plugin system console UI (#7338)

2017-09-05 18:12:55 -04:00

sass

Experimental plugin system console UI (#7338)

2017-09-05 18:12:55 -04:00

store

Experimental implementation for webapp plugins (#7185)

2017-08-29 09:54:02 -04:00

stores

Configs for themes in Display Settings: hide themes options, hide custom themes, specific list of themes (#7173)

2017-09-05 19:28:46 -05:00

tests

slight modifications to keyboards dialog and also fix error with non-Mac (#7367)

2017-09-06 04:34:53 +08:00

utils

PLT-7300: Add use_user_icon prop to allow bots to just use their user icon (#7381)

2017-09-05 19:20:47 -05:00

.babelrc

PLT-5755: Infrastructure for Component Testing. (#5814)

2017-03-23 14:05:36 -04:00

.eslintrc.json

Required space before brackets in async arrow functions (#6721)

2017-06-26 09:38:50 -07:00

make-emojis

[PLT-7317] Fix emoji picker preview (#7136)

2017-08-08 23:48:41 +08:00

Makefile

Refresh the emoji library (#7001)

2017-07-25 14:47:03 -04:00

package.json

Experimental implementation for webapp plugins (#7185)

2017-08-29 09:54:02 -04:00

root.html

remove font setting and default to Open Sans (#6643)

2017-06-30 23:29:14 +08:00

root.jsx

Experimental implementation for webapp plugins (#7185)

2017-08-29 09:54:02 -04:00

webpack.config.js

[PLT-959] Browser Compatibility (#6945)

2017-09-06 13:23:14 -07:00

yarn.lock

Experimental plugin system console UI (#7338)

2017-09-05 18:12:55 -04:00