BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,440 Commits 13 Branches 260 Tags 1.1 GiB
2a65639adb
Commit Graph

11440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
2a65639adb Use new deskshare collection 2016-01-13 10:06:57 -08:00
perroned
73c1eddc05 Updated parameters for initating verto calls. 2016-01-13 10:05:22 -08:00
perroned
e55ac3c7f8 Load deskshare libraries from Flash 2016-01-13 10:04:01 -08:00
perroned
ed1ed3ab05 Added deskshare collection 2016-01-13 10:02:11 -08:00
perroned
4ae45bff9b Updated verto audio joining 2016-01-13 10:01:00 -08:00
perroned
ee2f4a5dc3 Fix detection of when deskshare is initiated and ended through different collection 2016-01-13 10:00:28 -08:00
perroned
e7f8237a21 Removed deskshare library files from client 2016-01-13 10:00:17 -08:00
perroned
e7884e831b Merge remote-tracking branch 'anton/webrtc-desktop-temp-4' into html5client-mod-verto-addition-2 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2016-01-07 10:40:52 -08:00
Anton Georgiev
155aebdc65 allow late joining ds for html5 client, event if Meteor started late 2015-12-22 22:55:16 +00:00
Anton Georgiev
88d969cd45 fix string in common message 2015-12-22 22:50:34 +00:00
Anton Georgiev
2969c9136e html5 promote BBB.x vs getInSession where possible 2015-12-22 20:49:45 +00:00
Anton Georgiev
8ee6356b5a accommodate late joiners 2015-12-22 16:21:39 +00:00
perroned
9775d5a2f8 Say FF addon isn't there until detection 2015-12-15 13:00:11 -08:00
perroned
5d08f78ad5 Add everything audio to its own file 2015-12-15 12:59:37 -08:00
Anton Georgiev
09a870296d reuse hover string from other ds method; skip chat notific on ds start/end 2015-12-14 20:45:46 +00:00
Anton Georgiev
7b15231cdb cleaning up issues with webrtc ds display 2015-12-11 22:39:00 +00:00
Anton Georgiev
cad6c2a175 add a check for user 2015-12-11 20:32:44 +00:00
Anton Georgiev
1a2447b5b9 hooking up to server side 2015-12-11 20:30:55 +00:00
Anton Georgiev
5bf05161af Merge branch 'html5client-mod-verto-addition' of github.com:perroned/bigbluebutton into webrtc-desktop-temp-4 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
 2015-12-11 17:23:27 +00:00
Anton Georgiev
105fb2495d avoid issues oberved in verto 2015-12-11 16:45:36 +00:00
perroned
34aa2b03fc Use voice bridge received from server 2015-12-10 10:55:30 -08:00
perroned
5c74f5f446 Update whiteboard controls template 2015-12-10 10:38:27 -08:00
perroned
7625a199b1 Add deskshare object to meetings 2015-12-10 07:58:25 -08:00
perroned
0a3f91c65b Fixed indentation error 2015-12-10 07:58:06 -08:00
Anton Georgiev
97bcb025b6 add webrtc deskshare module; comment out old deskshare module 2015-12-09 20:36:37 +00:00
Anton Georgiev
6c9493ec60 make local publish default 2015-12-09 16:46:38 +00:00
perroned
2d404323c6 Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/stylesheets/mixins.less
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/redispubsub.coffee
 2015-12-09 08:40:13 -08:00
perroned
9668719929 Update verto libraries 2015-12-07 10:38:15 -08:00
Anton Georgiev
65ad30c46d Merge pull request #2925 from Gcampes/master 
Add set presenter to HTML5
 2015-12-07 13:05:42 -05:00
Gabriel Campes
791290e8b9 Add set presenter to HTML5 2015-12-07 13:33:52 -02:00
Anton Georgiev
2005680bae Merge pull request #2924 from Gcampes/master 
Add Kick user to HTML5
 2015-12-04 13:00:07 -05:00
Gabriel Campes
be9e582a1d Add kick user to HTML5 2015-12-04 14:38:19 -02:00
Anton Georgiev
ed8b38478c Merge pull request #2923 from antobinary/pr-test 
html5client:clear slide when presenter removes current presentation
 2015-12-03 18:17:01 -05:00
Anton Georgiev
f5adeb34d8 reuse existing functionality 2015-12-03 23:15:29 +00:00
Anton Georgiev
f1d547bf42 clear slide when presenter removes current presentation 2015-12-03 23:04:17 +00:00
Anton Georgiev
0fa709441d Merge pull request #2922 from antobinary/pr-test 
html5client: reworked viewing slide change; moved the cursor out of Presentation collection
 2015-12-03 15:24:21 -05:00
Anton Georgiev
007911ad85 remove extra callback 2015-12-03 20:23:20 +00:00
Anton Georgiev
1e4477d1c2 moved the cursor into its own collection 2015-12-03 20:01:27 +00:00
Anton Georgiev
59f1ff2394 force display of slide even if .rendered does not trigger. Will need to decouple pointer coord from Presentation 2015-12-03 17:03:04 +00:00
Richard Alam
d74f97928c Merge pull request #2906 from ritzalam/cancel-message-sending-task 
- cancel the message sending task when it takes a long time to compl…
 2015-12-02 17:04:42 -05:00
Richard Alam
adffa270ff Merge pull request #2919 from ritzalam/fix-multiple-audio-recordings 
- fix where 2 events are recorded in redis for each voice event.
 2015-12-02 16:44:44 -05:00
Richard Alam
c024cd570c - fix where 2 events are recorded in redis for each voice event. 2015-12-02 21:37:18 +00:00
Anton Georgiev
7bf1d4ce8c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-3 
Conflicts:
	record-and-playback/core/scripts/bigbluebutton.yml
 2015-11-30 21:44:04 +00:00
Anton Georgiev
8ced2a3207 remove hardcoded defaults. Grab on the go 2015-11-30 21:20:56 +00:00
Anton Georgiev
e3d782b381 Merge pull request #2917 from gthacoder/meteor-client 
HTML5 client: redesigned mobile navbar and offset menus + small mobile view adjustments.
 2015-11-30 14:28:54 -05:00
Maxim Khlobystov
04528eeafe Made the horizontal border between chat and presentation areas one pixel wide on mobile. 2015-11-28 21:44:41 -08:00
Maxim Khlobystov
7cd8702d98 Removed border radius on both chat and presentation areas for mobile devices. 2015-11-28 21:36:54 -08:00
Maxim Khlobystov
ad0a23c02e Changed the mobile navbar icons (thus reducing the number of animations) and redesigned the Settings menu. 2015-11-28 21:18:58 -08:00
Maxim Khlobystov
f7eb9b2a06 Included the navbar under the dark overlay when offset menu is open in portrait, removed some redundant code. 2015-11-28 18:49:53 -08:00
Anton Georgiev
fe67618332 Merge pull request #2916 from antobinary/pr-test 
html5client: fix bug-shapes were flushed no matter which meeting ends
 2015-11-27 11:45:47 -05:00