BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,921 Commits 13 Branches 260 Tags 1.1 GiB
04724c2a24
Commit Graph

156 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
04724c2a24 Removed scrolling in landscape and fixed whiteboard's poitioning 2015-05-06 12:33:15 -07:00
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
Maxim Khlobystov
ea8afcaf2a Re-wrote the desktop UI (makes the userlist separate + other modifications). 2015-05-06 10:52:43 -04: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
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
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
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
Anton Georgiev
ff934cf472 Merge branch 'master' into listen-only-prototype 2015-04-22 14:05:05 +00: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
Anton Georgiev
7171c47656 cleaning up 2015-04-21 21:42:34 +00: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
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
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
perroned
f0f28f2f76 Update method we check call status 2015-04-16 08:56:56 -07:00
Anton Georgiev
4e9481ad63 renaming the autoJoin parameter 2015-04-16 15:39:06 +00:00
perroned
db295311a4 Merge remote-tracking branch 'anton/listen-only-prototype' into hangup-webrtc-call 2015-04-16 07:46:02 -07:00
Anton Georgiev
249e83f347 Merge branch 'hangup-webrtc-call' of github.com:perroned/bigbluebutton into listen-only-prototype 2015-04-16 14:26:32 +00:00
Anton Georgiev
a9e4e7ee1c removed the new indicator for listenOnly 2015-04-16 14:14:42 +00:00
Anton Georgiev
53a5df593d update the ionicon ttf and woff 2015-04-16 13:51:59 +00:00
perroned
30b39fcc26 sync formatting level 2015-04-16 06:48:46 -07:00
perroned
eb2c5fc456 Prevent controls from moving around while clicking 2015-04-16 06:41:53 -07:00
Anton Georgiev
de6a312cb5 remove the labels for Participants, Presentation, Chat 2015-04-15 21:21:44 +00:00
Anton Georgiev
b650bd2381 changing the presentation icon to easel 2015-04-15 20:41:23 +00:00
perroned
59b02e3b2f Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 2015-04-15 05:49:32 -07:00
perroned
7e4fbc220e Comments for hangup retry 2015-04-15 05:48:16 -07:00
perroned
99f3b1d55d Beginning work on cancelling a call in progress 2015-04-15 05:02:39 -07:00
perroned
934d36ee8a adding the actual check on startup 2015-04-14 09:25:53 -07:00
perroned
321ba43850 Ability to autojoin listen only on startup 2015-04-14 09:05:32 -07:00
perroned
6dd0e13632 Added UI for listen only, cleaned up code, added new API methods 2015-04-14 06:34:41 -07:00
Maxim Khlobystov
d6383efa74 Added some comments. 2015-04-13 17:26:01 -07:00
Maxim Khlobystov
013ede36be Fixed the bug with a huge cursor appearing on first load. 2015-04-13 17:20:46 -07:00