perroned
0378b2e723
modularize modals
2015-09-15 09:36:49 -07:00
perroned
ee49bf9e0f
Verto UI, listen only
2015-09-15 09:34:59 -07:00
Richard Alam
e24b8c7cbe
Merge pull request #2781 from riadvice/pepperflash-webcam-fix
...
Microphone name automatically set under Pepper flash before getting the browser permission.
2015-09-15 10:52:43 -04:00
Richard Alam
1eac9dc709
Merge pull request #2783 from ritzalam/capilkey-fix-lock-settings
...
fix lock settings
2015-09-15 10:40:03 -04:00
Richard Alam
92aa4b9aef
Merge pull request #2782 from antobinary/master
...
html5client: [un]mute message was not going to the correct redis channel
2015-09-15 10:39:32 -04:00
Richard Alam
643e7b7087
- cleanup
2015-09-15 14:38:41 +00:00
Richard Alam
2278ee01ec
- upgrade bbb-commons-message version
2015-09-14 21:45:55 +00:00
Richard Alam
bbfbdf20e9
- cleanup
2015-09-14 21:25:27 +00:00
Richard Alam
44763bf283
- try to fix lock settings
2015-09-14 20:18:27 +00:00
Anton Georgiev
233707395a
limit flooding logs
2015-09-14 19:56:25 +00:00
Anton Georgiev
d7e414fa43
[un]mute message was not going to the correct redis channel
2015-09-14 19:55:04 +00:00
Richard Alam
247239caeb
Merge branch 'figure-out-why-lock-settings-not-working' into capilkey-fix-lock-settings
2015-09-14 15:51:15 +00:00
perroned
95bbe10ca7
Fixed a bug where you could not restart Chrome deskshare
2015-09-14 08:40:07 -07:00
Richard Alam
8514eec3ba
Merge branch 'remove-java-warning-chrome' of https://github.com/capilkey/bigbluebutton into capilkey-fix-lock-settings
2015-09-14 14:21:20 +00:00
perroned
6a2b4c972a
Added flag for audio choosing
2015-09-14 07:19:41 -07:00
perroned
24279cae36
Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition
2015-09-14 07:08:40 -07:00
perroned
f631664028
Not required (as of yet)
2015-09-14 07:08:05 -07:00
perroned
36e4c2d0d9
Hooking up UI components
2015-09-14 07:07:35 -07:00
Ghazi Triki
405840edc4
Microphone name automatically set under Pepper flash before getting the browser permission.
2015-09-12 13:31:02 +01:00
Ghazi Triki
65f1b72294
Enable video and audio sharing for Puffin browser 4.6 and above.
2015-09-12 12:35:12 +01:00
Chad Pilkey
51650fb998
made the init audio and permissions message payloads actually contain something and corrected chatpermission message names
2015-09-11 15:02:28 -07:00
Chad Pilkey
e364a8c130
correct the vote counts in the accessbile poll message
2015-09-11 15:00:14 -07:00
Chad Pilkey
5eba1622ac
remove an unused variable in the poll graphics
2015-09-11 14:59:52 -07:00
Richard Alam
85bf849221
Merge pull request #2778 from ritzalam/client-to-server-logging
...
Client to server logging
2015-09-11 16:27:11 -04:00
Oleksandr Zhurbenko
cfccc3aae2
Added outer whitespace to the poll shape, as in the Flash client
2015-09-11 13:07:50 -07:00
Richard Alam
571254f75c
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-to-server-logging
2015-09-11 14:40:07 +00:00
Chad Pilkey
c7111089dc
Merge pull request #2777 from OZhurbenko/meteor-ui
...
Whiteboard optimization
2015-09-10 18:31:29 -04:00
Oleksandr Zhurbenko
41c453c470
cleanup
2015-09-10 15:09:55 -07:00
Oleksandr Zhurbenko
d208da2c31
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui
...
Conflicts:
bigbluebutton-html5/app/client/globals.coffee
2015-09-10 15:01:09 -07:00
Oleksandr Zhurbenko
2feabdc65b
Fixed a bug with whiteboard's width in case when poll controllers appeared
2015-09-10 14:50:38 -07:00
Richard Alam
cfa6e30b23
Merge branch 'master' into client-to-server-logging
2015-09-10 17:52:58 +00:00
Richard Alam
977d4ba081
Merge pull request #2773 from ritzalam/update-locales
...
- pulling locales from transifex (sept 10, 2015)
2015-09-10 13:42:23 -04:00
Richard Alam
df19e44bc3
Merge pull request #2774 from kepstin/mixed-content
...
Use protocol-relative links to load the 'get flash' button image
2015-09-10 13:33:58 -04:00
Richard Alam
8a464a4f23
Merge pull request #2772 from capilkey/remove-java-warning-chrome
...
removed warning for Java not being installed with Chrome 42+
2015-09-10 13:27:08 -04:00
Richard Alam
38be65409b
Merge pull request #2771 from riadvice/client-fixes
...
Added custom binding to BBBUser emoji properties
2015-09-10 13:15:30 -04:00
Calvin Walton
e7008957c9
Use protocol-relative links to load the 'get flash' button image
...
This fixes a mixed content warning when loading the client over https
2015-09-10 11:53:36 -04:00
Richard Alam
ac838e741a
- pulling locales from transifex (sept 10, 2015)
2015-09-10 15:25:00 +00:00
perroned
7ed87d01c6
Fix issue when screensharing first
2015-09-09 15:41:13 -07:00
Chad Pilkey
9859ea6735
removed warning for Java not being installed with Chrome 42+
2015-09-09 15:30:03 -07:00
Oleksandr Zhurbenko
f9b2cdb01c
Removed unnecessary Tracker.autorun and cleaned up things
2015-09-09 10:24:57 -07:00
Ghazi Triki
7441fb9efb
Added smart binding to BBBUser "emojiStatus" and "hasEmojiStatus" properties to avoid having a runtime warning.
2015-09-09 18:24:50 +01:00
Ghazi Triki
7fdccc4095
Throw a too long chat message and log it and its length.
2015-09-09 17:58:25 +01:00
Oleksandr Zhurbenko
db3b95e990
Added proper scaling for the whiteboard when a polling or bottom presenter buttons templates are rendered or destroyed
2015-09-08 16:57:39 -07:00
Richard Alam
d009c6940e
Merge pull request #2769 from ritzalam/fix-users-get-kicked-when-user-refresh
...
- fix issue where other users get disconnected when a user refreshes…
2015-09-08 16:51:09 -04:00
Richard Alam
f78dc3653c
- fix issue where other users get disconnected when a user refreshes browser after a reconnect
2015-09-08 20:27:10 +00:00
Richard Alam
a779e5c3e2
- add logging
2015-09-08 16:08:56 +00:00
Richard Alam
ab7ff09f9f
Merge pull request #2767 from maxdoumit/restream_after_video_disconnect
...
Restream video after disconnect
2015-09-08 10:38:31 -04:00
Ghazi Triki
f773cfa9f9
Added message too long in client locales.
2015-09-07 16:18:49 +01:00
Ghazi Triki
19dbba500b
Chat message longer than "maxMessageLength" cannot be sent.
2015-09-07 16:10:49 +01:00
maxdoumit
3891db93e7
Restream video after disconnect
...
This commit will enable the client to restream video in the case of a disconnect.
A _restream variable has been added to the VideoEventMapDelegate.as, that will dictate if the stream needs to be restream.
The setting are stored also stored so ensure that no user interaction is needed to restream the video.
VideoEventMapDelegate.as now listens to BBBEvent.RECONNECT_CONNECTION_ATTEMPT_SUCCEEDED_EVENT, and will restream the video in the case _restream is true.
_restream is set to true when the user shares his camera, and set to false when the user manually closes his camera.
2015-09-06 22:21:55 -04:00
