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

228 Commits

Author SHA1 Message Date
Alan Dias
e1dfd6d440 Merge branch '081-fullscreen' into 090-fullscreen 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-01 12:36:36 -03:00
Mateus Dalepiane
f5703f64bb Port change user role to bbb 0.9.0 
Merge branch 'changeRole-0.81' into 090-change-role

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LockButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/business/ListenersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/business/UsersProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ControlButtons.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/BigBlueButtonFilters.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
 2014-09-25 17:59:45 -03:00
Mateus Dalepiane
ba020a8e52 Merge branch '081-network-monitor' into 090-network-monitor 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-09-12 12:02:51 -03:00
Richard Alam
6ca675fd83 - update locales 2014-09-11 12:16:08 -07:00
Mateus Dalepiane
6bf36d2d86 Merge branch '081-java-detection' into 090-java-detection 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java
 2014-09-08 15:06:50 -03:00
Mateus Dalepiane
77c6bbf500 Merge branch '090-new-videodock' into mconf-live0.6.1 2014-09-03 16:39:03 -03:00
Richard Alam
0d3e23db21 - update locales 2014-09-02 12:01:20 -07:00
Mateus Dalepiane
cbb4a167bb Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
 2014-08-26 17:20:00 -03:00
Richard Alam
4cb7faaa49 - update localization 2014-08-24 11:02:00 -07:00
Felipe Cecagno
b4a7a9d317 localizing the modifications on the shared notes for en_US and pt_BR 2014-08-18 13:12:44 -03:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Henrique Valcanaia
ffe016bf8c Save/copy chat 2014-07-08 18:07:27 +00:00
Felipe Cecagno
c3c56a6355 few improvements on the camera messages; cleanup and refactoring of the new video dock implementation; extracted many hardcoded branding information to the branding file 2014-06-11 17:01:45 -03:00
Felipe Cecagno
738162fd5f trying to improve the Java detection using Java Deployment Toolkit Script (http://docs.oracle.com/javase/6/docs/technotes/guides/jweb/deployment_advice.html#deplToolkit); few modifications on DesksharePublishWindow to make it more straightforward 2014-05-16 21:00:18 -03:00
Felipe Cecagno
9a617db14e implemented the entire interactive full screen 2014-05-15 20:41:41 -03:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00
Felipe Cecagno
417b518c2b Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-02-24 12:37:35 -03:00
Richard Alam
ac111de364 Merge remote branch 'bbb/v0.81-javau51-update' into merge-java-7u51-branch 2014-02-19 20:09:56 +00:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
Richard Alam
1430eff18d - update locales to show java7u51 2014-02-06 16:53:26 -05: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
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
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
Felipe Cecagno
014c8e8d11 Merge commit 'v0.81rc5' into changeRole-0.81 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2013-11-07 13:19:51 -02:00
Felipe Cecagno
c534d1fde8 reverted back the majority part of the UsersWindow implementation regarding the change role feature; now we change the role using a new settings button next to the user's name 2013-11-06 12:53:22 -02:00
Gustavo
9e61cc334a update locales 2013-10-30 20:53:29 +00:00
Gustavo
805f93ec54 update locales and add welsh 2013-10-09 20:18:43 +00:00
Felipe Cecagno
b296026266 Merge branch 'master' into changeRole-0.81 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2013-10-08 11:11:34 -03:00
Felipe Cecagno
bb548a8aa7 fixed the localized strings; cleaned up the implementation; fixed the indentation 2013-10-03 23:48:56 -03:00
Felipe Cecagno
aa597fe985 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button-client 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	record-and-playback/core/lib/recordandplayback.rb
	record-and-playback/core/lib/recordandplayback/generators/audio_processor.rb
	record-and-playback/core/lib/recordandplayback/generators/events.rb
	record-and-playback/core/lib/recordandplayback/generators/video.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2013-09-24 15:03:44 -03:00
Felipe Cecagno
33d98bbff2 implemented the record button both client-side and server-side; still needs more work on the processing scripts; still needs to update the record button icons 2013-09-23 18:33:30 -03:00
Gustavo
d8e1bce801 Update locales 2013-09-23 20:46:29 +00:00
Felipe Cecagno
9bfb5d236a better handling the settings window; now the window is only created when the user clicks on the button, so it won't be shown anymore for non-moderator participants 2013-09-15 19:07:36 -03:00
Felipe Cecagno
bf72d1326c Merge branch 'network-stats' into network-monitor-0.81 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/common/assets/images/bandwidth.png
	bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
	bigbluebutton-client/src/org/bigbluebutton/main/events/NetworkStatsEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
	bigbluebutton-client/src/org/red5/flash/bwcheck/ClientServerBandwidth.as
	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
 2013-09-03 17:42:30 -03:00
Felipe Cecagno
65163c49ef Merge branch 'master' into guest-role-0.81 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/LogoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2013-08-26 15:13:38 -03:00
Felipe Cecagno
7f991d1346 Merge branch 'master' into sharedNotesNoServer-0.81 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2013-08-25 23:30:44 -03:00
Felipe Cecagno
81e3d93bb7 Merge branch 'master' into global-audio-0.81 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/kk_KZ/bbbResources.properties
	bigbluebutton-client/locale/km_KH/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
 2013-08-21 15:59:33 -03:00
jent46
65cdcc4789 locales updated 2013-08-14 12:45:18 -07:00
Hugo Lazzari
b5ae3e3f1c Implement promote user to moderator and to presenter with right click 2013-08-12 10:10:30 -03:00
Hugo Lazzari
a91a2df678 Merge branch 'master' into guest-role-0.81 
Conflicts:
	bbb-api-demo/src/main/webapp/demo3.jsp
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-web/application.properties
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2013-07-24 11:25:36 -03:00
Hugo Lazzari
bcfa02ee48 Implemented sharedNotesNoServer to work with bigbluebutton 0.81 2013-07-15 11:49:46 -03:00
Hugo Lazzari
ee31721d40 Add new locale resources to pt-br and en-us 2013-07-09 09:57:25 -03:00
Hugo Lazzari
46522fc943 Begin the global-audio with bbb 0.81 2013-07-08 10:55:53 -03:00
Felipe Cecagno
2c24931bac some refactor on the guest code to make it clearer and also to make the views prettier 2013-06-18 17:02:50 -03:00
Felipe Cecagno
fff04db2c5 added tooltips to the shared notes module (buttons+icons); removed the "Initial Document" content of the notes module; resized the save button of the notes module to 24x24 (since the icon is 16x16), and the presentation icons to 26x26; translated notes module strings to pt_BR 2013-06-17 17:06:04 -03:00
Markos Calderon
5ed910cde5 Updating localization files 2013-07-04 12:18:57 -05:00
Markos Calderon
d9d044f227 update localization files 2013-06-04 14:11:30 -05:00
Markos Calderon
34616c04d8 Merge branch 'layout-module' of https://github.com/mconf/bigbluebutton into mconf-layout-module 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
 2013-03-08 17:04:02 -05:00
Hugo Lazzari
2d5519b866 Translation of new resources to pt_br, fixed guestWindow layout when using pt_br, fixed bug that sometimes made flash not load the strings. 2013-03-05 09:31:24 -03:00
Felipe Cecagno
fa8b329d4e fixed translations of the layout module 2013-02-22 20:53:05 -03:00
Felipe Cecagno
2b73621596 changed the window title from Listeners to Speakers (since those participants are speakers now) 2013-02-01 13:17:00 -02:00
Felipe Cecagno
cdea70c443 translated specific strings to pt_BR 2013-01-07 13:49:06 -02:00
Hugo Lazzari
2c6caa0601 translated specific strings to pt_BR 2013-01-07 10:05:48 -02:00
Felipe Cecagno
166673e196 translated specific strings to pt_BR 2013-01-04 17:11:35 -02:00
Felipe Cecagno
b3a1d7193b translate specific strings related to this branch to pt_BR 2013-01-04 16:59:15 -02:00
Felipe Cecagno
16287c4915 copying the implementation of the network monitor from master (almost 0.81-beta) to tag v0.8, so it can be easily integrated with an older version of BigBlueButton 2013-01-04 10:58:38 -02:00
jtrobinson
50a2e83153 Fixed permission issue 2012-08-22 16:23:18 +00:00
Richard Alam
17bba97d40 - add catalan locale 
- update version to 0.8
 2012-06-18 12:56:30 +00:00
Richard Alam
4f0b930553 - update locales 2012-05-28 19:37:12 +00:00
Richard Alam
93349e84e6 - update locale version to 0.8-beta4 and (c) to 2012 2012-03-01 19:00:50 +00:00
Richard Alam
34a57089a4 update locale strings to latest from mygengo 2011-12-20 15:49:45 +00:00
Richard Alam
cf8efce46e - updating locales files from mygengo 2011-11-09 11:04:08 -05:00
Localization Server
07e6d4570e Updating locale 2011-10-17 00:20:01 +00:00
Localization Server
31993cc824 Updating locale 2011-10-17 00:00:02 +00:00
Localization Server
f3f95bc9ef Updating locale 2011-10-16 23:40:02 +00:00
Richard Alam
f524cfda17 - change locale version 0.8-beta2 2011-10-02 13:53:24 -07:00
Localization Server
47e33e1bd9 Updating locale 2011-09-19 18:00:22 +00:00
Localization Server
079e7d12f5 Updating locale 2011-09-12 17:00:03 +00:00
Localization Server
ca86fe1b77 Updating locale 2011-06-13 14:00:02 +00:00
Localization Server
74cfd9153f Updating locale 2011-05-25 14:37:34 +00:00
Marco Calderon
5a58b9ba11 - added indonesian and portuguese (brazil) locales 2011-03-06 07:35:59 +00:00
Richard Alam
ccce72a9b2 - upgrade checking of locales to 0.71 2010-11-03 13:49:11 -04:00
Jeremy Thomerson
a70047d4aa resources from djp 2010-07-14 09:13:57 -05:00
Richard Alam
36431188c0 - update locales 2010-06-25 13:21:04 -04:00
DJP
090ae1afd6 New pt_BR locale courtesy of Marcio Moraes 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4038 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-28 17:57:04 +00:00