Commit Graph

19018 Commits

Author SHA1 Message Date
Oswaldo Acauan
f17faf6d75 Fix closeToast warning 2017-10-23 10:25:05 -02:00
Fred Dixon
ca285e13f6 Merge pull request #4550 from riadvice/screen-share-improve
[Flash 2.0] - Improve desktop sharing windows placement and resize window behaviour
2017-10-22 07:41:26 -04:00
Ghazi Triki
08eced8bbe Improve desktop sharing windows placement and resize window behaviour. 2017-10-22 11:56:27 +01:00
Oleksandr Zhurbenko
380c67f18f Merge pull request #4538 from MaximKhlobystov/khmer-locale-fix
[HTML5 Client] Khmer locale fix
2017-10-21 21:31:14 -04:00
Maxim Khlobystov
6dd484db4f Indentations cleanup. 2017-10-21 21:30:24 -04:00
Anton Georgiev
6f8abff77c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-10-21 08:50:25 -04:00
Anton Georgiev
6b19800836 update presenter group on add/remove 2017-10-21 08:19:52 -04:00
Anton Georgiev
325a6ef8f2 show presenter group in pod dropdown 2017-10-21 08:03:52 -04:00
Richard Alam
e918a2b1bf - start implementing segment recording 2017-10-20 14:47:36 -07:00
Richard Alam
fd8f38eacb - start implementing meeting manager and broadcast stream 2017-10-20 14:31:19 -07:00
Richard Alam
9d98a550c5 - formatting changes 2017-10-20 14:30:26 -07:00
Ghazi Triki
e1d534e856 Revert changes to build.xml 2017-10-20 22:05:30 +01:00
Ghazi Triki
d1772901f9 Remove locale version check feature. 2017-10-20 22:03:33 +01:00
Anton Georgiev
030567368a add/remove user from presenter groups 2017-10-20 17:01:57 -04:00
Oswaldo Acauan
8af4d227db Fix notification service exports 2017-10-20 17:27:00 -02:00
Oswaldo Acauan
11908b8ecf Fix file extension and turn eslint rule off 2017-10-20 17:09:01 -02:00
Oswaldo Acauan
9f910fa26e Move hoc and service to separate dir's 2017-10-20 17:01:07 -02:00
Oswaldo Acauan
a26e20d76b Fix wrong prop name record => recording 2017-10-20 17:00:34 -02:00
Richard Alam
d832719d27 - clean up some unused code 2017-10-20 11:24:05 -07:00
Richard Alam
54bd2acf99 - fix tests 2017-10-20 10:49:36 -07:00
Richard Alam
4f49512987 Merge pull request #4545 from riadvice/flex-4-16-fp23-docs
[Flash 2.1] - Update Flex SDK docs for 2.1
2017-10-20 13:40:43 -04:00
Ghazi Triki
78f9fd841a Update Flex SDK docs for 2.1 2017-10-20 16:53:42 +01:00
Richard Alam
45b9ae04fd Merge pull request #4544 from ritzalam/implement-multi-chat
- update fsesl lib jar version
2017-10-20 11:37:34 -04:00
Richard Alam
1968756f73 - update fsesl lib jar version 2017-10-20 08:35:50 -07:00
Richard Alam
8eab96b1cc Merge branch 'ritzalam-remove-reconnect-handler' 2017-10-20 08:21:32 -07:00
Maxim Khlobystov
03eced3236 Updated locales. 2017-10-20 15:17:52 +00:00
Richard Alam
afb217fe70 Merge branch 'remove-reconnect-handler' of https://github.com/ritzalam/bigbluebutton into ritzalam-remove-reconnect-handler 2017-10-20 08:11:49 -07:00
Richard Alam
ec35eed07c Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton 2017-10-20 08:10:43 -07:00
Richard Alam
24def2ce7e Merge branch 'riadvice-config-options-clean' into v2.0.x-release 2017-10-20 08:05:24 -07:00
Richard Alam
bf5d5de34e Merge branch 'config-options-clean' of https://github.com/riadvice/bigbluebutton into riadvice-config-options-clean 2017-10-20 07:58:22 -07:00
Richard Alam
bd68aa3128 Merge pull request #4543 from ritzalam/remove-auto-join-voice-on-reconnect
Remove auto-join voice handler on auto-reconnect
2017-10-20 10:56:49 -04:00
Richard Alam
333dba585b - remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
2017-10-20 07:38:50 -07:00
Ghazi Triki
bd1e8a0f08 Remove trailing spaces in config.xml.template 2017-10-20 15:37:38 +01:00
Richard Alam
97f14ddfac Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2017-10-20 07:36:39 -07:00
Richard Alam
fb58a5f0ca Merge branch 'riadvice-breakout-audio-rejoin' into v2.0.x-release 2017-10-20 07:36:14 -07:00
Anton Georgiev
e0db8b1d3e Merge pull request #4533 from jfsiebel/fix-update-voice-user-function-name
Fix function name in updateVoiceUser
2017-10-20 12:30:25 -02:00
Ghazi Triki
f3ba3e5ac9 Clean ununsed options properties and classes. 2017-10-20 11:17:19 +01:00
gcampes
029a13d2a0 better error handling, code cleanup 2017-10-20 08:11:51 -02:00
Richard Alam
543d34765b Merge pull request #4540 from ritzalam/update-with-20
Update with latest 2.0
2017-10-19 21:22:02 -04:00
Richard Alam
cfec9de678 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into update-with-20 2017-10-19 18:20:25 -07:00
Richard Alam
154d3d6081 Merge branch 'antobinary-pods_vol4' 2017-10-19 18:01:15 -07:00
Richard Alam
11f0bdf0ac Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-19 17:46:35 -07:00
Richard Alam
e01692c40b - send voice conf started and destroyed message 2017-10-19 17:18:50 -07:00
Maxim Khlobystov
a11e695756 Made sure the fix for escaping backslashes is applied when you run the Transifex for all locales at once. 2017-10-19 20:58:47 +00:00
Maxim Khlobystov
0b84b9c443 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into khmer-locale-fix 2017-10-19 20:34:02 +00:00
Maxim Khlobystov
f455ec97bd Updated the Khmer labels (doesn't break anymore). 2017-10-19 20:29:30 +00:00
Maxim Khlobystov
c44bd1c7fd Fixed the Transifex script to make sure it preserve escaping backslashes in the JSON file supplied by Transifex. 2017-10-19 20:24:36 +00:00
Richard Alam
a3530cad91 - remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
2017-10-19 12:59:14 -07:00
Anton Georgiev
04cef71384 re-enable next/prev/goto slide 2017-10-19 14:47:59 -04:00
Ghazi Triki
b447d18b04 Invalidate 'breakoutEjectFromAudio' state if the join audio button is pressed. 2017-10-19 15:59:01 +01:00