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

3682 Commits

Author SHA1 Message Date
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
Richard Alam
4b07e6d3ab Merge branch 'master' into html5-bridge-new-events 2014-01-06 13:20:35 -08: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
mohamed-ahmed
3069d915ce merged html5-bridge with master 2013-10-29 19:06:38 +00:00
mohamed-ahmed
1c012aec32 merged html5-bridge with master 2013-10-29 18:33:25 +00: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
mohamed-ahmed
129ab9f5ca fixed it so that shapes won't be erased when changing slides 2013-10-29 14:47:26 +00: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
mohamed-ahmed
9c0e4ca9dd Merge branch 'master' into throwaway-merge 2013-10-03 16:07:28 +00:00
mohamed-ahmed
5ad337ad4c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-10-03 16:07:06 +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
mohamed-ahmed
8207e1a274 comment explaining square fix 2013-09-30 18:25:20 +00:00
mohamed-ahmed
8213272485 fixed drawing reversed square in both flash client and html5 client 2013-09-30 18:23:29 +00:00
Richard Alam
e878600ef6 Merge branch 'new-polling-feature' into play-with-spring-amqp 2013-09-30 15:03:21 +00:00
mohamed-ahmed
9cade6bba8 fixed drawing circle in flah client 2013-09-27 20:04:23 +00:00
mohamed-ahmed
bd34ec292e fixed drawing circle in flah client 2013-09-27 20:03:34 +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
Richard Alam
d402f7b333 Merge branch 'master' 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2013-09-09 18:42:21 +00: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
Ghazi Triki
086dc6d806 Improving performances by removing Spacer component when possible, replacing them by style values and replacing boxes containers by canvases. 2013-09-03 08:13:37 +01: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
d8f7518bb2 Merge branch 'master' into global-audio-0.81 2013-08-25 23:35:16 -03:00
Felipe Cecagno
412384745f Merge branch 'master' into language-button-usability-0.81 2013-08-25 23:34: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
mohamed-ahmed
1ec61766b4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-08-22 23:44:36 +00: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
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}
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
Ghazi Triki
a3ca2c6bac Removed uncessary binding for LoadingBar positioning. 2013-08-16 10:37:12 +01:00
jent46
65cdcc4789 locales updated 2013-08-14 12:45:18 -07:00
mohamed-ahmed
c7d8203a64 modified xml layout file for testing client changes 2013-08-12 18:49:28 +00:00
Hugo Lazzari
45ff9b298f Fixed chatBox AccessibilityProperties that was seted before being initialized. 2013-08-12 14:32:36 -03:00
jtrobinson
17a8e14d1d Removed an un-needed commented line 2013-08-01 08:49:54 -07:00
jtrobinson
1463b52689 Logout confirmation window has been moved to the upper-right corner, skinned to fit in better with other BBB components. 2013-08-01 08:48:00 -07:00
Chad Pilkey
7b3e278232 you can now create a whiteboard text box from any draw direction 2013-07-31 13:58:54 -07:00
Chad Pilkey
5aba2b7c5d Merge pull request #220 from SenecaCDOT-BigBlueButton/fix-whiteboard-pagechange 
fixed the annotations disappearing on page change
 2013-07-30 17:36:16 -07:00
Chad Pilkey
b7cbe197f9 fixed the annotations disappearing on page change 2013-07-30 17:30:37 -07:00
Chad Pilkey
397994cdb9 Merge pull request #219 from SenecaCDOT-BigBlueButton/better-logout 
Better logout
 2013-07-30 17:29:07 -07:00
jtrobinson
674195ea71 Config Template contains boolean flag to activate/deactivate logout confirmation (default is true). Also cleaned up remnants of old custom Confirm component. 2013-07-30 08:52:07 -07:00
jtrobinson
5ab068d201 Removed custom ConfirmLogoutWindow.mxml. Committing mx:Alert-based logout confirmation. 2013-07-30 07:25:48 -07:00
Richard Alam
5cf7a60cf7 - do not show eject button when allowKickUser is false 2013-07-29 12:43:07 -07:00
Richard Alam
05490b130b - do not show unlocked layout icon to viewers 2013-07-29 11:35:09 -07:00
Richard Alam
d8cae838d7 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1587 where 
webcam cannot be started again when window is closed while previewing video
 2013-07-27 12:17:23 -07:00
Fred Dixon
63309b30ab Merge pull request #218 from tylercopeland/updated-upload-icon 
Updated upload document icon
 2013-07-26 12:51:34 -07:00
Tyler Copeland
b6de969cbf Updated upload document icon 2013-07-26 15:05:42 -04:00
jtrobinson
dfb7a9e0d6 Trying to replace the ConfirmLogoutWindow with mx:Alert. There is supposedly a way to make it accessible. 2013-07-26 11:05:09 -07:00
Hugo Lazzari
60eda3852d Fixed error. 2013-07-26 11:15:47 -03:00
Hugo Lazzari
ae0567b420 Update language-button-usability to work with bbb v0.81 2013-07-26 10:15:39 -03:00
jtrobinson
9d14bbb16c Tried to resolve edge case of a user focusing out of the window while Confirm Logout dialog is open, trying to tab back in without mouse. Still unresolved. 2013-07-25 11:08:11 -07:00
jtrobinson
df456dfd4a Clicking NO in the confirm dialog returns focus to the Logout button on the MainToolbar, in keeping with existing focus patterns. 2013-07-25 07:16:40 -07:00
jtrobinson
e7e22013ff Base confirm-logout functionality in place. Need to integrate into tab order and focus. 2013-07-25 06:52:54 -07:00
Fred Dixon
375e75338f Fixed two spelling mistakes in US english file 2013-07-24 08:33:52 -07:00
jtrobinson
7bdeb79fec Framework for friendlier logout window in place. 2013-07-24 06:46:15 -07:00
Fred Dixon
8d9a4b93c2 Reverted back change ... not getting the formatting right on copyright line 2013-07-23 20:53:24 -07:00
Fred Dixon
e17199d62f Another tweak of copyright line 2013-07-23 20:34:06 -07:00
Fred Dixon
0bf150a330 minor updates in copyright line 2013-07-23 20:32:48 -07:00
Gustavo Salazar
7ad90a83b2 Merge pull request #216 from SenecaCDOT-BigBlueButton/second-round-accessibility-fixes 
Second round accessibility fixes
 2013-07-23 13:32:04 -07:00
Markos Calderon
65bc8774f3 Added autoFullScreen in config xml 2013-07-22 19:58:35 -05:00
Chad Pilkey
5461fe0dc4 changed the url in the footer to be an actual link 2013-07-22 11:19:07 -07:00
Chad Pilkey
ccce791315 removed the deskshare region button from the tab order 2013-07-22 08:05:15 -07:00
Chad Pilkey
318a7f9986 added pre and post text to the slide in the Flash client 2013-07-22 08:04:51 -07:00
Chad Pilkey
520fd7eadf when options is clicked focus the user list 2013-07-19 11:00:52 -07:00
Markos Calderon
5697f7c30a some small fixes in the polling workflow 2013-07-18 18:24:50 -05:00
Chad Pilkey
0bf957482d switched the word close in the audio and video popups with cancel 2013-07-18 09:07:19 -07:00
Chad Pilkey
c657ab88c3 removed the private chat button from the webcam control buttons when the chat module is absent from the config.xml 2013-07-17 14:54:40 -07:00
Chad Pilkey
d88af818f5 added 4 link buttons to the start of the tab order when a screen reader is active 2013-07-17 13:27:23 -07:00
Chad Pilkey
b91b634511 fixed the height of mic and webcam toolbar buttons and removed the tab order looping for now 2013-07-17 12:07:08 -07:00
Chad Pilkey
344dce81b3 fixed some issues with the text display in mic settings popup and added a couple of localizations 2013-07-17 12:06:23 -07:00
Chad Pilkey
4efc425f9a Merge remote branch 'upstream/master' into add-window-links 2013-07-16 06:24:13 -07:00
Chad Pilkey
a2ebd5a92c removed part of the blinking tag again 2013-07-16 06:24:03 -07:00
jtrobinson
49752b56a2 Resolved conflicts 2013-07-15 09:16:50 -07:00
jtrobinson
710530f59f Repairing some errors that came up in conflict resolution. 2013-07-15 07:25:52 -07:00
jtrobinson
4397154648 Resolved conflicts. 2013-07-15 07:21:39 -07:00
Hugo Lazzari
37d67f1854 Fixed bugs when listenOnlyMode was false, add new icons depending on listenOnlyMode 
changed joingGlobal to listenOnlyMode
Removed old debug messages
 2013-07-12 11:31:04 -03:00
Richard Alam
dc181437ae - implement stop poll 2013-07-11 21:39:26 +00:00
jtrobinson
165f18fa4f Notifications in chatTabs are not working. This bears returning to later. 2013-07-11 08:05:54 -07:00
Richard Alam
424a9127c6 - modify so that generated JSON will have "responseIDs" 2013-07-10 21:59:46 +00:00
jtrobinson
3128350bfb Merged upstream/master, resolved conflicts. 2013-07-10 09:48:03 -07:00
jtrobinson
40f5528d10 Still experimenting with ChatTabs accessibility. 2013-07-10 07:20:55 -07:00
Chad Pilkey
7137eaf189 place the whiteboard toolbar on the top when the presentation window is clicked 2013-07-09 14:36:02 -07:00
Richard Alam
56c6e32ed7 Merge pull request #199 from SenecaCDOT-BigBlueButton/add-keeptoolbarvisible-property 
Add keeptoolbarvisible property
 2013-07-09 10:33:46 -07:00
Richard Alam
23dc0b0f54 - store if poll has started and stopped 2013-07-09 17:26:56 +00:00
Chad Pilkey
532b9f50c9 cleaned up a missing return type 2013-07-09 10:11:10 -07:00
Chad Pilkey
ce3993a6af added a property keepToolbarVisible to the Whiteboard Module 2013-07-09 09:59:37 -07:00
Richard Alam
1d60fe0825 - display result for user that has responded to the poll 2013-07-09 15:06:46 +00:00
Richard Alam
b90f599b33 - hook up events in take poll window 2013-07-09 14:59:09 +00:00
Hugo Lazzari
5e97768e22 Removed old code 2013-07-09 11:05:37 -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
9c1c8eecfc - Added shortcut to mute button 
- Fixed joinGlobal bug
 2013-07-09 09:34:43 -03:00
Richard Alam
09ed93413d - polish bar chart...but I notice that it sometimes flickers 2013-07-08 22:12:01 +00:00
Richard Alam
2e307c5a6c - polish pie chart display 2013-07-08 22:05:49 +00:00
Richard Alam
18b0c36209 - display result using bar chart 2013-07-08 20:00:15 +00:00
Richard Alam
a0282eeba7 - update pie chart result when someone responds to poll 2013-07-08 19:18:12 +00:00
Richard Alam
07cb2a8aab - activate Update Poll buttons 2013-07-08 17:41:24 +00:00
Richard Alam
00f6ce906e - update poll list when meeting is created 2013-07-08 17:27:54 +00:00
Richard Alam
8269de8c44 Merge pull request #198 from SenecaCDOT-BigBlueButton/modify-page-title 
Modify page title
 2013-07-08 10:17:28 -07:00
Chad Pilkey
06a279ba2f added meeting title to the client html document title 2013-07-08 09:46:23 -07:00
Chad Pilkey
0e69428914 fixed a race condition with the shortcut options 2013-07-08 09:44:31 -07:00
Richard Alam
b514b9581c - hook up buttons for create poll window 2013-07-08 16:30:20 +00:00
Richard Alam
e818f36766 - open and close main poll window 2013-07-08 16:08:03 +00:00
Richard Alam
73b7b1ccfa - cleanup 2013-07-08 15:43:10 +00:00
Hugo Lazzari
c8e7b52f52 Fixed new callerName 2013-07-08 11:56:09 -03:00
Hugo Lazzari
46522fc943 Begin the global-audio with bbb 0.81 2013-07-08 10:55:53 -03:00
Chad Pilkey
95868fc98d reworked the meeting name in the toolbar 2013-07-05 11:53:02 -07:00
Richard Alam
2987659a2a - cleanup 2013-07-05 08:40:04 -04:00
Richard Alam
25df600f23 - cleanup 2013-07-05 06:59:37 -04:00
Richard Alam
3d890f5f68 - cleanup 
- intialize poll model properly for viewers and moderators
 - display proper window for verwer and moderators/presenter when poll starts
 2013-07-05 06:34:27 -04:00
Richard Alam
4bb112daf2 - bunch of cleanup 
- handle start and stop poll events
 2013-07-05 05:33:21 -04:00
Richard Alam
d98a8195ed - trigger start poll 2013-07-04 22:22:40 +00:00
Chad Pilkey
7bafd045e1 chat notification blinker is removed 2013-07-04 15:21:25 -07:00
Richard Alam
526f6d69a6 - implement taking poll 2013-07-04 20:49:23 +00:00
Markos Calderon
5ed910cde5 Updating localization files 2013-07-04 12:18:57 -05:00
Richard Alam
944db497e2 Merge branch 'master' into make-users-user-conn-invoke 2013-07-04 16:27:53 +00:00
Richard Alam
ec87a3393b Merge pull request #195 from SenecaCDOT-BigBlueButton/fix-audio-security-dialog 
Fix audio security dialog
 2013-07-03 18:21:02 -07:00
Chad Pilkey
a10aaf5582 cleaning up log messages 2013-07-03 16:07:52 -07:00
Chad Pilkey
eb74f1fd54 cleaned up the way mic permissions work to handle Flash being in protected mode 2013-07-03 16:07:33 -07:00
Richard Alam
0d7aa1dbe6 - handle taking poll response 2013-07-03 21:49:52 +00:00
Richard Alam
e13b1548d5 - create new results window each time as Flash cache the previous window 2013-07-03 19:24:23 +00:00
Richard Alam
6dd2dc0a26 - fix show poll result 2013-07-03 19:14:14 +00:00
Richard Alam
4460612462 - fix update poll 2013-07-03 18:38:06 +00:00
Richard Alam
1b2534ee30 - implement remove poll 2013-07-03 15:50:18 +00:00
Richard Alam
8ecbc79ec0 - implement get polls from server 2013-07-02 21:18:36 +00:00
Richard Alam
2f68693023 - send create poll request to server 2013-07-02 16:08:53 +00:00
jtrobinson
dd06dd16e7 Chat tabs now modify their accessibility description to tell a screen reader whether there are new messages in that tab or not. Removed logic pertaining to ChatAccessibilityEvent, which was introduced as part of this branch and is no longer needed. 2013-07-02 09:08:15 -07:00
Richard Alam
92e6c941c1 - display bar chart 2013-07-02 15:56:56 +00:00
Richard Alam
81ccc65a4a - open create poll window 2013-07-02 15:47:14 +00:00
Richard Alam
2cbd85ce6f - display poll when opening take poll window 2013-07-01 19:11:45 -04:00
Richard Alam
9f0c185215 Merge branch 'make-users-user-conn-invoke' of github.com:bigbluebutton/bigbluebutton into make-users-user-conn-invoke 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultWindow.mxml
 2013-06-29 21:55:28 -07:00
Richard Alam
0b16f969ee open take poll window 2013-06-29 21:53:17 -07:00
Markos Calderon
f74b69a5c0 Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultPieChartPanel.mxml
 2013-06-28 22:47:37 -05:00
Markos Calderon
b87440525e Adding bar chart 2013-06-28 22:45:41 -05:00
Richard Alam
4002b3d2d1 - cleanup 2013-06-28 18:46:43 -07:00
Richard Alam
8c32601c40 - display result in pie chart 2013-06-28 18:43:26 -07:00
Richard Alam
8c656f0a2d Merge pull request #193 from SenecaCDOT-BigBlueButton/fix-whiteboard-marks 
fixed the ghost whiteboard objects
 2013-06-28 14:55:57 -07:00
Richard Alam
20435e2cc4 - try to display results 2013-06-28 18:44:43 +00:00
Richard Alam
595fbaecf9 - hook up display results and update window 2013-06-28 18:35:50 +00:00
Richard Alam
bb4de5a889 open display result window 2013-06-28 18:00:09 +00:00
Richard Alam
ee3af50c08 cleanup and wrap pie chart result in window 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/managers/PollingWindowManager.as
 2013-06-28 17:44:39 +00:00
Richard Alam
8611986597 open main poll window 2013-06-28 16:38:29 +00:00
Markos Calderon
b91621f72b Merge branch 'make-users-user-conn-invoke' of https://github.com/bigbluebutton/bigbluebutton into make-users-user-conn-invoke 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/managers/PollingWindowManager.as
 2013-06-28 10:41:23 -05:00
Markos Calderon
c65313347d polling charts 2013-06-28 10:38:51 -05:00
Richard Alam
1815c7ea71 - implement updating of poll UI 2013-06-27 22:07:36 +00:00
Chad Pilkey
b930bb30cb added a room mute indicator to the users window 2013-06-27 13:57:06 -07:00
Richard Alam
c91ca88b59 collect responses to questions 2013-06-27 20:22:47 +00:00
Richard Alam
40db605fee - implement take poll UI and handle responses 2013-06-27 20:12:05 +00:00
jtrobinson
1253ebcb17 Removed commented code pertaining to the old timer-based notification system. 2013-06-27 09:36:18 -07:00
jtrobinson
e9a865cb0e Added logic to determine whether or not to play the notification sound. Sound now plays whenever a message is received, like many other chat clients. 2013-06-27 09:33:42 -07:00
Richard Alam
5e76338f89 - start implementing UI for taking a poll 2013-06-27 16:10:24 +00:00
jtrobinson
db61f9d312 Added new chat message notification noise and licensing information for the sound file. Removed old public and private notification sounds and the relevant code. Commented out code from the old timed notifications. 2013-06-27 07:38:00 -07:00
Chad Pilkey
6ba928924f fixed the ghost whiteboard objects 2013-06-26 16:42:16 -07:00
Richard Alam
643952a108 - implement create new poll window UI 2013-06-26 21:39:03 +00:00
Richard Alam
e387bbf122 implement create or select poll UI 2013-06-26 20:45:10 +00:00
Richard Alam
4415a72825 Merge pull request #191 from SenecaCDOT-BigBlueButton/fix-https-links 
fixed https chat linking
 2013-06-26 10:55:12 -07:00
Richard Alam
19dfb6f884 Merge pull request #190 from SenecaCDOT-BigBlueButton/chat-access-hotfix 
Chat access hotfix
 2013-06-26 10:54:52 -07:00
Richard Alam
6cbfffea4a Merge pull request #189 from SenecaCDOT-BigBlueButton/modular-hotkeys 
Modular hotkeys
 2013-06-26 10:54:32 -07:00
Richard Alam
96819b7d88 - start working on the UI 2013-06-25 20:50:32 +00:00
jtrobinson
72361ed21c Removed notification timer from ChatView 2013-06-25 13:20:12 -07:00
Chad Pilkey
16aa23e01a fixed https chat linking 2013-06-25 13:19:24 -07:00
jtrobinson
0a8b8cc91f Changed hotkey for Repeat Current Message to the Spacebar. 2013-06-25 12:40:02 -07:00
jtrobinson
55168dc935 Improved 'Repeat Current Message' functionality for repeating the Welcome message before any other navigation happens (an edge case, but an easy one to address) 2013-06-25 12:00:31 -07:00
jtrobinson
a330e1f85b Improved Chat Box navigation logic and initial accessibility description. 2013-06-25 11:32:35 -07:00
Richard Alam
2ee386df71 cleanup 2013-06-25 16:11:47 +00:00
Richard Alam
da30ea9e1b - send poll messages from server to client 2013-06-25 15:33:23 +00:00
jtrobinson
1fecc7130f Localized some special-case strings being used in Shortcut Window. 2013-06-25 07:36:31 -07:00
Richard Alam
ba9c36c425 - receive and process poll messages 2013-06-24 21:13:53 +00:00
jtrobinson
306e82406f Changed ChatBox.mxml to use the arrow keys to navigate chat messages. 2013-06-24 13:13:58 -07:00
jtrobinson
7ecb6ab1e7 Moved global hotkey resource array to static member in ShortcutOptions. 2013-06-24 08:30:05 -07:00
jtrobinson
d97102015b Shortcut window correctly displays/hides hotkeys depending on what modules are and are not included. 2013-06-24 07:49:52 -07:00
Richard Alam
4e0d5c7751 send and receive poll response message 2013-06-21 22:52:34 +00:00
Richard Alam
2da1f7030d - send polling message from client and receive on server 2013-06-21 22:08:08 +00:00
Markos Calderon
2f7c2949c5 fix locale 2013-06-21 16:41:00 -05:00
Richard Alam
3fef969f56 write some tests 2013-06-21 19:52:53 +00:00
Richard Alam
3051b66072 Merge branch 'master' into make-users-user-conn-invoke 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationRoom.java
 2013-06-21 17:42:09 +00:00
Chad Pilkey
390630d269 Merge pull request #152 from SenecaCDOT-BigBlueButton/global-hotkey-focus-fix 
Global hotkey focus fix
 2013-06-21 07:56:46 -07:00
jtrobinson
747a6be5c0 Timer removed until a more effective notification procedure is developed. 2013-06-21 07:53:43 -07:00
jtrobinson
19fed749b1 Need to test this code still, pushing so I can make a hotfix in another branch. 2013-06-21 07:51:19 -07:00
Richard Alam
9c4a629a8c - recieve create poll message on server 2013-06-20 20:55:58 +00:00
Richard Alam
f741e677d3 - create poll 2013-06-20 20:40:14 +00:00
Richard Alam
07ba395c27 fix switch presenter 2013-06-20 17:55:41 +00:00
jtrobinson
4da8a1c12a Trying to dynamically populate the SHW drop-down list. Committing work in order to address another issue. 2013-06-20 07:33:38 -07:00
Richard Alam
a2748cb307 - implement sending of create poll message to server 2013-06-19 21:16:03 +00:00
Richard Alam
5e749d9dca - add more polling models 
- upgrade minimum Flash player version to 11.2
 2013-06-19 19:49:02 +00:00
Richard Alam
8b16f42dc2 - cleanup formatting 2013-06-19 18:36:51 +00:00
Richard Alam
e4606d0a47 - start implementing receiving of messages from server for polling 2013-06-19 18:36:21 +00:00
jtrobinson
479678316f BigBlueButton.mxml now only loads hotkeys for use based on which modules are loaded or not. 2013-06-18 11:38:31 -07:00
jtrobinson
bd8aa63c98 Merged upstream changes and polling hotkeys 2013-06-18 11:17:45 -07:00
jtrobinson
dfa208aa78 Global hotkeys in Shortcut Help Window are now displayed based on which modules are and aren't loaded. 2013-06-18 11:10:54 -07:00
jtrobinson
4b9cd35eb7 Made members of ShortcutOptions static so that it only needs to be loaded once in BigBlueButton.mxml. You can't change the config mid-meeting, after all. 2013-06-18 10:49:46 -07:00
jtrobinson
044ac80303 ShortcutOptions detects whether any modules are missing or commented out from config.xml 2013-06-18 09:50:36 -07:00
jtrobinson
f4162fb652 Created ShortcutOptions class to allow modular loading of hotkeys. 2013-06-18 08:40:37 -07:00
Richard Alam
2eca78d600 Merge pull request #185 from SenecaCDOT-BigBlueButton/poll-hotkeys-64 
Poll hotkeys
 2013-06-18 08:40:36 -07:00
jtrobinson
cc3e376c6d Added local hotkeys back into Voting window. 2013-06-18 07:53:42 -07:00
jtrobinson
70e5639483 Added local hotkeys to Polling Stats window 2013-06-18 06:52:01 -07:00
jtrobinson
65f06c07ec Fixed local hotkeys in Instructions window. 2013-06-17 12:03:52 -07:00
jtrobinson
d2d8c58f77 Found the culprit: Missing handlers in the Event Map. 2013-06-17 11:52:36 -07:00
Richard Alam
0536939bc7 synching up with master 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml
 2013-06-17 18:32:09 +00:00
jtrobinson
aa3db37692 More hotkeys code. Hotkeys still not quite functional. 2013-06-17 11:26:42 -07:00
Chad Pilkey
5cfe26fae6 moved the you indicator in the users grid to the locales file 2013-07-12 15:30:53 -07:00
Chad Pilkey
e73806e715 Merge remote branch 'upstream/master' into early-accessibility-fixes 2013-07-12 14:50:01 -07:00
Chad Pilkey
f1126ba56f fixed the shorcut help window column headers 2013-07-12 14:48:24 -07:00
Chad Pilkey
3a815a4328 changed the join audio string 2013-07-12 14:29:11 -07:00
Chad Pilkey
b564f7d591 moved the popup windows to the start of the tab order 2013-07-12 13:08:49 -07:00
jtrobinson
90487abca7 Replaced Shortcut Help datagrid headers with properly localized strings. 2013-07-11 13:46:57 -07:00
jtrobinson
a557a00822 Added accessibilityDescription to chat message input box 2013-07-11 13:33:21 -07:00
jtrobinson
bfe6b7023a Added accessibilityDescription to chat message input box 2013-07-11 13:33:03 -07:00
jtrobinson
953602481b Added user's name to button tooltips in Users window userlist 2013-07-11 13:30:32 -07:00
jtrobinson
b028d3b4ac Brought accessible language to Presentation title bar 2013-07-11 11:10:37 -07:00
jtrobinson
99071aac3b Finished tab names for public chat and options tab 2013-07-11 10:53:43 -07:00
jtrobinson
c0c14faf4e Finished removing the term 'click' 2013-07-11 10:28:29 -07:00
jtrobinson
33e3aef400 Finished replacing 'camera' with 'webcam 2013-07-11 10:21:00 -07:00
jtrobinson
49d0766a9e Finished renaming Video Dock to Webcams 2013-07-11 10:18:40 -07:00
jtrobinson
a3d795cbac First pass-through of the en_US locale to change inaccessible language strings. 2013-07-11 09:04:25 -07:00
Markos Calderon
ff893f36fe Fix: disallow client to reconnect by refreshing the browser, when a meeting ends 2013-07-10 16:01:54 -05:00
Chad Pilkey
9dd6eba493 added a label to the toolbar help link 2013-07-10 11:00:24 -07:00
Chad Pilkey
2ca74cc90d rearranged the mic settings dialog box elements 2013-07-10 10:59:55 -07:00
Richard Alam
09ffd2a89b - send user events to flash 2013-06-14 22:16:20 +00:00
Richard Alam
c33cb4d56b - try sending user reply message 2013-06-14 20:33:25 +00:00
Chad Pilkey
14b79c762d the meeting name is now available inside the meeting 2013-06-14 09:11:12 -07:00
jtrobinson
9d7c3e3888 Added necessary code back in to other files. 2013-06-14 08:22:12 -07:00
Felipe Cecagno
ae7468f9de disabling temporarily the network monitor and the bandwidth estimation measurement 2013-06-13 20:20:08 -03:00
Richard Alam
21d63e08e9 - display pre-uploaded presentation 2013-06-13 19:26:19 +00:00
Richard Alam
1f4e14fa7a - handle pre uploaded presentations 2013-06-13 19:00:24 +00:00
jtrobinson
e4236a0e39 Added logic to support global Poll Menu hotkey to Poll Event Map and Polling Manager 2013-06-13 11:45:00 -07:00
jtrobinson
c61638a04f Added all locale strings for polling. 2013-06-13 11:14:46 -07:00
jtrobinson
abb9cabfb0 Added hotkeys to Voting window. 2013-06-13 10:45:43 -07:00
jtrobinson
d99c3cbbad Added hotkeys to Poll Statistics window 2013-06-13 10:24:53 -07:00
jtrobinson
e4d110b56f Added hotkeys to Instructions window 2013-06-13 10:03:37 -07:00
jtrobinson
fe7b38efc4 Added polling strings to BigBlueButton.mxml, ShortcutEvent, and Shortcut help window. Also merged upstream/master. 2013-06-13 08:32:32 -07:00
Richard Alam
c2d24a8d38 - continue refactoring presentation 2013-06-13 00:49:52 +00:00
Richard Alam
6db900f3d6 - reafactor presentation 2013-06-12 23:52:55 +00:00
Richard Alam
75f4affb25 - modify layout module to not use shared objects for messaging 2013-06-12 19:06:10 +00:00
Richard Alam
d6297642ba Merge pull request #181 from SenecaCDOT-BigBlueButton/disable-drawing-when-notpresenter 
when you lose presenter you lose the ability to draw
 2013-06-11 14:47:54 -07:00
Chad Pilkey
1016e1e29a when you lose presenter you lose the ability to draw 2013-06-11 14:36:31 -07:00
Richard Alam
4b7fc8ffc6 Merge pull request #179 from SenecaCDOT-BigBlueButton/poll-tab 
Poll tab
 2013-06-11 13:18:05 -07:00
Richard Alam
68ca2b333b Merge pull request #159 from SenecaCDOT-BigBlueButton/access-presenter-alert 
Added audio alert; when Presentership is moved to or from a screen-reade...
 2013-06-11 13:16:38 -07:00