Christopher Speller 8fb66c2b83 Merge branch 'release-3.6'

2017-01-12 19:59:37 -05:00

..

actions

Merge branch 'release-3.6'

2017-01-12 19:59:37 -05:00

client

Prevent reload on MFA page (#5005)

2017-01-06 18:21:16 -05:00

components

Merge branch 'release-3.6'

2017-01-12 19:59:37 -05:00

config

Fix web app manifest (#3582)

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

dispatcher

PLT-2992 Added the ability to use different themes for each team (#3411)

2016-07-14 10:08:36 -04:00

fonts

Converting to Webpack. Stage 1.

2016-03-16 18:02:55 -04:00

i18n

Merge branch 'release-3.6'

2017-01-12 19:59:37 -05:00

images

PLT-1378 Initial version of emoji reactions (#4520)

2016-11-30 13:55:49 -05:00

non_npm_dependencies

Fix JS error by updating janus client (#4988)

2017-01-06 09:00:37 -05:00

routes

Fix MFA enforcement redirect loop (#4991)

2017-01-06 09:00:21 -05:00

sass

Merge branch 'release-3.6'

2017-01-12 19:59:37 -05:00

stores

Fix JS error when receiving message in system console (#5019)

2017-01-12 10:52:58 -05:00

tests

Removing old signup team API (#4950)

2017-01-04 14:11:47 -05:00

utils

Merge branch 'release-3.6'

2017-01-12 19:59:37 -05:00

.eslintrc.json

Updating eslint (#4573)

2016-11-17 12:02:16 -05:00

Makefile

Updated make files/scripts to accomodate execution/building in windows in addition to linux/mac (#4135)

2016-10-04 08:56:01 -04:00

package.json

PLT-4644 Update webrtc client (#4922)

2017-01-03 10:08:21 -05:00

root.html

Updating shift UI changes (#4326)

2016-10-27 09:10:05 -04:00

root.jsx

Fix some typos in the English locale (fixes #4663) (#4793)

2016-12-21 19:29:38 -03:00

webpack.config.js

Fxing source maps for production (#4621)

2016-11-21 22:56:36 -03:00