Commit Graph

3895 Commits

Author SHA1 Message Date
Richard Alam
b795d159f7 build bbb-voice with red5 r4293 2011-11-03 20:24:50 +00:00
Richard Alam
806d0cb6d4 build video with red5 4293 2011-11-03 20:24:26 +00:00
Richard Alam
c75c132925 build bbb-apps with red5 r4293 2011-11-03 20:23:55 +00:00
Richard Alam
ec2cc83981 Merge branch 'master' into testing-with-red5-trunk 2011-11-03 17:31:27 +00:00
Richard Alam
2a33f7e2df fix logouturl from old locale popup 2011-11-02 17:22:30 -04:00
Richard Alam
54ca0a5bfd - change name of showing log button option 2011-11-02 14:18:40 -04:00
Richard Alam
fb29dee54f - make layout options work properly as toolbar doesn't hide when set to false 2011-11-02 14:07:45 -04:00
Richard Alam
74e95a4853 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-11-02 11:27:15 -04:00
Richard Alam
60577df2b1 - redirect properly to logout url when logout window is not shown 2011-11-02 10:59:29 -04:00
Localization Server
4c75e43b30 Updating locale 2011-11-01 22:40:01 +00:00
Richard Alam
22c2a0062e - fix regex in extracting userid and name from listener 2011-11-01 17:26:55 -04:00
Richard Alam
d327c26bfa - need to split local codes to convert to google translate locale codes 2011-11-01 16:56:01 -04:00
Richard Alam
2a3515a0f7 - sync chat language with language selector 2011-11-01 14:33:13 -04:00
Richard Alam
f97e357cf7 - display proper default locale in selector 2011-11-01 13:54:42 -04:00
Richard Alam
db80cff3d0 Merge branch 'master' into consolidate-locales-in-one-area
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
2011-11-01 13:34:09 -04:00
Richard Alam
7b36c465fa - Change text label when self muted/talking
- add param to prevent locales from being cached
2011-11-01 13:31:47 -04:00
Richard Alam
0d2234d5f7 try to set the language selector to default value 2011-11-01 13:21:27 -04:00
Richard Alam
f6c46bcedb - add locales in locales.xml 2011-11-01 10:20:35 -04:00
Richard Alam
349aab712d try to sync locales 2011-11-01 02:21:30 +00:00
Richard Alam
46d3b8b5be - fix to be able to switch from english and back 2011-11-01 01:44:21 +00:00
Richard Alam
87b7380320 rename Norwegian locale code from nb_No to no_NO 2011-11-01 01:44:03 +00:00
Richard Alam
b52578044e - refactor localization in preparation for fixing problem with setting up locales 2011-10-31 16:27:39 -04:00
Richard Alam
c6be4042c2 - moderator should always be able to mute/unmute himself.
- hide push to talk for viewer if locked by moderator
2011-10-31 13:48:01 -04:00
Markos Calderon
0e26498b49 changed bbb-voice to use the latest version of red5 2011-10-28 13:03:41 -07:00
Richard Alam
968a5d7967 Merge branch 'master' into testing-with-red5-trunk
Conflicts:
	bigbluebutton-apps/build.gradle
2011-10-27 10:58:53 -04:00
Richard Alam
a22a349e12 minor cleanup 2011-10-26 17:01:56 -04:00
Richard Alam
5307806253 shortcircuit how chat listens for user joining/leaving for private chat 2011-10-26 16:37:34 -04:00
Richard Alam
542fb60c34 more cleanup and make conference accessible only from manager 2011-10-26 14:55:05 -04:00
Richard Alam
5c6356d381 do cleanup to short circuit some method calls in the client 2011-10-26 14:35:59 -04:00
Markos Calderon
ed52b8bc5a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-10-26 12:03:25 -07:00
Markos Calderon
0d7924d650 changes in log files 2011-10-26 12:02:41 -07:00
Richard Alam
def087be2d cleanup as we only use mx components 2011-10-26 10:41:27 -04:00
Richard Alam
431d1cc902 Push some properties as private so that eventually we'll be able to create consistent interfaces
to access and modify users and conference attributes
2011-10-26 10:21:35 -04:00
Richard Alam
00bd22c0d2 some formatting cleanup 2011-10-25 17:45:36 -04:00
Richard Alam
5f0ceeee7a Merge branch 'master' into create-core-of-bbb-client 2011-10-25 17:07:07 -04:00
Richard Alam
b2d56280d6 - strip the userid from the callername and store the callername properly 2011-10-25 17:01:21 -04:00
Markos Calderon
3d9f861617 Update deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/svc1/BlockManager.scala 2011-10-25 15:48:30 -05:00
Richard Alam
a453d6b2c7 remove old UserManager from core 2011-10-25 16:17:30 -04:00
Richard Alam
920a627af9 move UserManager into core 2011-10-25 16:17:04 -04:00
Richard Alam
719d6b5ee0 - fix problem where listners window will display wrong name as data gets cached in listenerItem. When a user leaves and joins
the old value of that listener item gets displayed
2011-10-25 15:51:04 -04:00
Richard Alam
2564314aac check if shared object is null as user may have left and will result an NPE when sending private chat 2011-10-25 10:34:46 -04:00
Richard Alam
774c6632a5 handle case when user is locked. When clicking the talk button should have no effect. 2011-10-25 10:07:32 -04:00
Felipe Cecagno
08e5dbec7d extracted the strings from publish window to the language file 2011-10-24 22:10:52 -02:00
Richard Alam
4ff0c75675 - null out buffers so that garbage collector can reclaim memory quickly 2011-10-24 22:09:23 +00:00
Richard Alam
c5043a9f1d - fix the name properly as there are 60000 millis in a minute 2011-10-24 22:07:18 +00:00
Richard Alam
bb96ad5573 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-10-24 21:22:00 +00:00
Richard Alam
fdef6ecc13 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-10-24 21:21:23 +00:00
BigBlueButton
91bb0ce844 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2011-10-24 19:30:38 +00:00
BigBlueButton
4dda2b980f - remove deskshare client callback 2011-10-24 19:29:57 +00:00
Richard Alam
d7b665f463 add some debug logging on why the client doesn't get updated after some time. This happens
on demo after a few days but difficult to reproduce locally.
2011-10-24 13:04:44 -04:00