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

6789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesus Federico
a4987f84b8 Update index.html 
bigbluebutton-config: Fixed typo error on "Google Plus" logo
 2013-10-18 15:45:10 -04:00
Richard Alam
03bb5bba8f Merge pull request #275 from kepstin/corrupt-audio-fix 
Skip corrupt/empty audio files when processing recording.
 2013-10-18 12:40:29 -07:00
Richard Alam
24809481a6 - addd necessary manifest attributes to fix java security dialog popups 2013-10-18 19:24:11 +00:00
Richard Alam
a64dd3736c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-10-18 19:19:08 +00:00
Richard Alam
6e5fa16f96 - fix problem where java security dialog pops up due to java 7 update 45 
https://code.google.com/p/bigbluebutton/issues/detail?id=1658
 2013-10-18 19:16:52 +00:00
Jesus Federico
1436d074bc Update ToolController.groovy 
bbb-lti: Changed the main tool title shown by the lti cartridge
 2013-10-18 15:14:11 -04:00
Calvin Walton
de0bac6f76 Skip corrupt/empty audio files when processing recording. 
Now when an empty/corrupt audio file is detected, it will be replaced
with silence.
 2013-10-18 11:39:03 -04:00
Richard Alam
c57dc161a8 Merge branch 'new-polling-feature' into refactor-voice-users 2013-10-17 21:28:54 +00:00
Richard Alam
355f13dab4 Merge branch 'new-polling-feature' of github.com:bigbluebutton/bigbluebutton into new-polling-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2013-10-17 21:26:36 +00:00
Richard Alam
87870cca2c Merge branch 'new-polling-feature' of github.com:bigbluebutton/bigbluebutton into refactor-voice-users 2013-10-17 21:10:12 +00:00
Richard Alam
0541c40d28 Merge branch 'master' into refactor-voice-users 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2013-10-17 21:08:57 +00:00
Richard Alam
e54f942d5a - continue refactoring voice app 2013-10-17 20:47:53 +00:00
Richard Alam
d62af354d4 - align logout confirm alert with logout button. Currently it relies on the lang selector to 
figure out the window's x coordinate. However, when the shortcut and help button is hidden, the
lang selector moves to the right so the logout alert window overflows the browser to the right.
 2013-10-17 13:37:59 -07:00
Richard Alam
f63c4f3367 - fix brodcast module where users won't be able to play video when presenter has started 
broadcasting before the late users joined
 2013-10-17 12:26:22 -07:00
Richard Alam
9f8163d9b2 - localize poll toolbar button 2013-10-17 12:24:26 -07:00
Richard Alam
4ecced0723 Fixed broadcast module not showing for clients, multiple windows opening for presenter and stream not playing if joining once the stream was started 2013-10-17 11:49:40 -07:00
Richard Alam
2e44fa1313 - handle voice user messages 2013-10-16 22:02:38 +00:00
Richard Alam
025454ebbe - get unlocked users 2013-10-16 21:25:53 +00:00
Richard Alam
00b8ed2206 - add tests for users 2013-10-16 18:28:43 +00:00
Richard Alam
5f3aaee6c8 - clean up 2013-10-15 21:53:21 +00:00
Richard Alam
c55291b98d - add some tests 2013-10-15 21:37:06 +00:00
Richard Alam
57e823b759 - make it compile 2013-10-15 19:04:45 +00:00
Richard Alam
a6759a8171 - Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1653 2013-10-15 14:51:02 +00:00
Richard Alam
bd05827fc4 - Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1646 2013-10-15 14:50:30 +00:00
Richard Alam
a5e12b8315 - fix Issue https://code.google.com/p/bigbluebutton/issues/detail?id=1652 2013-10-15 14:49:22 +00:00
Guilherme Augusto Dias
129e942d16 Add recording length information to metadata file 
Add a tag containing the duration of the recording to metadata file
 2013-10-15 14:29:49 +00:00
Richard Alam
12a4df7dcf Merge branch 'master' into refactor-voice-users 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2013-10-11 20:58:35 +00:00
Felipe Cecagno
bafa7531d7 updating the icon set (webcam, deskshare, microphone and record control) - same base icons, new "check" and "x" layers 2013-10-11 13:53:36 -03:00
Richard Alam
83b1c209b4 Merge branch 'master' into speakserve-remove-spacers 2013-10-11 16:11:12 +00:00
Richard Alam
7811de5f8a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-10-11 16:10:58 +00:00
Richard Alam
c7565f3ac1 Merge branch 'remove-spacers' of github.com:speakserve/bigbluebutton into speakserve-remove-spacers 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
 2013-10-11 16:10:32 +00:00
Richard Alam
9677f8032a Merge pull request #271 from sokie/master 
Fixed broadcast module issue #1639
 2013-10-11 09:03:30 -07:00
Richard Alam
c68adeba87 Merge pull request #253 from speakserve/fix-users-settings-menu 
User settings menu repositioned
 2013-10-11 09:02:36 -07:00
Richard Alam
d1ee41a465 Merge branch 'mconf-fixing-scrollbars' 2013-10-11 15:56:18 +00:00
Richard Alam
dc8e1b6327 Merge pull request #274 from kepstin/rap-skip-corrupt-video 
Check for corrupt video files, don't attempt to render them
 2013-10-11 08:54:40 -07:00
Richard Alam
df8e49f4af - when width of client is less than 800, hide the meeting name, shourtcut, and locale buttons. 2013-10-11 15:53:51 +00:00
Calvin Walton
8facc0899e Check for corrupt video files, don't attempt to render them 
A corrupt video file is defined as one where ffprobe either finds no
video stream, or it finds a video stream but cannot read any frames.
 2013-10-11 11:19:40 -04:00
Felipe Cecagno
d4a7bea99b handled the scrollbars that appear if you have a small screen and a (not so) long copyright message 2013-10-11 11:32:30 -03:00
Felipe Cecagno
c350b6ceac fix issue http://code.google.com/p/bigbluebutton/issues/detail?id=1609 
related to exceptions when you try to log out of the session
 2013-10-11 11:16:00 -03:00
Richard Alam
d0e006d8c4 - continue making change 2013-10-10 15:25:06 +00:00
Guilherme Augusto Dias
dcabfc46fa Cut off unwanted slide events 
Ignore slide events that happened after the last stop recording timestamp
 2013-10-10 13:53:32 +00:00
Guilherme Augusto Dias
0d1c64f3ae Show thumbnail timestamp 
The timestamp of first thumbnail is shown when the presentation starts.
 2013-10-10 13:06:38 +00:00
Richard Alam
626406c760 - renaming a bunch of stuff 2013-10-09 22:03:00 +00:00
Richard Alam
3cf7a53631 Merge pull request #272 from gugat/locales 
update locales and add welsh
 2013-10-09 14:28:32 -07:00
Gustavo
0f041c248c show Welsh in the client interface 2013-10-09 20:29:50 +00:00
Gustavo
805f93ec54 update locales and add welsh 2013-10-09 20:18:43 +00:00
Richard Alam
7c12cf47aa - voice refactoring is compiling successfully 2013-10-09 19:54:27 +00:00
Guilherme Augusto Dias
67fee3bff5 Correct clear/undo timestamp translation 
Postpone the translation of timestamp for clear/undo events, so the events are applied correctly.
 2013-10-09 19:51:46 +00:00
Fred Dixon
381ddbf3a9 Updated labels for 0.81-RC3 2013-10-09 14:05:55 -04:00
Richard Alam
69feca2a07 - continue making changes to voice app 2013-10-08 21:47:49 +00:00