BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,045 Commits 13 Branches 260 Tags 1.1 GiB
c4e0cafc12
Commit Graph

10045 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
595cf0fd52 Merge pull request #627 from mconf/090-new-videodock 
New video dock in Flash client
 2015-05-06 12:36:40 -04:00
Felipe Cecagno
6ad7ce3318 updating post_catcher in order to listen on localhost 2015-05-06 11:25:42 -03:00
Felipe Cecagno
4051c97a9d added some code to bbb-conf in order to check the webhooks app is well configured, and also to update the security key 2015-05-06 11:24:50 -03:00
Felipe Cecagno
6e516c6df8 promote bbb-webhooks to a well-supported module (removed from labs) 2015-05-06 00:11:02 -03:00
perroned
a5c47b49df Moving functionality into BBB bridge 2015-05-05 13:15:33 -07:00
Anton Georgiev
16741f7c48 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2015-05-05 15:48:09 +00:00
Anton Georgiev
44f180033f update welcome message url 2015-04-30 19:18:54 +00:00
Fred Dixon
9261791fc9 Updated footer link with new docs 2015-04-29 20:41:53 -04:00
Mateus Dalepiane
bdf9d7f68a Update video window talking status on creation 2015-04-29 15:43:24 -03:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Mateus Dalepiane
1d2f980f85 Reset line endings to original 2015-04-29 11:12:50 -03:00
Richard Alam
85d3bca1d1 Merge pull request #625 from antobinary/lock-settings 
html5client:Lock settings implementation
 2015-04-27 10:47:24 -04:00
Anton Georgiev
888b8c6ecc check if null to prevent error 2015-04-27 14:42:03 +00:00
Anton Georgiev
70d3c00e74 include permissions info in the reply for GetAllMeetingsRequest 2015-04-24 21:21:10 +00:00
Chad Pilkey
c91c5dc038 Merge pull request #623 from gthacoder/meteor-client-push-menu-with-audio 
HTML5 client: push menu adjustments for listen only mode.
 2015-04-24 15:26:47 -04:00
Maxim Khlobystov
9c5242ff1a Fixed the bug with missing audio buttons on the sliding menu and made the menu work correctly with audio. 2015-04-24 11:51:13 -07:00
Anton Georgiev
1333856c9b pick lockOnJoin from a settings file 2015-04-23 21:09:28 +00:00
Anton Georgiev
81762d5395 disallow unmuteSelf on lock;single user lock->mute 2015-04-23 20:53:07 +00:00
Anton Georgiev
eea695b326 when enabling disableMic the voice sharing viewers are now muted 2015-04-23 19:55:38 +00:00
Anton Georgiev
4d5184c30a put a lock icon in place when relevant 2015-04-23 18:02:56 +00:00
Anton Georgiev
7a0a1dae60 revert server side permission change 2015-04-23 15:46:52 +00:00
Anton Georgiev
c38cc9f109 identify when the mic is locked & skip the dialog 2015-04-22 21:16:30 +00:00
Anton Georgiev
073977a92a reorganize the joinAudio button handle; add fields for the permissions for joinAudioWithMic 2015-04-22 19:53:05 +00:00
Anton Georgiev
4fd25ca8fd fixed the tooltip for Apply for the lock settings window 2015-04-22 18:46:50 +00:00
Anton Georgiev
ef2c58eaa9 missed while resolving conflicts 2015-04-22 15:58:37 +00:00
Anton Georgiev
5e99ec98c1 Merge branch 'master' into lock-settings 
Conflicts:
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
	bigbluebutton-html5/app/server/user_permissions.coffee
 2015-04-22 14:50:30 +00:00
Richard Alam
2356569d19 Merge pull request #620 from antobinary/listen-only-prototype 
html5client:ListenOnly add-on to #614
 2015-04-22 10:29:48 -04:00
Anton Georgiev
ff934cf472 Merge branch 'master' into listen-only-prototype 2015-04-22 14:05:05 +00:00
Richard Alam
43a13349d1 Merge pull request #621 from perroned/hangup-webrtc-call2 
Implement Listen Only Feature
 2015-04-22 10:01:05 -04:00
perroned
554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
 2015-04-22 06:03:46 -07:00
Fred Dixon
14a267c857 Update README.md 2015-04-21 18:52:29 -05:00
Fred Dixon
f4a8a10163 Update README.md 2015-04-21 18:50:38 -05:00
Fred Dixon
ce5ba83a9f Merge pull request #618 from shaunix/patch-1 
Typo fixes to README.md
 2015-04-21 18:43:38 -05:00
Richard Alam
1a94069fc3 Merge pull request #619 from antobinary/apr2015-ui-changes 
UI changes suggested by Tyler and Fred
 2015-04-21 17:53:21 -04:00
Richard Alam
b4b4fee55e Merge pull request #617 from capilkey/chrome-npapi 
Chrome can manually allow NPAPI until version 45, modified publish window to match
 2015-04-21 17:52:52 -04:00
Anton Georgiev
7171c47656 cleaning up 2015-04-21 21:42:34 +00:00
Shaun McCance
040e65a77a Typo fixes to README.md 2015-04-21 17:15:28 -04:00
Anton Georgiev
45f5c8b298 wrapping chat tabs; bigger easel icon on mobile 2015-04-21 15:19:52 +00:00
Anton Georgiev
f74115c9f2 fixed spacing in userslist; Users:X with same behav as in the Flash player 2015-04-21 15:14:49 +00:00
Anton Georgiev
5cb3a9bd9c Active button hover states; rm left and right border 2015-04-20 20:57:48 +00:00
Anton Georgiev
4c3c4cb3c4 module headings margin change; footer background change 2015-04-20 19:41:51 +00:00
Chad Pilkey
4cf9251610 Chrome can manually allow NPAPI until version 45, modified publish window to match 2015-04-20 11:56:50 -07:00
Anton Georgiev
ebe8e8627f Merge branch 'icon-and-label-modifications' into apr2015-ui-changes 2015-04-20 18:53:34 +00:00
Anton Georgiev
285b8c0e44 removed Send tooltip + blue border on chat tab 2015-04-20 17:50:05 +00:00
Anton Georgiev
fa4cd71ff4 publishing to redis channel "meeting" instead of handling the event on channel "voice" 2015-04-16 19:06:04 +00:00
Anton Georgiev
df1dc332f0 display "X Users" label only for 5+ users 2015-04-16 18:19:40 +00:00
Fred Dixon
ee7884865f Merge pull request #616 from perroned/mobile-icon-detection2 
Restore functionality to properly detect mobile and choose correct icon
 2015-04-16 13:20:39 -04:00
perroned
5808dba448 Restore functionality to properly detect mobile and choose correct icon 2015-04-16 09:55:56 -07:00
perroned
f4295ace2c Fix comment 2015-04-16 08:59:21 -07:00
perroned
c446a81023 Merge remote-tracking branch 'anton/listen-only-prototype' into hangup-webrtc-call 2015-04-16 08:57:40 -07:00