Felipe Cecagno
7ad689cc33
Merge pull request #610 from bigbluebutton/make-moderator-presenter
...
Make moderator presenter
2015-04-15 12:24:27 -03:00
Fred Dixon
55e533dc72
Merge pull request #613 from ffdixon/getting-ready-for-RC
...
Updating strings for 0.9.0-RC
2015-04-15 11:21:59 -04:00
Fred Dixon
8a27d4496c
Updating strings for 0.9.0-RC
2015-04-15 11:20:01 -04:00
perroned
59b02e3b2f
Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call
2015-04-15 05:49:32 -07:00
perroned
7e4fbc220e
Comments for hangup retry
2015-04-15 05:48:16 -07:00
perroned
99f3b1d55d
Beginning work on cancelling a call in progress
2015-04-15 05:02:39 -07:00
Fred Dixon
dffe88d415
Merge pull request #612 from bigbluebutton/ffdixon-patch-2
...
Update bbb-conf
2015-04-14 22:13:10 -04:00
Fred Dixon
ad88aa6087
Update bbb-conf
...
Removed hard-coded links to google code docs (Google Code is going away).
2015-04-14 22:12:59 -04:00
Richard Alam
030026a396
Merge pull request #611 from kepstin/recording-clear
...
Recording clear
2015-04-14 17:38:31 -04:00
Calvin Walton
301665a35b
Fix off-by-one error in slide clear events
...
In 0.9.0, the slide clear events changed from using 1-based page numbers to
using 0-based page numbers.
Add 1 to the page number for recordings generated on a 0.9.0+ server to
fix the issue; at this point it's too late in the release to change the value,
and there's too big of a body of existing recordings out there.
2015-04-14 17:33:49 -04:00
Calvin Walton
c96f9f0cfe
Add a function to compare BBB version numbers
...
This can be used to check if e.g. recording is from a 0.9.0 or newer server
2015-04-14 17:33:49 -04:00
perroned
934d36ee8a
adding the actual check on startup
2015-04-14 09:25:53 -07:00
perroned
321ba43850
Ability to autojoin listen only on startup
2015-04-14 09:05:32 -07:00
Richard Alam
933b9d04ef
- make a moderator presenter when the current presenter leaves (e.g. disconnected). This way, as long as
...
there is a moderator in the meeting, there will always be a presenter.
2015-04-14 14:40:24 +00:00
Richard Alam
8cd45e9cc5
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2015-04-14 14:16:38 +00:00
perroned
6dd0e13632
Added UI for listen only, cleaned up code, added new API methods
2015-04-14 06:34:41 -07:00
Fred Dixon
18bbf0c325
Merge pull request #609 from gthacoder/meteor-client-tiny-whiteboard
...
HTML5 client: whiteboard bug fixes related to the first client load.
2015-04-13 20:35:02 -04:00
Maxim Khlobystov
d6383efa74
Added some comments.
2015-04-13 17:26:01 -07:00
Maxim Khlobystov
013ede36be
Fixed the bug with a huge cursor appearing on first load.
2015-04-13 17:20:46 -07:00
Richard Alam
4155edf12d
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2015-04-13 17:22:17 +00:00
Richard Alam
64894aec77
Merge pull request #608 from capilkey/remove-layout-sync
...
removed the layout sync code
2015-04-13 13:22:01 -04:00
Richard Alam
0eee2d5af0
Merge branch 'capilkey-remove-layout-sync'
2015-04-13 17:21:27 +00:00
Richard Alam
0378239efc
Merge branch 'remove-layout-sync' of https://github.com/capilkey/bigbluebutton into capilkey-remove-layout-sync
2015-04-13 17:09:40 +00:00
Chad Pilkey
3265e647b3
removed the layout sync code
2015-04-13 09:27:21 -07:00
perroned
69bebce93d
Fixed typo
2015-04-13 06:27:41 -07:00
perroned
19816f060e
avoid conflict
2015-04-13 04:08:03 -07:00
Maxim Khlobystov
b8e32da12d
Added the fix for the bug with a tiny whiteboard to a portrait view.
2015-04-10 17:53:43 -07:00
Maxim Khlobystov
dc9e8e46d0
Fixed the issue with a tiny whiteboard on initial page load without the whiteboard cookies set (fixed in landscape only).
2015-04-10 17:17:37 -07:00
Maxim Khlobystov
21be913ff1
Went back to using the height of the whole whiteboard area when calculating slide dimensions (fixed the issue with missing whiteboard on client load).
2015-04-10 15:15:58 -07:00
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
