Commit Graph

11667 Commits

Author SHA1 Message Date
Oswaldo Acauan
2f7ad91b3e Working on HTML5 displaying the last slide when presentation is deleted 2015-11-17 14:59:16 -02:00
Oswaldo Acauan
af2bba668f Working on HTML5 displaying the last slide when presentation is deleted 2015-11-17 14:57:55 -02:00
Gabriel Campes
14110cdd5f Aligned mobile side menu, changed menu background color 2015-11-17 14:39:22 -02:00
Richard Alam
093e09a594 Merge pull request #2895 from oswaldoacauan/master
User list design changes on HTML5 client
2015-11-17 10:36:01 -05:00
Oswaldo Acauan
5a84874b75 Increased the overflow limit on user name at the sidebar 2015-11-17 12:02:33 -02:00
Oswaldo Acauan
b6b52f9626 Added padding on sidebar icons so they don't touch the edge 2015-11-17 11:32:42 -02:00
Oswaldo Acauan
ed59945b3f Increased the sidebar to 2/3 of the screen on mobile 2015-11-17 11:24:22 -02:00
Chad Pilkey
8d321b2493 Merge pull request #2849 from riadvice/client-fixes
Minor Client fixes
2015-11-16 07:35:39 -05:00
Richard Alam
54883969c2 Merge pull request #2893 from daronco/webhook-fixes
Webhooks: Fix "ReferenceError: hook is not defined" when removing hook
2015-11-13 11:18:25 -05:00
Chad Pilkey
f9c241a041 Merge pull request #2891 from OZhurbenko/chat-improvements
Slide Loading and Resizing corrections
2015-11-12 14:06:18 -05:00
Leonardo Crauss Daronco
0a9376f9b2 Fix "ReferenceError: hook is not defined" when removing hook 2015-11-12 16:43:11 -02:00
Oleksandr Zhurbenko
3e4572d6b5 Removed unused code 2015-11-11 15:31:03 -08:00
Oleksandr Zhurbenko
8a17a295b9 Fixed a problem with displaying tall slides on the first load 2015-11-10 19:44:48 -08:00
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
Oleksandr Zhurbenko
849b58d8cb Fixed chatbody's srolling on increasing font-size 2015-11-06 13:06:17 -08:00
Richard Alam
8f83ada786 - update locales 2015-11-06 21:02:31 +00:00
Oleksandr Zhurbenko
4b0bce343b Added input textarea resizing on font-size change 2015-11-06 12:26:41 -08: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
Oleksandr Zhurbenko
f6700df896 Applied dynamic font-size for the input textarea 2015-11-05 15:16:33 -08: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