Richard Alam
443d6ba976
Merge pull request #2890 from antobinary/audio-fix
...
html5client:Queue updates
2015-11-10 17:33:46 -05:00
Fred Dixon
a418f3977a
Merge pull request #2889 from capilkey/add-audio-left-sound
...
Added a client side audio queue when you leave the voice conference
2015-11-09 18:09:50 -05:00
Anton Georgiev
e300e0376f
cleaning up
2015-11-09 22:03:11 +00:00
Anton Georgiev
975f512b74
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix
2015-11-09 21:36:11 +00:00
Anton Georgiev
d3f9f4e8a7
keep track of queue length; omit some messages from entering the queue (pong,..)
2015-11-09 21:35:03 +00:00
Chad Pilkey
8463325ce3
added a client side audio queue when you leave the voice conference
2015-11-09 11:38:30 -08:00
Anton Georgiev
e3efd24a2b
fix function def typo
2015-11-09 18:45:31 +00:00
Richard Alam
31d7887dfd
Merge pull request #2885 from antobinary/audio-fix
...
html5client:serial handling of selected event messages to ensure correct order of db updates
2015-11-06 17:18:49 -05:00
Anton Georgiev
c18aef9f5e
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix
2015-11-06 22:01:34 +00:00
Anton Georgiev
84e8cb0d48
fix issue with join user for Flash users
2015-11-06 22:01:03 +00:00
Anton Georgiev
247349e9b4
working on serializing message handling
2015-11-06 21:38:18 +00:00
Chad Pilkey
e55ad15145
Merge pull request #2879 from perroned/styling-issues1
...
Settings Modal Adjustments
2015-11-06 16:34:00 -05:00
Richard Alam
5c7f25fcc1
Merge pull request #2884 from ritzalam/update-locales-nov-6-2015
...
- update locales
2015-11-06 16:06:18 -05:00
Richard Alam
8f83ada786
- update locales
2015-11-06 21:02:31 +00:00
Fred Dixon
caf737c1aa
Merge pull request #2880 from capilkey/fix-2863
...
Block mute/unmute from the video window when locked
2015-11-06 12:48:42 -05:00
Fred Dixon
8f789974a7
Merge pull request #2883 from kepstin/recording-https
...
Recording https support
2015-11-06 12:48:20 -05:00
Calvin Walton
fc299487e4
recording: Allow configuring recording metadata to use https
...
This allows configuring a server to use https without having to edit
any ruby files directly.
(Ideally, the metadata files wouldn't include the server name/protocol
at all; that should be set dynamically by bbb-web, but this is what we
have for now.)
2015-11-06 11:49:36 -05:00
Calvin Walton
39cc6a80a6
recording: Use relative url for loading presentation data
...
This fixes loading the shapes svg, and the events and cursor xml files
on servers configured with https support. (Otherwise they'll be loaded
off http:// and trigger mixed-content errors).
2015-11-06 11:49:31 -05:00
Anton Georgiev
db62de4e2f
in the process of serializing message handling
2015-11-05 22:22:14 +00:00
Chad Pilkey
efd66d2906
blocked video mute/unmute when locked
2015-11-05 14:14:04 -08:00
perroned
8a8e81da55
Uniform height for settings components
2015-11-05 12:42:47 -08:00
perroned
98e4034ca3
Prevent horizontal scrollbars for chat
2015-11-05 10:22:17 -08:00
perroned
6b198daa36
Unify height for chat controls
2015-11-05 10:17:09 -08:00
perroned
b17ee7b7bf
Fix centering of fieldsets in Firefox
2015-11-05 10:16:35 -08:00
Chad Pilkey
0e3e902e5a
Merge pull request #2876 from OZhurbenko/modal-improvements
...
Data Handling and Modal Improvements
2015-11-05 13:01:23 -05:00
Fred Dixon
fbe775acb6
Merge pull request #2877 from capilkey/fix-firefox-candidates
...
Fix Firefox candidates
2015-11-04 20:01:47 -05:00
Chad Pilkey
42236569a5
update sip.js to include a ice candidate timeout
2015-11-04 16:44:55 -08:00
Chad Pilkey
03d2a376ad
added in a 30s total timeout on iceGathering
2015-11-04 16:44:15 -08:00
Oleksandr Zhurbenko
a6e38c69f1
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements
...
Conflicts:
bigbluebutton-html5/app/client/main.html
bigbluebutton-html5/app/client/stylesheets/style.less
2015-11-04 15:47:14 -08:00
Oleksandr Zhurbenko
12a00553d2
Getting rid of duplicating code
2015-11-04 15:34:54 -08:00
Oleksandr Zhurbenko
cb610535bb
Modal window changes: removed cancel buttons and a save button, added 'Close' instead, fixed centering problem
2015-11-04 15:33:29 -08:00
Richard Alam
857bf26ed0
Merge pull request #2875 from capilkey/fix-2871
...
Fix for issue 2871
2015-11-04 16:48:02 -05:00
Chad Pilkey
f2d997c0bf
changed retrived annotation from DrawObject to Object
2015-11-04 13:25:28 -08:00
Anton Georgiev
1ef29a034b
push the redis messages in a FIFO queue to avoid race cond
2015-11-04 20:57:56 +00:00
Anton Georgiev
6cec8d0c81
change the default font on mobile to 16
2015-11-04 20:54:42 +00:00
Fred Dixon
110c0d4dd1
Merge pull request #2874 from ffdixon/update-bigbluebutton-cron
...
Added commands to clean out FreeSWITCH logs after a number of days
2015-11-03 18:02:56 -05:00
Fred Dixon
e21e4667a5
Added commands to clean out FreeSWITCH logs after a number of days
2015-11-03 18:00:23 -05:00
Anton Georgiev
c4d7d70dce
fix placement of welcome message issue
2015-11-03 22:19:17 +00:00
Richard Alam
6c50443112
Merge pull request #2873 from antobinary/audio-fix
...
html5client:improve logs to detect correct sequence of events and detect race condition
2015-11-03 16:44:18 -05:00
Anton Georgiev
7f07e686dd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix
2015-11-03 21:08:16 +00:00
Anton Georgiev
9e56192e4b
improve logs to detect correct sequence of events and detect race cond
2015-11-03 21:07:56 +00:00
Oleksandr Zhurbenko
2b96e6f723
Added spinning bar which is displayed while the data is loading
2015-11-03 12:04:02 -08:00
Oleksandr Zhurbenko
a97eba6d8b
Making sure that the data is downloaded before starting rendering the client
2015-11-03 12:03:05 -08:00
Richard Alam
03a7110a92
Merge pull request #2869 from gthacoder/meteor-client
...
HTML5 client: UI fixes and code refactoring.
2015-11-02 14:40:41 -05:00
Richard Alam
ca7b38f081
Merge pull request #2870 from antobinary/audio-fix
...
html5client: clear Flash users from Mongo even if they are about to reconnect
2015-11-02 14:40:23 -05:00
Anton Georgiev
c5207e3110
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix
2015-11-02 19:37:41 +00:00
Anton Georgiev
2ca161124e
do not store flash client users while reconnecting
2015-11-02 19:37:23 +00:00
Maxim Khlobystov
f4f4a119d9
Got rid of some old unused code related to the raise hand functionality.
2015-11-01 16:08:12 -08:00
Maxim Khlobystov
50e3000b85
Made Raise Hand button invisible in full screen mode.
2015-11-01 15:55:22 -08:00
Maxim Khlobystov
50c74ce5ee
Corrected the position of Full Screen button and the size of Raise Hand button to align them together on mobile devices.
2015-11-01 15:49:25 -08:00
