Richard Alam
|
c5cfbdda58
|
Merge pull request #3905 from ritzalam/bbb-2x-mconf
Merge latest changes for bbb 2.x
|
2017-05-04 19:00:21 -04:00 |
|
Richard Alam
|
69cc522473
|
Merge branch 'bbb-2.x-dev-mconf' into bbb-2x-mconf
|
2017-05-04 15:57:42 -07:00 |
|
Fred Dixon
|
ac1eb0d3e7
|
Update demo1.jsp
testing package updates
|
2017-05-04 17:44:12 -04:00 |
|
Richard Alam
|
23e6dea35b
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf
|
2017-05-04 14:39:02 -07:00 |
|
Fred Dixon
|
36f2f238cd
|
Update demo1.jsp
testing build server
|
2017-05-04 17:35:53 -04:00 |
|
Fred Dixon
|
f0728393ac
|
Update bbb-conf
|
2017-05-04 17:34:12 -04:00 |
|
Fred Dixon
|
b061996e44
|
Update bbb-conf
test-commit
|
2017-05-04 17:31:58 -04:00 |
|
Anton Georgiev
|
ea05b8b277
|
Merge pull request #3904 from antobinary/verto-bridge-update
HTML5: Unify user and audiouser in verto bridge
|
2017-05-04 17:29:40 -04:00 |
|
Richard Alam
|
8723fca30c
|
- update version of bbb-commons-message
|
2017-05-04 13:48:39 -07:00 |
|
Fred Dixon
|
401f46c5c6
|
Update bbb-conf
|
2017-05-04 16:41:35 -04:00 |
|
Anton Georgiev
|
93baf362e6
|
remove old import
|
2017-05-04 15:14:14 -04:00 |
|
Anton Georgiev
|
91ce6e20d5
|
unify user and audiouser in verto bridge
|
2017-05-04 14:44:20 -04:00 |
|
Ghazi Triki
|
740a1abe0b
|
Fix client crash when text zones are quickly added to the whiteboard.
|
2017-05-04 18:46:36 +01:00 |
|
Chad Pilkey
|
721495d460
|
removed old images that are now unused
|
2017-05-04 13:14:54 -04:00 |
|
Pedro Beschorner Marin
|
65aac2d500
|
Reverting screenshare view back to canvas
|
2017-05-04 16:01:48 +00:00 |
|
Chad Pilkey
|
62a7ad1a7e
|
whiteboard client cleanup
|
2017-05-04 11:49:10 -04:00 |
|
Pedro Beschorner Marin
|
d4b6fb1158
|
Removed bbb-web a domain file that was already moved to bbb-common-web
|
2017-05-04 15:24:06 +00:00 |
|
Chad Pilkey
|
53783a7d2c
|
Merge pull request #3899 from riadvice/mobile-client
[Mobile] - Handle "back" soft button and add item render to video profiles list
|
2017-05-04 10:30:23 -04:00 |
|
Richard Alam
|
a97dd6ec58
|
Merge pull request #16 from pedrobmarin/life-cycle-management
Moving the meeting life cycle management from bbb-web to akka-apps
|
2017-05-04 10:22:06 -04:00 |
|
Richard Alam
|
b1740ebec5
|
Merge pull request #17 from capilkey/multi-user-2.0-take3
Updates to make the text tool work
|
2017-05-04 10:21:39 -04:00 |
|
Ghazi Triki
|
db77dc239f
|
Close color picker when the text toolbar is to be hidden.
|
2017-05-04 11:23:20 +01:00 |
|
Fred Dixon
|
5493ba2e22
|
Merge pull request #3901 from bigbluebutton/ffdixon-patch-3
Updated comment in crontab job to remove reference to ghostscript
|
2017-05-04 05:04:44 -04:00 |
|
Fred Dixon
|
ef8fdccd4f
|
Updated comment in crontab job
|
2017-05-04 05:04:25 -04:00 |
|
Fred Dixon
|
925eeebc28
|
Merge pull request #3900 from ffdixon/remove-ref-gs
Remove refs to ghostscript
|
2017-05-04 04:59:02 -04:00 |
|
Fred Dixon
|
b26ac2b6bc
|
Remove refs to ghostscript
|
2017-05-04 03:57:43 -05:00 |
|
Ghazi Triki
|
44ed1ae04d
|
Revert modifications to .actionScriptProperties
|
2017-05-04 09:38:20 +01:00 |
|
Ghazi Triki
|
8793812ca1
|
Add item renderer for camera profiles list.
|
2017-05-04 09:36:16 +01:00 |
|
Chad Pilkey
|
7933d05707
|
Fix the text cursor for whiteboard
|
2017-05-03 18:42:29 -04:00 |
|
Chad Pilkey
|
2b0fc6ed6b
|
update whiteboard cursors to new images
|
2017-05-03 18:38:55 -04:00 |
|
Chad Pilkey
|
85d525172b
|
rewrote the text tool to be like other annotations and removed redundant processing
|
2017-05-03 18:06:26 -04:00 |
|
Fred Dixon
|
837654dc85
|
Merge pull request #3895 from perroned/update-verto-libs
Update verto libs and WebRTC Extension
|
2017-05-03 16:50:34 -04:00 |
|
Anton Georgiev
|
d0efbc0879
|
Merge pull request #3896 from antobinary/lock-microphone
HTML5: If microphone lock is enforced, pick listenOnly join over using mic
|
2017-05-03 16:17:11 -04:00 |
|
Anton Georgiev
|
3904771fc3
|
if microphone lock is enforced, pick listenOnly join over using mic
|
2017-05-03 16:12:47 -04:00 |
|
perroned
|
589d21019e
|
Merge branch 'chrome-webrtc-extension' into update-verto-libs
|
2017-05-03 19:34:52 +00:00 |
|
Anton Georgiev
|
6d71e943a0
|
Merge pull request #3893 from antobinary/check-mute-user
HTML5: Update callServer to makeCall to fix user item calls
|
2017-05-03 13:54:15 -04:00 |
|
Anton Georgiev
|
5121dc615e
|
Merge pull request #3865 from Klauswk/ClientLog
Add Client log, HTML5
|
2017-05-03 13:46:26 -04:00 |
|
Klauswk
|
19d4cb4916
|
Merge pull request #1 from antobinary/test-3865
Merged changes from anton
|
2017-05-03 14:32:04 -03:00 |
|
Klauswk
|
b668b24cac
|
Merge branch 'ClientLog' into test-3865
|
2017-05-03 14:31:13 -03:00 |
|
Ghazi Triki
|
1bf45e1902
|
Enable "back" soft key navigation for the mobile application.
|
2017-05-03 18:27:25 +01:00 |
|
Anton Georgiev
|
038405f907
|
some changes to logClient api
|
2017-05-03 13:19:21 -04:00 |
|
Klauswk
|
74c2219fc9
|
Update index.js
|
2017-05-03 14:09:33 -03:00 |
|
Pedro Beschorner Marin
|
66a12c9c7a
|
Moving the meeting life cycle management from bbb-web to akka-apps
|
2017-05-03 17:02:16 +00:00 |
|
Anton Georgiev
|
8ab7865419
|
Merge branch 'ClientLog' of github.com:Klauswk/bigbluebutton into test-3865
|
2017-05-03 12:59:33 -04:00 |
|
perroned
|
9560a23988
|
Remove invalid characters from manifest
|
2017-05-03 16:59:03 +00:00 |
|
Anton Georgiev
|
935219148a
|
Merge pull request #3871 from Klauswk/LeaveButtonOnErrorScreen
Add leave button to error screen
|
2017-05-03 12:58:28 -04:00 |
|
Anton Georgiev
|
3a4b8cc388
|
update callServer to makeCall to fix user item calls
|
2017-05-03 12:56:27 -04:00 |
|
Ghazi Triki
|
8a8a623862
|
Fix float scale of generate_css_dpi to 2
|
2017-05-03 17:51:10 +01:00 |
|
Klauswk
|
b0b455e591
|
Merge branch 'master' into ClientLog
|
2017-05-03 13:40:57 -03:00 |
|
perroned
|
eb11700f4a
|
Extension allows source override
|
2017-05-03 16:40:21 +00:00 |
|
Klaus Klein
|
5a37750bf6
|
Change leave button label
|
2017-05-03 13:19:45 -03:00 |
|