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

30 Commits

Author SHA1 Message Date
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
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
jent46
65cdcc4789 locales updated 2013-08-14 12:45:18 -07: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
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
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
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
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