BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,381 Commits 13 Branches 260 Tags 1.1 GiB
1001cc1ecd
Commit Graph

20381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
1001cc1ecd
Merge pull request #5638 from capilkey/show-individual-votes 
Improve the PollResultsModal spacing and sort
 2018-06-04 19:13:16 -04:00
Chad Pilkey
ca66c177e9 improve PollResultsModal sorting 2018-06-04 16:08:27 -07:00
Chad Pilkey
6f1884ed1c update PollResultsModal spacing and grid header text 2018-06-04 12:37:53 -07:00
Fred Dixon
f0ab539e33
Merge pull request #5633 from riadvice/record-window-position 
Put back recording window under the recording button
 2018-06-04 11:42:50 -04:00
Ghazi Triki
b5a66652ed Put back recording window under the recording button. 2018-06-04 16:02:58 +01:00
Richard Alam
4645c7c920
Merge pull request #5632 from riadvice/chat-scroll 
Fix chat ribbon flickering when a lot of messages are arriving
 2018-06-04 10:44:37 -04:00
Ghazi Triki
a6e239c875 Show new chat messages ribbon only if no scrolling is to be expected. 2018-06-04 15:02:17 +01:00
Fred Dixon
1668b60069
Merge pull request #5628 from capilkey/show-individual-votes 
Add a table showing individual votes in the PollResultsModal
 2018-06-02 08:00:53 -04:00
Chad Pilkey
f7a5f675b6 add a table showing individual votes in the PollResultsModal 2018-06-01 16:06:49 -07:00
Richard Alam
4114dc58dc Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release 2018-06-01 13:15:24 -07:00
Richard Alam
afe236d68d Merge branch 'riadvice-chat-scroll' into v2.0.x-release 2018-06-01 13:14:38 -07:00
Richard Alam
17b66b9b97 Merge branch 'chat-scroll' of https://github.com/riadvice/bigbluebutton into riadvice-chat-scroll 2018-06-01 12:59:00 -07:00
Anton Georgiev
10dc48413d
Merge pull request #5626 from antobinary/configurable-title 
Make window title configurable (part of Branding)
 2018-06-01 15:47:54 -04:00
Anton Georgiev
1b755bfb24 make window title configurable 2018-06-01 18:31:41 +00:00
Fred Dixon
02992e6787
Merge pull request #5611 from KDSBrowne/fix/user-item-menu-items 
Fix User-item menu options not being triggered
 2018-06-01 06:45:28 -04:00
Richard Alam
c4ad9fc134
Merge pull request #5618 from bigbluebutton/ritzalam-bbb-web-dev-port 
Change bbb-web dev port
 2018-05-31 16:55:06 -04:00
Richard Alam
228540d638
Change bbb-web dev port 
Change port so as not to conflict with Kurento
 2018-05-31 16:54:32 -04:00
Anton Georgiev
cd4b8bc6fc
Merge pull request #5573 from gutobenn/disable-screenshare-safari 
Display a toast for screensharing not supported by Safari
 2018-05-31 16:49:09 -04:00
Fred Dixon
b057e1b5f2
Merge pull request #5614 from riadvice/allow-clear-recording-marks 
Added a new option to xml.config to enable/disable clearing recording markers
 2018-05-31 09:19:31 -04:00
Ghazi Triki
024016f527 Added a new option to xml.config to enable/disable clearing recording markers. 2018-05-31 14:16:47 +01:00
Fred Dixon
b9f018eef1
Merge pull request #5613 from ritzalam/revert-toasties 
Revert toasts temporarily
 2018-05-31 08:24:54 -04:00
Richard Alam
9179d4d61c - reverting toasts so we can perform emergency upgrade of red5 through packages 2018-05-30 14:59:37 -07:00
KDSBrowne
87c8917d8b fix user-item menu options not working 2018-05-30 11:20:42 -07:00
Anton Georgiev
e1d88e8817
Merge pull request #5539 from Tainan404/issue-5471 
Disable yes button on echo-test when clicked.
 2018-05-30 12:27:10 -04:00
Richard Alam
0cc8ee5f4e
Merge pull request #5608 from kepstin/bbb-20-rec-fixes 
RaP: Workaround broken seeking in flv after red5 update.
 2018-05-30 11:59:55 -04:00
Ghazi Triki
78681bf9b2 Added new unread message ribbon to chat. 2018-05-30 16:59:10 +01:00
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb 
Whiteboard and Cursor performance update
 2018-05-30 11:42:52 -04:00
Calvin Walton
4554e3eac7 RaP: Workaround broken seeking in flv after red5 update. 
Since the update to the newer red5, seeking in flv files (webcams in
particular are noticable) has been broken, resulting in cameras
appearing to "hang" any time there is a cut in the generated video -
which happens when start/stop button is pushed, or when cameras are
added or removed.

We can detect the problematic video files because the timestamp of the
first frame is large (old red5 versions always set first frame
timestamp to 0.001 seconds). If we see a file like this, having ffmpeg
remux the file - rewriting the timestamps and index - works around the
problem.
 2018-05-30 11:41:45 -04:00
Oswaldo Acauan
0eb4752818 Clean up 2018-05-30 11:19:19 -03:00
Fred Dixon
da77e52d99
Merge pull request #5600 from riadvice/toast-message 
Update toast style
 2018-05-30 06:09:14 -04:00
Ghazi Triki
a589f0142e Remove toaster for recording status change. 2018-05-30 11:04:51 +01:00
Anton Georgiev
f13d37867e
Merge pull request #5601 from BobakOftadeh/ui-userlist-changes 
User list UI changes implemented
 2018-05-29 16:41:20 -04:00
Anton Georgiev
0aa7d5274e
Merge pull request #5595 from lfzawacki/better-video-stability 
[html5] Better video pausing, connection, re-connecting and stability
 2018-05-29 16:40:52 -04:00
Anton Georgiev
e7ef85bdf7
Merge pull request #5507 from KDSBrowne/xx.fix-dropdown-key-functionality-alt01 
Improve userlist dropdown menu key-board functionality
 2018-05-29 15:49:46 -04:00
Bobak Oftadeh
136fa72a7e User list UI changes implemented 2018-05-29 12:23:13 -07:00
Lucas Fialho Zawacki
665773ece0 Small naming fixes in visibility events and attachStream function 2018-05-29 18:54:01 +00:00
Lucas Fialho Zawacki
cb5022681d Catch exceptions on video tag play 2018-05-29 17:51:50 +00:00
Ghazi Triki
391aa3f43f Update toast style. 2018-05-29 16:40:23 +01:00
Richard Alam
07a8466a28
Merge pull request #5596 from riadvice/toast-message 
Toast message into Flash client
 2018-05-29 11:09:25 -04:00
Anton Georgiev
cb7bc71721
Merge pull request #5599 from antobinary/minor-tweak 
Tweak an iOS string for Chrome
 2018-05-29 11:02:51 -04:00
Anton Georgiev
dd719792a1 tweak an iOS string for Chrome 2018-05-29 15:01:36 +00:00
Ghazi Triki
db112d23d8 Added toaster for start and stop recording only for moderator. 2018-05-29 16:00:10 +01:00
KDSBrowne
97b5d4dbc9 remove cx() and its import 2018-05-29 07:48:53 -07:00
Ghazi Triki
2c752ff4cb Deactivate sound and add missing class. 2018-05-29 15:24:15 +01:00
Ghazi Triki
a39081afb3 Use toast notification at some application events. 2018-05-29 11:28:31 +01:00
Ghazi Triki
0fe52111a2 Improve toast display by moving timer to the renderer and adding a display progress bar. 2018-05-29 10:07:55 +01:00
Anton Georgiev
06ad7805a4
Merge pull request #5583 from antobinary/adjust-api 
Revert special api changes made for html5 client
 2018-05-28 17:46:30 -04:00
Anton Georgiev
4be7323f3e
Merge pull request #5584 from BobakOftadeh/iOS-Model-Warning 
Warning modal now displays for iOS Chrome users
 2018-05-28 17:11:06 -04:00
KDSBrowne
4f2541c957 remove condition in cx() 2018-05-28 13:16:37 -07:00
Lucas Fialho Zawacki
32c587dc0d Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into better-video-stability 2018-05-28 18:43:29 +00:00