Anton Georgiev
|
61d64ad9cc
|
Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype
Conflicts:
bigbluebutton-html5/app/client/globals.coffee
|
2015-04-10 19:21:40 +00:00 |
|
Anton Georgiev
|
2930eb8fff
|
cleaning up
|
2015-04-10 19:10:42 +00:00 |
|
Anton Georgiev
|
c4edf0cbf3
|
prepend the callerIdName so it is recognized as a global audio user
|
2015-04-10 18:51:46 +00:00 |
|
Anton Georgiev
|
7a13d10b91
|
improve handling of user_joined_voice_message
|
2015-04-10 18:01:45 +00:00 |
|
Fred Dixon
|
761453f31a
|
Merge pull request #605 from capilkey/fix-issue-1635
fix for issue 1635, some of the values needed to be reset
|
2015-04-09 18:33:18 -04:00 |
|
Chad Pilkey
|
1e732c5b98
|
fix for issue 1635, some of the values needed to be reset
|
2015-04-09 15:23:28 -07:00 |
|
Richard Alam
|
ed46391bf6
|
Merge pull request #604 from mconf/fix-context-menu-on-master
Improvements on MDIWindow context menu
|
2015-04-09 17:33:13 -04:00 |
|
Felipe Cecagno
|
aa4ec0c1a8
|
fixed localization for context menu items on presentation window, using the same text as the buttons tooltip
|
2015-04-09 17:57:08 -03:00 |
|
Felipe Cecagno
|
bdb2ad585f
|
keep custom context menu items in the users window when the window is minimized or maximized; translate the context menu items when the localization is changed
|
2015-04-09 17:45:19 -03:00 |
|
Felipe Cecagno
|
46ae3c606c
|
Merge branch 'fix-context-menu' into fix-context-menu-on-master
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
|
2015-04-09 17:26:19 -03:00 |
|
Felipe Cecagno
|
8dd9ee08e0
|
created a new class CustomMdiWindow to proper handle the context menu
|
2015-04-09 17:21:37 -03:00 |
|
Fred Dixon
|
d355312715
|
Fixed typo in check for Chrome42OrHigher
|
2015-04-08 19:15:34 -04:00 |
|
Richard Alam
|
7970a26756
|
Merge pull request #603 from capilkey/-chrome-42-warning
chrome 42 warning
|
2015-04-08 18:18:41 -04:00 |
|
Chad Pilkey
|
d6bd54825f
|
fixed the footer link
|
2015-04-08 15:14:47 -07:00 |
|
Chad Pilkey
|
b8bfedcded
|
added a desktop sharing warning for Chrome 42
|
2015-04-08 14:31:55 -07:00 |
|
Richard Alam
|
ec53b64c64
|
Merge pull request #602 from bigbluebutton/update-locales-apr-8-2015
- pdate locales
|
2015-04-08 17:31:45 -04:00 |
|
Richard Alam
|
ec23e69d3e
|
- pdate locales
|
2015-04-08 21:30:39 +00:00 |
|
Richard Alam
|
8199bed31d
|
Merge pull request #601 from capilkey/misc-layout-fixes
made a bunch of layout changes, still doesn't work 100% correct
|
2015-04-08 16:54:55 -04:00 |
|
Chad Pilkey
|
b9427c391a
|
made a bunch of layout changes, still doesn't work 100% correct
|
2015-04-08 13:15:29 -07:00 |
|
Richard Alam
|
8c54734709
|
Merge pull request #600 from antobinary/lost-welcome-message-2
html5client: addition to the welcome message mongo db fix
|
2015-04-06 16:13:16 -04:00 |
|
Anton Georgiev
|
5446539929
|
The upsert check was incorrect, checking for exact structure. Split into findOne + insert
|
2015-04-06 20:00:44 +00:00 |
|
Richard Alam
|
11124d90d7
|
Merge pull request #599 from capilkey/fix-issue-1915
Three client fixes
|
2015-04-06 15:14:42 -04:00 |
|
Chad Pilkey
|
daf23751f8
|
removed the layout reset on presenter switch
|
2015-04-06 12:06:55 -07:00 |
|
Chad Pilkey
|
397b9e1389
|
increased the height of a TextArea in the echo tests
|
2015-04-06 12:06:22 -07:00 |
|
Chad Pilkey
|
475cbb4756
|
removed some unused layout options
|
2015-04-06 12:05:46 -07:00 |
|
Richard Alam
|
7fb85cd7a6
|
Merge pull request #598 from bigbluebutton/fix-issue-1917
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=19...
|
2015-04-06 11:22:45 -04:00 |
|
Richard Alam
|
337f5f0934
|
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1917
|
2015-04-06 15:20:01 +00:00 |
|
perroned
|
e468f6c2fd
|
Fix formatting
|
2015-04-06 07:58:06 -07:00 |
|
perroned
|
8467f40148
|
Documentation for listen only
|
2015-04-06 07:29:25 -07:00 |
|
Anton Georgiev
|
fdbc62ccd1
|
Cherry pick Anton's server side listen only. Fix conflicts
|
2015-04-06 05:10:56 -07:00 |
|
Fred Dixon
|
2faea2dc04
|
Merge pull request #597 from bigbluebutton/ffdixon-patch-1
Update bbb-conf
|
2015-04-04 00:38:32 -04:00 |
|
Fred Dixon
|
af38969cea
|
Update bbb-conf
Updated bbb-conf to properly enable/disable useWebRTCIfAvailable
|
2015-04-04 00:38:17 -04:00 |
|
Richard Alam
|
8008d97cac
|
Merge pull request #595 from antobinary/lost-welcome-message
html5client: fixed issues with mongo db cursor notation. Meteor update to 1.1
|
2015-04-02 17:44:41 -04:00 |
|
Anton Georgiev
|
21a35c6625
|
Meteor update to the stable 1.1
|
2015-04-02 21:43:10 +00:00 |
|
Anton Georgiev
|
4520949a28
|
the updated mongo has a slightly stricter rule regarding cursors. The welcome message was not stored correctly
|
2015-04-02 21:42:35 +00:00 |
|
Anton Georgiev
|
cdba908eea
|
server side listenOnly. temporarily hooked to raiseHand
|
2015-04-02 20:11:09 +00:00 |
|
Richard Alam
|
95120104fb
|
Merge pull request #594 from capilkey/improve-applet-mouse-interaction
reworked the applet mouse listeners to simplify and improve the functionality
|
2015-04-02 14:54:46 -04:00 |
|
Chad Pilkey
|
3f51358618
|
reworked the applet mouse listeners to simplify and improve the functionality
|
2015-04-02 11:45:30 -07:00 |
|
perroned
|
0a887bfbc5
|
Fix navbar UI when in listen only
|
2015-04-02 09:19:55 -07:00 |
|
perroned
|
3989a4ecfd
|
Fix UI issues with listen only
|
2015-04-02 09:04:51 -07:00 |
|
perroned
|
2580c24f6a
|
cleaned up
|
2015-04-02 08:37:51 -07:00 |
|
perroned
|
4d9e7ed8e3
|
Only send listen only request when needed
|
2015-04-02 08:28:11 -07:00 |
|
Anton Georgiev
|
e1c4ae5f48
|
Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype
Conflicts:
bigbluebutton-html5/app/client/stylesheets/style.less
|
2015-04-02 15:27:41 +00:00 |
|
Anton Georgiev
|
1db332572c
|
cleaning up
|
2015-04-02 15:22:08 +00:00 |
|
perroned
|
4dce91cd32
|
Added listen only query. Close dialog when audio joined.
|
2015-04-02 08:11:35 -07:00 |
|
perroned
|
3bfa6d2998
|
Icon for listen only
|
2015-04-02 08:10:01 -07:00 |
|
perroned
|
36fdde74d7
|
Cleaned and added listen only icon
|
2015-04-02 08:08:30 -07:00 |
|
perroned
|
1efc317fcc
|
public server method for joining as listen only
|
2015-04-02 08:07:58 -07:00 |
|
perroned
|
4c72b7f2fa
|
Update field in payload
|
2015-04-02 08:06:39 -07:00 |
|
perroned
|
38fbe35b94
|
Grant permission for joining listen only
|
2015-04-02 08:05:43 -07:00 |
|