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
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
Fred Dixon
1b4ede0028
Update bbb-conf
2015-04-15 21:49:19 -04: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
Felipe Cecagno
7ad689cc33
Merge pull request #610 from bigbluebutton/make-moderator-presenter
...
Make moderator presenter
2015-04-15 12:24:27 -03:00
Fred Dixon
55e533dc72
Merge pull request #613 from ffdixon/getting-ready-for-RC
...
Updating strings for 0.9.0-RC
2015-04-15 11:21:59 -04:00
Fred Dixon
8a27d4496c
Updating strings for 0.9.0-RC
2015-04-15 11:20:01 -04: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
Fred Dixon
dffe88d415
Merge pull request #612 from bigbluebutton/ffdixon-patch-2
...
Update bbb-conf
2015-04-14 22:13:10 -04:00
Fred Dixon
ad88aa6087
Update bbb-conf
...
Removed hard-coded links to google code docs (Google Code is going away).
2015-04-14 22:12:59 -04:00
Richard Alam
030026a396
Merge pull request #611 from kepstin/recording-clear
...
Recording clear
2015-04-14 17:38:31 -04:00
Calvin Walton
301665a35b
Fix off-by-one error in slide clear events
...
In 0.9.0, the slide clear events changed from using 1-based page numbers to
using 0-based page numbers.
Add 1 to the page number for recordings generated on a 0.9.0+ server to
fix the issue; at this point it's too late in the release to change the value,
and there's too big of a body of existing recordings out there.
2015-04-14 17:33:49 -04:00
Calvin Walton
c96f9f0cfe
Add a function to compare BBB version numbers
...
This can be used to check if e.g. recording is from a 0.9.0 or newer server
2015-04-14 17:33:49 -04: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
Richard Alam
933b9d04ef
- make a moderator presenter when the current presenter leaves (e.g. disconnected). This way, as long as
...
there is a moderator in the meeting, there will always be a presenter.
2015-04-14 14:40:24 +00:00
