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

10644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
6dbf18c2e5 cleanup 2015-09-03 15:22:54 -03:00
Felipe Cecagno
3c4055ec01 removed extra add_circle_outline icon from previous commit (use css style instead) 2015-09-03 15:16:16 -03:00
RafaFP
b71e9e9545 User can now set a name to the custom layouts he creates. If the name is left empty, the default name is given as it was before (Custom Layout #). 
#ref 1733
 2015-08-14 21:13:32 +00:00
Felipe Cecagno
210cd92e50 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-config/web/index.html
 2015-07-27 16:58:55 -03:00
Felipe Cecagno
e3f2df289b new deskshare applet signed by RNP, with Mconf logo 2015-07-27 16:26:13 -03:00
Felipe Cecagno
89b44cef06 refactored a bit the behavior of the audio ToolbarButton, so creationComplete and click uses the same code 2015-07-27 16:23:43 -03:00
Felipe Cecagno
5782741d29 fixed the way we load the background, so if the crossdomain file is defined, we can smooth the image, otherwise we show the image anyway (Bitmap vs. Image); fixed the calculation we do to resize the background image 2015-07-27 11:26:58 -03:00
Felipe Cecagno
4a8c2ccc05 updated the translations of es_LA from transifex 2015-07-23 23:40:05 -03:00
Felipe Cecagno
880befcba7 fix untranslated string to pt_BR 2015-07-22 11:35:11 -03:00
Felipe Cecagno
0015dc2c6f updated es_LA translation from transifex 2015-07-22 11:34:59 -03:00
Felipe Cecagno
24be80a3eb fixed the bug which disallow users to enable microphone when the server is configured as forceListenOnly=true 2015-07-22 11:12:48 -03:00
Felipe Cecagno
3e567f4493 Merge branch '090-encrypted-recording' into mconf-live0.7.0 2015-07-18 10:47:59 -03:00
Felipe Cecagno
31a67490d2 changed permissions over mconf-recording-decrypter, so we can run it 2015-07-18 10:37:10 -03:00
Felipe Cecagno
5e326b7528 do not create a copy of the raw data to create the mconf_encrypted format, just use the data from the raw dir directly 2015-07-04 17:02:50 -03:00
Felipe Cecagno
6929b4817e fix the condition for mconf-decrypter job to process an encrypted recording 
because of the wrong condition, mconf-decrypter was reprocessing all the recordings available
 2015-07-04 17:02:03 -03:00
Fred Dixon
18aee902ee bumping version number of index.html 2015-06-24 11:00:29 -04:00
Fred Dixon
e72d3e6836 Bumped from 0.9.0 to 0.9.1 to fix #1953 2015-06-24 10:58:11 -04:00
Fred Dixon
9c64671fc9 Merge branch 'v0.9.0-release' of https://github.com/bigbluebutton/bigbluebutton into v0.9.0-release 2015-06-24 10:41:20 -04:00
Mateus Bisotto
db72bacfee Revert "-adicionada pagina para auto-create com layout" 
This reverts commit 0f7a44a23e.
 2015-06-22 12:43:01 -07:00
Mateus Bisotto
0f7a44a23e -adicionada pagina para auto-create com layout 2015-06-22 12:29:56 -07:00
Richard Alam
9fba1a2120 Merge pull request #658 from ritzalam/fix-issue-1953 
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953
 2015-06-17 15:24:47 -04:00
Richard Alam
2a93dbf4a7 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953 2015-06-17 15:59:27 +00:00
Felipe Cecagno
9ef6434ef7 Merge branch 'webrtc-reconnect' into mconf-live0.6.3 2015-06-01 23:01:50 -03:00
Felipe Cecagno
65323b93f6 fixed pt_BR translation 2015-06-01 23:01:36 -03:00
Felipe Cecagno
a819933ebf Merge branch 'webrtc-reconnect' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2015-06-01 22:48:23 -03:00
Felipe Cecagno
cd37bf184d reuse the muted state before the reconnection of webrtc 2015-06-01 22:43:44 -03:00
Felipe Cecagno
ddfbd0b138 Merge branch 'webrtc-reconnect' into v0.9.0-release 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2015-06-01 22:43:10 -03:00
Felipe Cecagno
f498515fb0 set camera name to "Unknown Device" when chrome doesn't allow to retrieve the real name; disable the popup button when there's no camera available 2015-06-01 21:43:33 -03:00
Felipe Cecagno
9857f8d53b improve the dimensions of the deskshare publish window 2015-06-01 14:45:40 -03:00
Felipe Cecagno
2e7e968dd1 Merge branch 'improved-firefox-hint' into mconf-live0.6.3 2015-06-01 14:15:00 -03:00
Felipe Cecagno
e17c212cfb increase the contrast between the modal with the firefox hint for request for media and the rest of the UI 2015-06-01 14:14:30 -03:00
Felipe Cecagno
a1fdf5bba8 new window to help users to share microphone while setting up the webrtc connection on firefox 2015-05-27 17:54:13 -03:00
Felipe Cecagno
43ec219a51 Merge branch 'bbb-conf-api-mate' into mconf-live0.6.3 2015-05-26 21:55:41 -03:00
Felipe Cecagno
13d7809a8d added a link to the api mate when type bbb-conf --salt 2015-05-26 21:55:26 -03:00
Felipe Cecagno
a4993bbeb1 Merge branch 'welcome-server-url' into mconf-live0.6.3 2015-05-26 21:15:14 -03:00
Felipe Cecagno
91a342c816 process keyword %%SERVERURL%% and replace it by the server URL, same value configured on bigbluebutton.properties 2015-05-26 21:14:57 -03:00
Felipe Cecagno
51c5e60d49 improved the client check 
- using localization resources for the names defined on config.xml
- green background on succeeded tests
- "Succeeded" string as result of succeeded tests
 2015-05-26 17:58:02 -03:00
Felipe Cecagno
cad68ba530 make client check compatible with v0.9.0-release 2015-05-26 17:03:33 -03:00
Felipe Cecagno
b2dd51a384 Merge branch '090-download-presentation' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
 2015-05-25 12:14:00 -03:00
Felipe Cecagno
e9f4836815 fixed the positioning of ui elements in the file upload window 2015-05-25 12:13:23 -03:00
Felipe Cecagno
034cccda1e Merge branch 'fix-layout-module' into mconf-live0.6.3 2015-05-24 20:07:52 -03:00
Felipe Cecagno
6e13383689 updated default layouts definition 2015-05-24 20:07:18 -03:00
Felipe Cecagno
17825ed6e5 fixed the multiple remote mark on the layouts list; fixed the way new layouts are added to the list 2015-05-24 20:06:00 -03:00
Felipe Cecagno
810fe4b176 when the layout is switched and the new layout is on the combo list, use the label previously assigned to it 2015-05-24 19:57:30 -03:00
Felipe Cecagno
673d4d3316 changed the way layouts are applied to windows, attempting to fix the application of the remote layout when the user first joins 2015-05-24 19:12:10 -03:00
Felipe Cecagno
c072bbd410 Merge branch 'webrtc-timeout' into mconf-live0.6.3 2015-05-21 12:54:58 -03:00
Felipe Cecagno
aca0db14e3 reduced the ice gathering timeout to 3 seconds instead of 5 2015-05-21 12:54:50 -03:00
Fred Dixon
f8825d6a5f Merge branch 'v0.9.0-release' of https://github.com/bigbluebutton/bigbluebutton into v0.9.0-release 
Conflicts:
	bigbluebutton-config/web/index.html
 2015-05-20 06:14:28 -04:00
Felipe Cecagno
6d7c4b5d6e Merge branch '090-encrypted-recording' into mconf-live0.6.3 2015-05-19 00:03:19 -03:00
Felipe Cecagno
f9ef1b4edd replaced the way we download the encrypted file in the recording server - wget uses much less memory than the previous method 2015-05-19 00:03:08 -03:00