Commit Graph

24150 Commits

Author SHA1 Message Date
Richard Alam
f6c0d21fda - pass breakout and lock setting using create meeting message 2019-04-09 14:33:08 -07:00
Richard Alam
790c9f9629 - fix formatting using scalariform 2019-03-28 07:34:46 -07:00
Richard Alam
09a5a09c67 Merge branch 'master' into set-lock-settings-on-meeting-create 2019-03-28 07:10:52 -07:00
Fred Dixon
7225d83131
Merge pull request #7111 from riadvice/fix-cleaning-logs
Fix clean logs and improve cleaning FreeSwitch logs
2019-03-27 21:43:57 -04:00
Fred Dixon
8cfc2c5b9c
Merge pull request #7117 from Tainan404/issue-7026
Fix user counter in breakout room panel
2019-03-27 21:43:21 -04:00
Chad Pilkey
1f17a4177e
Merge pull request #7119 from ritzalam/enable-scalariform
Enable scalariform
2019-03-27 18:05:10 -04:00
Richard Alam
a687b71fc1 - enable scalariform for akka transcode 2019-03-27 15:00:37 -07:00
Chad Pilkey
3114d47871
Merge pull request #7121 from KDSBrowne/2.2-locale-update-2019-03-27
Add translations from Transifex - 2019/03/27
2019-03-27 17:28:31 -04:00
KDSBrowne
a6d16c41a1 Pull locales from Transiex - 2019/03/27 2019-03-27 21:03:35 +00:00
Richard Alam
bee4b79b51 - enable scalariform for bbb-apps-common 2019-03-27 13:53:09 -07:00
Richard Alam
3f7199c307 - enable scariform for akka-apps 2019-03-27 13:41:16 -07:00
Richard Alam
81d7c117f7 - enable scalariform for bbb-common-web 2019-03-27 13:36:34 -07:00
Richard Alam
fe3979e4a2 - enable scalariform for bbb-common-message 2019-03-27 13:34:56 -07:00
Richard Alam
8d4122cece - enable scalariforn for fsesl-akka 2019-03-27 13:33:22 -07:00
Tainan Felipe
c7a8e7715c Fix user counter in breakout room panel 2019-03-27 15:24:00 -03:00
Richard Alam
e9fa7d5d49 - a little bit of formatting and comment. 2019-03-27 08:20:54 -07:00
Richard Alam
3b4a10ebd5 - do not override settings from config.xml unless an override param is passed on create api call 2019-03-27 08:15:01 -07:00
Richard Alam
2a9e92379e - override breakout options from config.xml with params passed on create api 2019-03-26 14:47:37 -07:00
Richard Alam
7d9adaee30 - return breakout rooms options on enter api 2019-03-26 12:15:10 -07:00
Richard Alam
a63f7dccc3 - allow passing of breakout and lock settings params on create API 2019-03-26 10:57:50 -07:00
Ghazi Triki
a8c01fe122 Fix clean logs and improve cleaning FreeSwitch logs. 2019-03-26 18:02:38 +01:00
Fred Dixon
0dd4107810
Update bigbluebutton-release 2019-03-26 09:48:50 -04:00
Fred Dixon
d53eee800b
Merge pull request #7108 from capilkey/dont-clean-mod-message
Don't clear the mod message from chat
2019-03-26 07:24:21 -04:00
Fred Dixon
58c7710ee7
Merge pull request #7107 from capilkey/fix-translation-audio-modal
Moved the translation of the audio modal headers
2019-03-26 07:23:56 -04:00
Chad Pilkey
b7627d8075 don't clear the mod message from chat 2019-03-25 16:02:37 -07:00
Chad Pilkey
606ecc3dc5 moved the translation of the audio modal headers 2019-03-25 15:43:25 -07:00
Fred Dixon
b81ac3d0bb
Merge pull request #7105 from capilkey/warning-for-ie
Warning for IE users
2019-03-25 18:13:21 -04:00
Fred Dixon
5b0e0e9c7e
Merge pull request #7106 from ritzalam/update-floash-locales-mar-25-2019
- update flash locales to latest
2019-03-25 18:12:49 -04:00
Richard Alam
2b7de74dcd - update flash locales to latest 2019-03-25 14:46:04 -07:00
Chad Pilkey
facf1ab7b2 warning for ie users 2019-03-25 14:38:41 -07:00
Chad Pilkey
053821de52
Merge pull request #7104 from ritzalam/disable-meeting-inactivity-check
- set meeting inactivity check to zero as default which disables the…
2019-03-25 15:42:50 -04:00
Richard Alam
9801efb95a - make user inactivitiy audit disabled by default 2019-03-25 12:39:09 -07:00
Richard Alam
547249b475 - set meeting inactivity check to zero as default which disables the check. When set to
zero, the meeting won't end due to inactivity.
2019-03-25 10:10:03 -07:00
Fred Dixon
eb4c67d5e0
Merge pull request #7100 from riadvice/fix-meeting-info
Fix API variables formatting for meeting endTime and duration.
2019-03-25 09:00:52 -04:00
Ghazi Triki
48ca58ea3e Fix API variables formatting for meeting endTime and duration. 2019-03-25 13:41:14 +01:00
Fred Dixon
41cfa9a0bd
Merge pull request #7090 from capilkey/clean-up-action-bar-buttons
Clean all the buttons
2019-03-23 09:26:39 -04:00
Chad Pilkey
7ade56cb2c fix button outlines and clean up video button and video preview 2019-03-22 15:45:44 -07:00
Fred Dixon
2aa5faf7ab
Merge pull request #7095 from bigbluebutton/ffdixon-patch-3
Update link for tutorial videos for HTML5
2019-03-22 15:06:06 -04:00
Fred Dixon
4e6da349d2
Update link for tutorial videos for HTML5 2019-03-22 15:05:50 -04:00
Fred Dixon
0a4a8b9cf4
Merge pull request #7094 from capilkey/no-audio-bite
Show bite out of avatar when not in audio
2019-03-22 14:47:48 -04:00
Chad Pilkey
d2c835ff57 show bite out of avatar when not in audio 2019-03-22 11:10:47 -07:00
Chad Pilkey
815e454eb7 revert normalize.css back to old version to avoid Safari issue 2019-03-21 16:24:43 -07:00
Chad Pilkey
d1851708f2 eslint correction in audio-controls 2019-03-21 15:43:11 -07:00
Chad Pilkey
237f37f874 Merge remote-tracking branch 'upstream/master' into clean-up-action-bar-buttons 2019-03-21 15:36:58 -07:00
Chad Pilkey
c224040e9b more cleanup of the buttons and listen-only action bar icon 2019-03-21 15:16:56 -07:00
Chad Pilkey
ee4f4691c3
Merge pull request #7082 from BobakOftadeh/improve-recording-modal
Add resume title to recording modal
2019-03-21 17:27:01 -04:00
Chad Pilkey
5c357a7fb7 update normalize.css to a newer version 2019-03-21 14:03:22 -07:00
bobakoftadeh
4e032fd627 Adjusted recording props 2019-03-21 17:47:01 +00:00
bobakoftadeh
42794c99d0 Improve implementation of meeting lookup and recordingTime defaultProps 2019-03-21 16:21:24 +00:00
Fred Dixon
bdb9c16be5
Merge pull request #7084 from KDSBrowne/2.2-close-cam-on-logout
Close local webcam view on logout
2019-03-21 09:14:32 -04:00