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

3421 Commits

Author SHA1 Message Date
Richard Alam
5552583bbe - fix typo as it's driving CHad nuts :) 2014-02-10 21:21:15 +00:00
Richard Alam
79d3146ce1 - synch presentation 
- however, whiteboard doesn't sync for latecomers
 2014-02-10 20:27:58 +00:00
Richard Alam
1f080c78e0 - now late comers can display current presentation page 2014-02-10 19:39:05 +00:00
Gustavo Salazar
edf9518a31 Merge master branch to add style in mic settings. 2014-02-10 11:03:15 -08:00
Richard Alam
20f3e41038 - alittle bit of formatting 2014-02-09 20:20:01 -05:00
Richard Alam
03d4b05217 - continue fixing presentation. Looks like it synchs. Need to fix why 
current page of presentation doesn't display for late comer.
 2014-02-09 15:51:05 -05:00
Richard Alam
d4b02df765 - fix go to slide message 2014-02-08 19:51:46 -05:00
Richard Alam
f12ec75377 - slowly making presentation work again 2014-02-08 17:56:13 -05:00
Richard Alam
aa8f68076f - try to figure out logging 
- send presentation messages as JSON
 2014-02-08 15:29:12 -05:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
Richard Alam
cf321098ac - try to get presentation working again 2014-02-07 14:14:28 -05:00
Richard Alam
1430eff18d - update locales to show java7u51 2014-02-06 16:53:26 -05:00
syeshchenko
850558ac15 Disable file list when file upload process running 2014-02-05 11:06:57 -08:00
syeshchenko
06bf0fe049 Add file format hint message 2014-02-05 11:01:23 -08:00
Chad Pilkey
d8bbfbfa36 moved the Mic Warning strings to the locale file and fixed up a bug with the chrome warning popup 2014-02-04 15:42:46 -08:00
Chad Pilkey
9594efcadb Merge remote branch 'upstream/master' into pretty-micsettings 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
 2014-02-04 15:27:06 -08:00
Chad Pilkey
ecac0b7a1d fixed up the ui of the audio settings a little bit 2014-02-04 14:43:20 -08:00
Gustavo Salazar
921405f3b6 change style in audio warning 2014-02-04 14:12:18 -08:00
Gustavo Salazar
fe21539a6c hide 'chrome allow' image when user joins anyway 2014-02-04 12:51:05 -08:00
syeshchenko
4a0a702165 enabled colorpicker 2014-01-30 14:27:54 -08:00
Chad Pilkey
8b86dc82eb fixed bug 1716 - fixed an index out of bounds exception in repeatChatMessage 2014-01-29 12:40:23 -08:00
Richard Alam
d6335d0874 Merge branch 'master' into audiosettings 2014-01-28 18:26:43 +00:00
Chad Pilkey
bdc12d7f4e Merge pull request #296 from mconf/presentation-arrow-keys 
Re-enabling the common shortcut keys to change the slides
 2014-01-20 10:21:35 -08:00
Gustavo Salazar
6c51099e26 Merge branch 'audiosettings' of github.com:gugat/bigbluebutton 2014-01-20 09:25:06 -08:00
Tiago Daniel Jacobs
a62d19dc06 Merge remote-tracking branch 'remotes/origin/master' 2014-01-20 01:21:02 -02:00
Tiago Daniel Jacobs
ac265adb1e Fixed lockSettings config loading with dynamic config.xml; 2014-01-20 01:20:04 -02:00
Richard Alam
d3d259527e - update to java 7u51 2014-01-16 20:58:39 -05:00
Richard Alam
a6a58e6ecb - update java string to u51 2014-01-16 17:57:31 -05:00
Richard Alam
b209dad293 Merge branch 'merge-master-with-new-polling-feature-branch' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/lock/LockService.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/ParticipantsService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/User.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-31 20:07:55 +00:00
Richard Alam
c9f7996128 Merge branch 'master' into merge-master-with-new-polling-feature-branch 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	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/RoomsManager.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/webapp/WEB-INF/bbb-apps.xml
	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/modules/present/ui/views/SlideView.mxml
 2014-01-30 16:50:09 +00:00
Richard Alam
29e94500c4 Merge branch 'refactor-voice-users' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-28 21:12:01 +00:00
Richard Alam
66fe84d2ca Merge branch 'audiosettings' into merge-polling-with-master 2014-01-28 18:41:09 +00:00
Richard Alam
5559a2b8cc Merge branch 'master' into merge-polling-with-master 
- there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	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/RoomsManager.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/webapp/WEB-INF/bbb-apps.xml
	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/modules/present/ui/views/SlideView.mxml
 2014-01-23 20:49:04 +00:00
Richard Alam
2fe0d3a30e Merge branch 'new-polling-feature' of github.com:bigbluebutton/bigbluebutton into new-polling-feature 2014-01-23 19:31:25 +00:00
Richard Alam
9e67758f80 Merge pull request #297 from SenecaCDOT-BigBlueButton/fix-whiteboard-toolbar-visibility 
fixed an issue with keepToolbarVisible and an issue with the toolbar dissapearing when clicking the presentation window
 2014-01-16 09:22:01 -08:00
Felipe Cecagno
ca97a5eec5 implemented the new set of icons for the record button 2014-01-16 11:38:12 -02:00
Felipe Cecagno
d12c7f3091 reverting back the previous icons for webcam, headset and deskshare 2014-01-16 11:37:43 -02: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
Richard Alam
2f36afc6cf Merge pull request #300 from BBBManager/bbb-issue-1656 
Fix for issue #1656
 2014-01-13 11:45:22 -08:00
Tiago Daniel Jacobs
5c054becdc Fix for issue #1656 2014-01-09 17:04:46 -02:00
Tiago Daniel Jacobs
8c912df459 Implemented lock settings in bbb-client and bbb-apps. 2014-01-09 03:52:03 -02:00
Chad Pilkey
74cb3bba80 fixed an issue with keepToolbarVisible and an issue with the toolbar dissapearing when clicking the presentation window 2013-12-19 15:23:55 -08:00
Gustavo Salazar
e1571aead4 Indicate the user has to click ALLOW in Chrome. 2013-12-13 11:31:08 -08:00
Gustavo Salazar
3f0d193644 Use microphone selected in join audio dialog during the session. 2013-12-12 09:29:27 -08:00
Gustavo Salazar
6bb7f7690d Slider for microphone record volume. 2013-11-28 13:27:56 -08:00
Gustavo Salazar
00b11c333f Warn user if microphone has no activity. 2013-11-27 12:22:43 -08:00
Felipe Cecagno
b6317a7c2b make the presentation also compatible with wireless presenter hardware 2013-11-26 12:48:37 -02:00
Felipe Cecagno
4888b4f63a added new listeners for Keyboard.LEFT and Keyboard.RIGHT to change to next or previous slide 2013-11-25 14:31:13 -02:00
Gustavo Salazar
2ed71a5fb0 Add references. 2013-11-22 16:02:35 -08:00
Gustavo Salazar
5e1b4b3b10 Use Nellymoser codec to test activity. 2013-11-22 16:01:29 -08:00
Gustavo Salazar
5c0c9d613b Test microphones without test button 2013-11-22 15:23:49 -08:00
Gustavo Salazar
f8d6f0881e Activity level without loopback true 2013-11-22 13:55:09 -08:00
Gustavo Salazar
58e78ef3c6 Show audio activity 2013-11-20 10:07:26 -08:00
Gustavo Salazar
3463fd62db Select microphone and test it with loopback in mic settings. 2013-11-19 15:34:58 -08:00
Richard Alam
329d2b9af1 Merge pull request #291 from SenecaCDOT-BigBlueButton/add-another-string 
created a new locale string for the chat module
 2013-10-31 17:44:00 -07:00
Chad Pilkey
336c8f72f3 created a new locale string for the chat module 2013-10-31 16:27:14 -07:00
Gustavo
9e61cc334a update locales 2013-10-30 20:53:29 +00:00
Richard Alam
a961161605 - sign with new certificate that expires in 2014 2013-10-30 12:40:08 -07:00
Chad Pilkey
f77d795084 fixed the annotation drawing so that the line thickness scales when you zoom a presentation 2013-10-29 08:24:55 -07:00
Richard Alam
49bf86d5aa Merge pull request #276 from SenecaCDOT-BigBlueButton/fix-switch-racecondition 
fixed bug 1661, the tool now switches to pan/zoom when a new presentation is loaded
 2013-10-22 14:31:37 -07:00
Richard Alam
dc8a603e41 Merge pull request #278 from speakserve/fix-deskshare-kickedout 
Fixed issue when current user is kicked out and he is sharing his screen...
 2013-10-22 14:28:50 -07:00
Richard Alam
e56a868c0e - update client with deskshare applet with latest fixes 2013-10-22 21:11:11 +00:00
Chad Pilkey
ccc828c76b the whiteboard toolbar is now disabled as soon as the client is notified of a new presentation. it better work for real this time 2013-10-22 14:03:06 -07:00
Richard Alam
2e9aa55756 - fix bug where requesting to send a key frame fails to get the correct stream name 2013-10-22 19:55:39 +00:00
Chad Pilkey
cf12fe382b Merge remote branch 'upstream/master' into fix-switch-racecondition 2013-10-22 11:43:52 -07:00
Richard Alam
336a6b3c6e - apply smoothing on deskstop sharing video 2013-10-22 16:22:49 +00:00
Ghazi Triki
658afcb45b Fixed issue when current user is kicked out and he is sharing his screen. 2013-10-22 17:15:07 +01:00
Richard Alam
c09636ea4a - handle parameter scale = 1 to do pixel for pixel display when sharing fullscreen 2013-10-22 15:08:11 +00:00
Chad Pilkey
6ffb35428c remove the blue background from the Java Test linkbutton 2013-10-21 16:22:07 -07:00
Richard Alam
c4855876c3 - change test java link 2013-10-21 21:50:38 +00:00
Richard Alam
bf81aa4e56 - add time remaining display on result window 2013-10-21 13:36:14 -07:00
Richard Alam
cbdf8a3440 - add target to build a single locale 2013-10-21 19:37:11 +00:00
Richard Alam
80ba0d6ead - change link so that user is redirected to appropriate localized page 2013-10-21 18:55:41 +00:00
Richard Alam
de553549d1 - change instruction to much shorter one so it's easy to localize 2013-10-21 18:47:31 +00:00
Richard Alam
b07dde529c - add java version required notice in when starting desktop sharing 2013-10-21 18:09:00 +00:00
Richard Alam
fc02874176 - clean up presentation list to remove scrollbar and display 3 presentations properly 2013-10-20 20:19:55 +00:00
Richard Alam
c30a8c495f - change java version dialog title 2013-10-20 20:18:32 +00:00
Richard Alam
a08790fa52 - center the java version error message dialog 2013-10-20 18:22:13 +00:00
Richard Alam
87c5c41432 - change applet display version to 0.81 2013-10-20 17:53:12 +00:00
Richard Alam
95ed553f86 - add version check on applet. Don't allow sharing of screen when java version 
is lower than 1.7.0_45
 2013-10-20 17:09:06 +00:00
Chad Pilkey
c5a5a5d77c fixed bug 1661, the tool now switches to pan/zoom when a new presentation is loaded 2013-10-18 18:36:34 -07:00
Richard Alam
183148b5eb Revert " - add alert warning when user has old java version when starting desktop sharing." 
This reverts commit 570ea3c6f8.
 2013-10-18 22:12:59 +00:00
Richard Alam
570ea3c6f8 - add alert warning when user has old java version when starting desktop sharing. 2013-10-18 20:54:38 +00:00
Richard Alam
6e5fa16f96 - fix problem where java security dialog pops up due to java 7 update 45 
https://code.google.com/p/bigbluebutton/issues/detail?id=1658
 2013-10-18 19:16:52 +00:00
Richard Alam
355f13dab4 Merge branch 'new-polling-feature' of github.com:bigbluebutton/bigbluebutton into new-polling-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2013-10-17 21:26:36 +00:00
Richard Alam
87870cca2c Merge branch 'new-polling-feature' of github.com:bigbluebutton/bigbluebutton into refactor-voice-users 2013-10-17 21:10:12 +00:00
Richard Alam
0541c40d28 Merge branch 'master' into refactor-voice-users 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2013-10-17 21:08:57 +00:00
Richard Alam
d62af354d4 - align logout confirm alert with logout button. Currently it relies on the lang selector to 
figure out the window's x coordinate. However, when the shortcut and help button is hidden, the
lang selector moves to the right so the logout alert window overflows the browser to the right.
 2013-10-17 13:37:59 -07:00
Richard Alam
f63c4f3367 - fix brodcast module where users won't be able to play video when presenter has started 
broadcasting before the late users joined
 2013-10-17 12:26:22 -07:00
Richard Alam
9f8163d9b2 - localize poll toolbar button 2013-10-17 12:24:26 -07:00
Richard Alam
4ecced0723 Fixed broadcast module not showing for clients, multiple windows opening for presenter and stream not playing if joining once the stream was started 2013-10-17 11:49:40 -07:00
Richard Alam
a6759a8171 - Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1653 2013-10-15 14:51:02 +00:00
Richard Alam
bd05827fc4 - Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1646 2013-10-15 14:50:30 +00:00
Richard Alam
a5e12b8315 - fix Issue https://code.google.com/p/bigbluebutton/issues/detail?id=1652 2013-10-15 14:49:22 +00:00
Richard Alam
12a4df7dcf Merge branch 'master' into refactor-voice-users 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2013-10-11 20:58:35 +00:00
Felipe Cecagno
bafa7531d7 updating the icon set (webcam, deskshare, microphone and record control) - same base icons, new "check" and "x" layers 2013-10-11 13:53:36 -03:00
Richard Alam
83b1c209b4 Merge branch 'master' into speakserve-remove-spacers 2013-10-11 16:11:12 +00:00
Richard Alam
7811de5f8a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-10-11 16:10:58 +00:00
Richard Alam
c7565f3ac1 Merge branch 'remove-spacers' of github.com:speakserve/bigbluebutton into speakserve-remove-spacers 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
 2013-10-11 16:10:32 +00:00
Richard Alam
9677f8032a Merge pull request #271 from sokie/master 
Fixed broadcast module issue #1639
 2013-10-11 09:03:30 -07:00
Richard Alam
c68adeba87 Merge pull request #253 from speakserve/fix-users-settings-menu 
User settings menu repositioned
 2013-10-11 09:02:36 -07:00
Richard Alam
df8e49f4af - when width of client is less than 800, hide the meeting name, shourtcut, and locale buttons. 2013-10-11 15:53:51 +00:00
Felipe Cecagno
d4a7bea99b handled the scrollbars that appear if you have a small screen and a (not so) long copyright message 2013-10-11 11:32:30 -03:00
Felipe Cecagno
c350b6ceac fix issue http://code.google.com/p/bigbluebutton/issues/detail?id=1609 
related to exceptions when you try to log out of the session
 2013-10-11 11:16:00 -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
sokie
1ae8876072 Fixed broadcast module not showing for clients, multiple windows opening for presenter and stream not playing if joining once the stream was started 2013-10-07 18:30:32 +02:00
Richard Alam
5bb5f2000d Merge branch 'master' into new-polling-feature 2013-10-07 15:16:25 +00:00
Richard Alam
7838483f33 - disable pie chart 2013-10-07 15:15:11 +00:00
Felipe Cecagno
94df8080b8 fixed record button alert position 2013-10-04 11:24:05 -03:00
Richard Alam
22b0aa1579 - continue refactoring whiteboard 2013-10-03 17:08:53 +00:00
Gustavo Salazar
d673e6e484 update locales 2013-10-02 12:12:40 -07:00
Felipe Cecagno
2572d5eb7a positioned the record button near the other control buttons at the left size 2013-10-02 14:29:57 -03:00
Richard Alam
9f036f5e97 - refactoring chat application to use messaging 2013-10-01 19:32:22 +00:00
Richard Alam
e878600ef6 Merge branch 'new-polling-feature' into play-with-spring-amqp 2013-09-30 15:03:21 +00:00
Felipe Cecagno
09657c206c fixed the exceptions thrown when an Alert box is showed 2013-09-24 18:03:58 -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
Richard Alam
920c56d7f1 - loclalize buttons 2013-09-24 16:31:59 +00:00
Richard Alam
8014f0a6e4 - disable stop button when poll has stopped 2013-09-24 16:01:00 +00: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
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
Richard Alam
b0d04b04e6 - hook up display poll result button 2013-09-23 21:00:34 +00:00
Richard Alam
f334a49a31 - disable delete, start, edit buttons depending on the state of the poll 2013-09-23 20:49:41 +00: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
f2ce380a57 - skip check for cam setting even when starting sharing manually 2013-09-23 19:20:09 +00:00
Richard Alam
8a137a61ae Merge branch 'master' into new-polling-feature 2013-09-23 15:56:32 +00:00
Richard Alam
c1d30dc72b - add config param to skip camera settings check 2013-09-23 15:24:07 +00:00
Richard Alam
f6b5959992 Merge branch 'master' into embed-flash-client-in-another-app 2013-09-19 21:27:52 +00:00
Felipe Cecagno
9c512931e0 starting to implement the client-side of the record button; nothing yet was modified on bigbluebutton-apps 2013-09-19 17:53:48 -03: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
dd367c2941 Merge branch 'master' into upgrade-to-gradle-1.7 2013-09-17 18:13:11 +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
Richard Alam
35ae1a5720 - cleanup and add header 2013-09-16 20:57:06 +00:00
Richard Alam
1f4149e859 - move all of BigBlueBUtton.mxml code into a panel to be embedded in another app 2013-09-16 18:09:41 +00:00
BigBlueButton
03614548eb - Move BBB UI into panel so it's easy to embed into another flash app 
- Need to move other initialization code from BigBlueButton.mxml
 2013-09-16 17:50:15 +00:00
Richard Alam
1db314c60a - remove poll from display when deleted. 2013-09-13 17:51:29 +00:00
Ubuntu
1dccf2fbb3 Merge branch 'master' into new-polling-feature 2013-09-11 19:28:12 +00:00
Ubuntu
be264746b8 Merge branch 'new-polling-feature' into redis-backed-bbb-live-data 2013-09-11 19:18:01 +00:00
Ghazi Triki
211a260a69 User settings menu placed at the same vertical level settingsBtn and horizontally at it right. 2013-09-11 11:39:44 +01: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