Stas Vovk 79fcb98084 Merge remote-tracking branch 'upstream/master' into PLT-637 ...

Conflicts:
	web/react/utils/constants.jsx

2015-10-16 14:21:51 +03:00

..

custom_theme_chooser.jsx

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

import_theme_modal.jsx

Fixing most deprication warnings

2015-10-15 15:00:28 -04:00

manage_incoming_hooks.jsx

Fix webhook name not overriding in LHS and update webhook help text.

2015-10-13 18:01:11 -04:00

premade_theme_chooser.jsx

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

user_settings_appearance.jsx

Fixing most deprication warnings

2015-10-15 15:00:28 -04:00

user_settings_developer.jsx

Changing SpinPunch to Mattermost in copyright

2015-10-08 12:27:09 -04:00

user_settings_display.jsx

added file with display settings

2015-10-14 21:39:33 +03:00

user_settings_general.jsx

Fixing most deprication warnings

2015-10-15 15:00:28 -04:00

user_settings_integrations.jsx

Other UI Improvements

2015-10-12 20:55:40 +05:00

user_settings_modal.jsx

added display tab under account settings. added 24h time option

2015-10-14 20:36:12 +03:00

user_settings_notifications.jsx

Fixing most deprication warnings

2015-10-15 15:00:28 -04:00

user_settings_security.jsx

Fixing most deprication warnings

2015-10-15 15:00:28 -04:00

user_settings.jsx

added display tab under account settings. added 24h time option

2015-10-14 20:36:12 +03:00