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

6403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
ca97a5eec5 implemented the new set of icons for the record button 2014-01-16 11:38:12 -02:00
Felipe Cecagno
d12c7f3091 reverting back the previous icons for webcam, headset and deskshare 2014-01-16 11:37:43 -02:00
Felipe Cecagno
3070127a8e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
 2014-01-15 17:53:10 -02:00
Tiago Daniel Jacobs
0679568656 Fixed copyright string in pt_BR 2014-01-14 23:51:44 -02:00
Felipe Cecagno
98f1d51461 fixing the handling of multiple drawings from a single shape 
bug could be easily reproduced typing text, erase part of it and then type again
 2014-01-14 18:17:39 -02:00
Felipe Cecagno
3440ed0fe3 Merge branch 'v0.81' into record-button 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-01-14 14:05:41 -02:00
Richard Alam
2f36afc6cf Merge pull request #300 from BBBManager/bbb-issue-1656 
Fix for issue #1656
 2014-01-13 11:45:22 -08:00
Richard Alam
f45ea4a987 Merge pull request #299 from bigbluebutton/bbb-lock-settings 
Implemented lock settings in bbb-client and bbb-apps.
 2014-01-13 11:45:02 -08:00
Tiago Daniel Jacobs
5c054becdc Fix for issue #1656 2014-01-09 17:04:46 -02:00
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
Fred Dixon
2709fbd34b Merge pull request #294 from fmarier/master 
Fix Persona URLs
 2013-12-05 12:28:49 -08:00
Felipe Cecagno
dab7547014 added a check on presentation publish script to avoid the duplication of thumbnails for a given slide 2013-12-02 15:23:02 -02:00
Felipe Cecagno
955f9edc99 fixing the issue of the whiteboard annotations not being shown in the proper slide; cleaning the environment (events.xml, recorded flag) when the session was recorded but the record button wasn't used 2013-12-02 13:57:05 -02:00
Francois Marier
dbb5a81c11 Fix Persona URLs 
The old browserid.org URLs are deprecated and will stop working at some point.
 2013-11-11 19:40:57 -08:00
Fred Dixon
6e3985d202 Minor update to bbb-conf 2013-11-08 16:07:56 -05:00
Fred Dixon
0d50884e08 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-11-07 20:08:48 -05:00
Fred Dixon
b12188fbed Changing lables for 0.81 2013-11-07 20:08:36 -05:00
Guilherme Augusto Dias
40a395ee6b Merge branch 'record-button' of github.com:mconf/bigbluebutton into record-button 2013-11-06 18:20:36 +00:00
Guilherme Augusto Dias
1d421f2d4a Retrieve duration 
BBB Web retrieves playback length from metadata.xml when it is available, otherwise playback length is calculated with start/stop meeting timestamps.
 2013-11-06 18:13:43 +00:00
Richard Alam
a58120f322 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1680 2013-11-05 18:28:12 +00:00
Fred Dixon
d5d502e4e4 minor bug fix in old stress testing script 2013-11-05 07:44:53 -05:00
Richard Alam
329d2b9af1 Merge pull request #291 from SenecaCDOT-BigBlueButton/add-another-string 
created a new locale string for the chat module
 2013-10-31 17:44:00 -07:00
Chad Pilkey
336c8f72f3 created a new locale string for the chat module 2013-10-31 16:27:14 -07:00
Richard Alam
032f10beaa Merge pull request #290 from kepstin/presentation-missing-slide 
Last-ditch fix for missing presentation images
 2013-10-31 14:01:56 -07:00
Calvin Walton
1d488e3c56 Last-ditch fix for missing presentation images 
We can only get here if all of the files for the presentation are
*completely* missing. One thing that can cause this is if the
presentation filename starts with a '.' character - the presentation
files aren't correctly archived then.
 2013-10-31 18:56:09 -02:00
Fred Dixon
149ea185f2 Updating version to 0.81-RC5 2013-10-30 14:47:16 -07:00
Fred Dixon
c32e60f2d7 Merge pull request #287 from gugat/update_locales 
update locales
 2013-10-30 13:56:42 -07:00
Gustavo
9e61cc334a update locales 2013-10-30 20:53:29 +00:00
Richard Alam
a961161605 - sign with new certificate that expires in 2014 2013-10-30 12:40:08 -07:00
Richard Alam
e838eff936 Merge pull request #283 from SenecaCDOT-BigBlueButton/fix-annotation-scaling 
fixed the annotation drawing so that the line thickness scales when you ...
 2013-10-29 10:30:29 -07:00
Chad Pilkey
f77d795084 fixed the annotation drawing so that the line thickness scales when you zoom a presentation 2013-10-29 08:24:55 -07:00
Richard Alam
e220f120cc Merge pull request #280 from kepstin/firefox-audio-seek 
Switch the order of the audio formats on firefox playback
 2013-10-23 13:59:49 -07:00
Calvin Walton
4a45b3610b Switch the order of the audio formats on firefox playback 
Firefox has a bug where it can't seek in the audio-only webm files with
no cues, and it seems like they have no intention of fixing this...
Serve up the ogg files first for them.

Adding cues to audio-only webm files is *hard*, there are no standard
tools that support doing this cleanly.
 2013-10-23 16:35:21 -04:00
Richard Alam
a141928824 - Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1671 
Remove the beginning . (dot) from uploaded presentation.
 2013-10-23 16:21:49 +00:00
Richard Alam
f17d0d1b8b Merge pull request #279 from kepstin/recording-syntax-fix 
Fix a logger method call in presentation script
 2013-10-23 07:05:40 -07:00
Calvin Walton
e6fe43f9b6 Fix a logger method call in presentation script 
This shouldn't normally be hit... but if it ever is, the processing will
fail with an error, since the Logger class doesn't have a method named
'warning'.
 2013-10-23 10:01:02 -04:00
Richard Alam
49bf86d5aa Merge pull request #276 from SenecaCDOT-BigBlueButton/fix-switch-racecondition 
fixed bug 1661, the tool now switches to pan/zoom when a new presentation is loaded
 2013-10-22 14:31:37 -07:00
Richard Alam
dc8a603e41 Merge pull request #278 from speakserve/fix-deskshare-kickedout 
Fixed issue when current user is kicked out and he is sharing his screen...
 2013-10-22 14:28:50 -07:00
Richard Alam
e56a868c0e - update client with deskshare applet with latest fixes 2013-10-22 21:11:11 +00:00
Richard Alam
43588ab8a4 - when region is resized, take the capture region to init the shared region 2013-10-22 21:10:00 +00:00
Chad Pilkey
ccc828c76b the whiteboard toolbar is now disabled as soon as the client is notified of a new presentation. it better work for real this time 2013-10-22 14:03:06 -07:00
Richard Alam
2f0af49f40 - update blocks by row instead of by block to speed up updates in eyes of user 2013-10-22 20:11:46 +00:00
Richard Alam
2e9aa55756 - fix bug where requesting to send a key frame fails to get the correct stream name 2013-10-22 19:55:39 +00:00
Chad Pilkey
cf12fe382b Merge remote branch 'upstream/master' into fix-switch-racecondition 2013-10-22 11:43:52 -07:00
Richard Alam
336a6b3c6e - apply smoothing on deskstop sharing video 2013-10-22 16:22:49 +00:00
Ghazi Triki
658afcb45b Fixed issue when current user is kicked out and he is sharing his screen. 2013-10-22 17:15:07 +01:00
Richard Alam
c09636ea4a - handle parameter scale = 1 to do pixel for pixel display when sharing fullscreen 2013-10-22 15:08:11 +00:00
Fred Dixon
d041ebfcde Merge pull request #277 from SenecaCDOT-BigBlueButton/fix-javacheck-highlight 
remove the blue background from the Java Test linkbutton
 2013-10-21 17:06:10 -07:00
Chad Pilkey
6ffb35428c remove the blue background from the Java Test linkbutton 2013-10-21 16:22:07 -07:00
Richard Alam
c4855876c3 - change test java link 2013-10-21 21:50:38 +00:00