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

11359 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
5d08f78ad5 Add everything audio to its own file 2015-12-15 12:59:37 -08: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
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
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
Anton Georgiev
4ca1c58e9f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pr-test 2015-11-27 16:40:45 +00:00
Anton Georgiev
0aa7038ae1 fix bug-shapes were flushed no matter which meeting ends 2015-11-27 16:40:31 +00:00
Anton Georgiev
1b0dca557d remove (presenter) in useritem 2015-11-24 19:40:45 +00:00
Anton Georgiev
ef79c7f3f3 Merge pull request #2912 from antobinary/pr-test 
html5client: Login error pop-up removed; reset the listenOnly defaults
 2015-11-24 14:30:01 -05:00
Anton Georgiev
d5698825c1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pr-test 2015-11-24 19:09:38 +00:00
Anton Georgiev
b2fd1c32a7 try to re-join instead of alerting error; reset listenOnly defaults 2015-11-24 19:09:00 +00:00
Anton Georgiev
98e170abb5 Merge pull request #2911 from antobinary/pr-test 
html5client: fix for whiteboard annnotations issue
 2015-11-23 17:05:56 -05:00
Anton Georgiev
c59b3ed82c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pr-test 2015-11-23 22:02:19 +00:00
Anton Georgiev
3e3f7c6c8e fix lost annotation on presentation change 2015-11-23 22:01:44 +00:00
Anton Georgiev
1d5055e3c6 Merge pull request #2910 from gthacoder/meteor-client 
HTML5 client: Grunt configuration update + UI bug fixes and adjustments.
 2015-11-23 13:20:09 -05:00
Anton Georgiev
954ff55c53 Merge pull request #2909 from Gcampes/master 
Added auto join audio for the HTML5 client
 2015-11-23 11:11:57 -05:00
Maxim Khlobystov
3ab831cb5a Fixed the internal padding of the currently active emoji button. 2015-11-22 16:03:11 -08:00
Maxim Khlobystov
3ca40ee29e Added some internal padding to the mobile userlist menu and removed its border radius. 2015-11-22 15:52:00 -08:00
Maxim Khlobystov
fda4f77fdc Updated the color scheme for the mobile userlist to match the desktop experience. 2015-11-22 15:42:02 -08:00
Maxim Khlobystov
4cc3c1ab65 Got the invisible navbar title back on mobile. 2015-11-22 14:02:25 -08:00
Maxim Khlobystov
421dd23b31 Got the missing right hamburger button back on mobile. 2015-11-22 13:56:14 -08:00
Maxim Khlobystov
65d2c56f8f Added the ability to run Jasmine tests with a single command. 2015-11-21 22:34:58 -08:00
Maxim Khlobystov
5a91abe468 Made Grunt work without additional step of making grunt command recognizable (added grunt-cli to the default installation). 2015-11-21 22:18:33 -08:00
Maxim Khlobystov
e4df76f98f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client 2015-11-21 20:29:46 -08:00
Gabriel Campes
cf72e09103 Merge branch 'master' of https://github.com/Gcampes/bigbluebutton 
Conflicts:
	bigbluebutton-html5/app/config.coffee
 2015-11-20 17:37:07 -02:00
Gabriel Campes
34f0b22a91 added auto join voice chat 
Fixed endless joining voice chat message

Changed config to auto join
 2015-11-20 17:21:02 -02:00
Gabriel Campes
93dacb7f1d added auto join voice chat 
Fixed endless joining voice chat message
 2015-11-20 17:10:54 -02:00
Richard Alam
dc39a89986 Merge pull request #2907 from oswaldoacauan/emoji-mobile-fix 
Fix emoji buttons overlapping the slide buttons on portrait view
 2015-11-19 11:30:49 -05:00