diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-02-03 10:45:58 -0800 |
| commit | bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1 (patch) | |
| tree | 1626d089802a92ee208b6e7fa056378e40568a92 /web/react/utils/constants.jsx | |
| parent | 581785f5044eecdc7cf664e4c7fc59efc6babc96 (diff) | |
| parent | 9bba6c79882d1f5d14b98052caf59a11fc2388d5 (diff) | |
| download | chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.gz chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.tar.bz2 chat-bdfa4715d65ed4b4e903a1eb4c83eba6c95455d1.zip | |
Merge branch 'master' into PLT-1429
Diffstat (limited to 'web/react/utils/constants.jsx')
| -rw-r--r-- | web/react/utils/constants.jsx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index e1a4b8a8a..11a8da669 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -45,6 +45,7 @@ export default { RECIEVED_CONFIG: null, RECIEVED_LOGS: null, + RECIEVED_SERVER_AUDITS: null, RECIEVED_ALL_TEAMS: null, SHOW_SEARCH: null, @@ -84,7 +85,7 @@ export default { SPECIAL_MENTIONS: ['channel'], CHARACTER_LIMIT: 4000, IMAGE_TYPES: ['jpg', 'gif', 'bmp', 'png', 'jpeg'], - AUDIO_TYPES: ['mp3', 'wav', 'wma', 'm4a', 'flac', 'aac'], + AUDIO_TYPES: ['mp3', 'wav', 'wma', 'm4a', 'flac', 'aac', 'ogg'], VIDEO_TYPES: ['mp4', 'avi', 'webm', 'mkv', 'wmv', 'mpg', 'mov', 'flv'], PRESENTATION_TYPES: ['ppt', 'pptx'], SPREADSHEET_TYPES: ['xlsx', 'csv'], @@ -462,5 +463,6 @@ export default { MIN_USERNAME_LENGTH: 3, MAX_USERNAME_LENGTH: 15, MIN_PASSWORD_LENGTH: 5, - MAX_PASSWORD_LENGTH: 50 + MAX_PASSWORD_LENGTH: 50, + TIME_SINCE_UPDATE_INTERVAL: 30000 }; |