Oleksandr Zhurbenko
3851b95f15
Fixed the positioning of chat input textarea
2015-05-06 12:15:27 -07:00
Oleksandr Zhurbenko
698ccf5c4f
Getting rid of a footer
2015-05-06 12:08:57 -07:00
Richard Alam
0ee45518ef
Merge pull request #631 from fcecagno/fix-lineending
...
Fix line ending of VideoProxy.as
2015-05-06 14:16:32 -04:00
Felipe Cecagno
0d26ca639f
new attempt to fix the line endings
...
this particular file has windows line endings
2015-05-06 15:12:42 -03:00
Felipe Cecagno
c0813c11dd
fixing line ending (again) on VideoProxy
2015-05-06 14:54:33 -03:00
Fred Dixon
4fe6acbd81
Merge pull request #630 from fcecagno/promote-webhooks
...
Promote webhooks
2015-05-06 12:37:02 -04:00
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
perroned
7c6436def6
Added foundation icons package
2015-05-06 09:07:40 -07:00
perroned
c64c6112c2
Removed boostrap leftovers
2015-05-06 09:05:22 -07:00
Maxim Khlobystov
ea8afcaf2a
Re-wrote the desktop UI (makes the userlist separate + other modifications).
2015-05-06 10:52:43 -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
a76ce00fd3
remove bootstrap package
2015-05-05 16:25:18 -07:00
Lucas Zawacki
6b04a86e7e
Prevent slowdown on firefox when deleting lots of shape messages
...
By creating a new collection called WhiteboardCleanStatus which
is used to alert the clients that the server is cleaning shapes.
When shapes are being cleaned they are not drawn and so things don't slow down on firefox or chrome
2015-05-05 18:33:08 -04: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
Maxim Khlobystov
cabaf10283
Moved the navbar from Bootstrap to Foundation.
2015-05-05 10:30:38 -04:00
Maxim Khlobystov
d1f1a89ce5
Added Foundation package.
2015-05-05 09:48:52 -04: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
perroned
8e2ce8c82c
resolve merge conflicts
2015-04-27 09:55:20 -07:00
perroned
c57730ca1e
Fix typo
2015-04-27 08:19:53 -07:00
perroned
c51d4a9633
modularize notification code. Notification helpers. Some redesigned CSS
2015-04-27 08:12:12 -07:00
perroned
489f63d93f
Class for managing notifications
2015-04-27 08:11:35 -07: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
