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

3102 Commits

Author SHA1 Message Date
Felipe Cecagno
90e3e2779f Merge branch 'master' into multicamera-0.81 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2013-10-11 11:57:12 -03: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
Gustavo Salazar
8b18f4915f update italian translation strings 
0.8 is the default version set for all the "locales", with the value 0.81 it fails while loading the client in the browser. I also changed it in Transifex.
 2013-10-08 16:39:22 -05:00
Richard Alam
ba2e924e32 - stop propagation of click event to prevent webcam window from resizing. 
fix: https://code.google.com/p/bigbluebutton/issues/detail?id=1642
 2013-10-08 19:54:30 +00:00
Richard Alam
8d703cebd5 - remove tracking of how many unread private tabs a user has as we don't really need that level of detail 
- fix: https://code.google.com/p/bigbluebutton/issues/detail?id=1640
 2013-10-08 19:05:03 +00:00
Richard Alam
3b00657b9d - fix issue where viewer stop sharing webcam when switching presenter 
https://code.google.com/p/bigbluebutton/issues/detail?id=1641
 2013-10-08 18:22:08 +00:00
Felipe Cecagno
6c4e2bf329 Merge commit 'a84c6ca8e8001605fc684700377dad2776b79224' into multicamera-0.81 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2013-10-04 14:38:48 -03:00
Felipe Cecagno
38f477ab2e Merge commit '6b954488659201f4e10524fcb6edb46875bf377e' into multicamera-0.81 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2013-10-04 13:50:07 -03:00
Gustavo Salazar
d673e6e484 update locales 2013-10-02 12:12:40 -07:00
Richard Alam
597c64e808 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-09-24 15:39:40 +00:00
Richard Alam
aa018fcb21 - use default resolution from config.xml when skipping webcam settings check 2013-09-24 15:38:52 +00:00
Fred Dixon
d9bfdaeb73 Merge pull request #262 from gugat/locales08 
Update locales
 2013-09-23 14:47:07 -07:00
Gustavo
d8e1bce801 Update locales 2013-09-23 20:46:29 +00:00
Richard Alam
b1ae469c8a - skip check for cam setting even when starting sharing manually 2013-09-23 19:22:34 +00:00
Richard Alam
c1d30dc72b - add config param to skip camera settings check 2013-09-23 15:24:07 +00:00
Richard Alam
252d7129a7 - fix race condition where video share button doesn't show up somtimes when presenterShareOnly=true 2013-09-19 17:27:30 +00:00
Richard Alam
fc4382d626 - fix problem where no one can share when presenterShareOnly is set to TRUE 2013-09-16 21:27:47 +00:00
Chad Pilkey
dfe2bfd6de removed the colour change from the chat item renderer and improved the layout when there's a long name 2013-09-09 14:27:10 -07:00
Chad Pilkey
dfc444ab6f added two strings in the log out window to locales 2013-09-04 15:01:23 -07:00
Richard Alam
d514465e3b Merge pull request #246 from bigbluebutton/fix-logout-url-call 
Logout URL was never called when API signOut call fail.
 2013-09-04 08:26:26 -07:00
Chad Pilkey
e8ef9f3b1a added check to make sure tabs exist 2013-09-03 15:34:45 -07:00
Chad Pilkey
6ab6ec3ec3 the Public and Option chat tabs now match the selected locale at all times 2013-09-03 15:24:52 -07:00
Gustavo Salazar
2007d6d7bb delete transifex dir in locales 2013-09-02 13:59:36 -05:00
jent46
8561c02d18 update locales 2013-09-02 10:44:52 -07:00
Tiago Daniel Jacobs
3d9cd8b63d Logout URL was never called when API signOut call fail. 2013-08-30 21:17:44 -03:00
Chad Pilkey
2d8b797d72 Merge pull request #241 from mconf/language-button-usability 
Fixed the style of the language selector
 2013-08-30 14:41:20 -07:00
Felipe Cecagno
5d1e6db4d0 Merge branch 'master' into language-button-usability 2013-08-29 16:03:50 -03:00
Felipe Cecagno
5c8d19ca8f the user private chat selector was still using the hardcoded "you" instead of using the localized string of the users module, I just applied the same string here 2013-08-29 15:56:51 -03:00
Felipe Cecagno
ccb29c30eb setting up the language selector style; fixed identation 2013-08-29 14:51:31 -03:00
Felipe Cecagno
412384745f Merge branch 'master' into language-button-usability-0.81 2013-08-25 23:34:30 -03:00
Felipe Cecagno
46b9b93128 fix the bug that incorrectly enable the camera button next to the user name when the user closed the publish window; this is a bugfix only valid for the multicamera scenario 2013-08-25 23:21:20 -03:00
Felipe Cecagno
5537f4d35c Merge branch 'master' into multicamera-0.81 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
 2013-08-25 11:54:30 -03:00
Chad Pilkey
ce7040f52d added enableHandRaise and enableSettingsButton as config.xml options for the Users Window 2013-08-23 15:36:49 -07:00
Chad Pilkey
3d378ffec1 Merge pull request #230 from speakserve/flex-client-updates 
LoadingBar properties binding replaced by fixed values.
 2013-08-23 09:08:50 -07:00
Chad Pilkey
695ece39c4 Merge pull request #234 from mconf/fix-accessibilityProperties-0.81 
Fixed chatBox AccessibilityProperties that was seted before being initia...
 2013-08-23 06:59:20 -07:00
Hugo Lazzari
b9068b9137 Add test to check if variable is null 2013-08-23 08:45:39 -03:00
Chad Pilkey
89cbf9bdf4 Merge pull request #236 from jent46/master 
update translation
 2013-08-22 12:47:07 -07:00
Chad Pilkey
9f79d5ae31 Merge pull request #235 from mconf/resolution-combo-style 
Fixed the style of the video resolution combobox
 2013-08-22 12:46:11 -07:00
jent46}
99667ce98d Merge remote-tracking branch 'upstream/master' 2013-08-20 16:36:50 -05:00
jent46}
6d8d8962e5 update languages (fr_FR,he_IL,id_ID,vi_VN) 2013-08-20 16:34:42 -05:00
Chad Pilkey
61a6298f80 changed the branding build directory from bin to client 2013-08-20 12:35:13 -07:00
Felipe Cecagno
cd02ad5c79 fixed the style of the video resolution combobox 2013-08-20 14:07:38 -03:00
Chad Pilkey
c88b888ae3 enable the logout confirmation again 2013-08-19 14:58:25 -07:00
Chad Pilkey
ea02ae16f2 Merge remote branch 'upstream/master' into skin-logout-confirm 2013-08-19 14:57:46 -07:00
Chad Pilkey
2d68393cdd moved the confirmation box down a little 2013-08-19 14:56:58 -07:00
Chad Pilkey
238544e495 moved the client title prefix to javascript for easier modification 2013-08-19 07:28:33 -07:00
Chad Pilkey
d935d8e15e repositioned the logout confirm alert 2013-08-19 06:39:27 -07:00
Fred Dixon
1c50f1cff2 Disable logout window for the moment as its pending UI updates (changed correct parameter :-) 2013-08-16 15:38:41 -07:00
Fred Dixon
d5099639ef Disable logout window for the moment as its pending UI updates 2013-08-16 15:11:45 -07:00