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

11097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
4cf5fa640b Merge remote-tracking branch 'upstream/development' into change-poll-label 2015-08-04 12:12:02 -04:00
Richard Alam
521afc9143 Merge pull request #733 from gthacoder/meteor-client-navbar 
HTML5 client: navbar bug fixes.
 2015-08-04 11:20:33 -04:00
Richard Alam
fdfd382a28 Merge pull request #712 from riadvice/tab-indexer 
Added TabIndexer class for automating tab indexation.
 2015-08-04 11:07:50 -04:00
Oleksandr Zhurbenko
2ebf44a3b7 Added Sorting to the userlist 2015-08-03 17:23:57 -07:00
Oleksandr Zhurbenko
0b3606350f Handling for 'poll_show_result_message' 2015-08-02 15:57:54 -07:00
Maxim Khlobystov
63588ede10 Made sure the animation of the userlist's items still works after a pan gesture ends. 2015-08-02 14:11:24 -04:00
Ghazi Triki
f6bbe498ee MainApplicationShell height fix to remove the script execution timeout in GraphicsWrapper. 2015-08-02 15:30:08 +01:00
Maxim Khlobystov
16658f1c0f Fixed the issue with wrong file references in Chrome/Firefox CSS inspector. 2015-08-01 15:28:19 -04:00
Oleksandr Zhurbenko
84840f1830 Added handling for 'user_voted_poll_message' 2015-08-01 12:27:01 -07:00
Chad Pilkey
b282dbd7bf cleaned up some event listeners in UsersWindow menu 2015-07-31 18:15:37 -04:00
Chad Pilkey
5a40d9095c the poll menu items are translatable now 2015-07-31 18:14:17 -04:00
Chad Pilkey
120ba2417e better positioned the menu in the UsersWindow 2015-07-31 17:12:41 -04:00
Chad Pilkey
9c69f60437 Changed the quick poll label to be more descriptive 2015-07-31 17:09:59 -04:00
Oleksandr Zhurbenko
147e1942fb Removing the userIds of the users who already voted from the collection, added null pointer validation 2015-07-31 11:07:27 -07:00
Ghazi Triki
d906e6599e Merge branch 'development' into tab-indexer 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2015-07-31 09:36:59 +01:00
Oleksandr Zhurbenko
bae52f4f4b Added the ability to send responses to polls back to the server 2015-07-30 17:08:12 -07:00
Maxim Khlobystov
eb6062a0e7 Minor style fix for the hamburger buttons: eliminated the light-colored bottom border on a dark background. 2015-07-30 16:48:36 -04:00
Maxim Khlobystov
e0417ff4c8 Added a tooltip to the hamburger button that toggles the right-hand menu. 2015-07-30 16:34:44 -04:00
Maxim Khlobystov
52425394b7 Fixed the issue with the navbar's audio icon disappearing on hovering and made all the navbar buttons behave consistently on hovering or focusing. 2015-07-30 16:26:44 -04:00
Richard Alam
3c52404140 Merge pull request #732 from riadvice/typo-fix 
Added missing comma in a LOGGER call for VideoEventMapDelegate class.
 2015-07-30 15:41:43 -04:00
Ghazi Triki
4e6a215033 Added missing comma in a LOGGER call for VideoEventMapDelegate class. 2015-07-30 20:33:35 +01:00
Richard Alam
f7208a648d Merge pull request #710 from riadvice/as3-logging 
Better logging for the Flex client
 2015-07-30 13:25:51 -04:00
Ghazi Triki
0ab06495bc Fixed VideoProxy class imports. 2015-07-30 16:34:22 +01:00
Ghazi Triki
7a8737cfaf Merge branch 'development' into as3-logging 
Conflicts:
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
 2015-07-30 09:31:05 +01:00
Ghazi Triki
31892ca0de Force showing logs in trace before the configuration is loaded. 2015-07-30 09:25:13 +01:00
Oleksandr Zhurbenko
3bbca33fca Keeping colors consistent 2015-07-29 15:37:41 -07:00
Richard Alam
85529a131e - fix logging 2015-07-29 21:20:27 +00:00
Maxim Khlobystov
5b16f3b0c1 Fixed the positioning of the navbar's audio button and made the presentation title's width flexible. 2015-07-29 16:19:59 -04:00
Richard Alam
386c870583 - log all state changes to connection. Hoepfully we can narrow down why disconnects occur to bbb-video. 2015-07-29 20:03:38 +00:00
Ghazi Triki
83666a7caa Merge branch 'development' into as3-logging 
Conflicts:
	bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
	bigbluebutton-client/src/org/bigbluebutton/core/services/UsersService.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/PollResultObject.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as
 2015-07-29 19:44:29 +01:00
Oleksandr Zhurbenko
69c4405cdb Added the UI for sending back answers 2015-07-29 11:09:37 -07:00
Richard Alam
75343449a8 Revert "Updated application lifecycle : the application configuration is loaded before displaying the main application shell, all loaded resources will then be able to access the configuration without any issue." 
This reverts commit b5af206a43.
 2015-07-29 17:59:48 +00:00
Richard Alam
b5c2a0a7e9 Merge pull request #711 from riadvice/lifecycle-update 
Updated application lifecycle: load the configuration before display
 2015-07-29 11:41:56 -04:00
Richard Alam
8a09f6aaf7 Merge pull request #731 from bigbluebutton/pedrobmarin-development-auto-reconnect 
merge auto reconnect feature
 2015-07-28 17:13:21 -04:00
Richard Alam
856029fc2b Merge pull request #730 from ritzalam/fix-webrtc-user-on-reconnect 
- mic icon not showing up beside user's name when reconnect occurs i…
 2015-07-28 17:05:54 -04:00
Richard Alam
335b87b8bf - mic icon not showing up beside user's name when reconnect occurs if user is joined using webrtc 2015-07-28 21:04:18 +00:00
Oleksandr Zhurbenko
aee51542a3 A polling element appears when the poll is published for a current user 2015-07-28 13:25:04 -07:00
Oleksandr Zhurbenko
b07e49b6e2 When there is a poll waiting for a current user, a whiteboard shrinks 2015-07-28 13:21:56 -07:00
Oleksandr Zhurbenko
83ec5b8892 Added Polling related functions to the bbb_api_brigde 2015-07-28 13:14:03 -07:00
Richard Alam
1d3faae800 Merge pull request #728 from ritzalam/keep-track-of-user-connections 
- keep track of user's number of connections to red5 to manage auto-…
 2015-07-28 15:54:38 -04:00
Richard Alam
6297a60b7a - assign a presenter when there is none 2015-07-28 19:53:46 +00:00
Richard Alam
667a619c4a Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-28 18:52:46 +00:00
Richard Alam
2aaf36a0df Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-28 18:52:07 +00:00
Richard Alam
cbca7a9d21 Merge pull request #729 from ritzalam/add-missing-info-to-poll-result-recording 
- poll results recording has missing data required for processing
 2015-07-28 14:51:45 -04:00
Richard Alam
becfad11d6 - poll results recording has missing data required for processing 2015-07-28 18:48:47 +00:00
Chad Pilkey
963affb333 Merge pull request #726 from gthacoder/meteor-client-swipe-gesture 
HTML5 client: horizontal pan gesture on mobile devices.
 2015-07-28 14:35:16 -04:00
Richard Alam
df71d8a689 - keep track of user's number of connections to red5 to manage auto-reconnect 2015-07-28 18:29:00 +00:00
Maxim Khlobystov
9a7e52274e Made the vertical centering of the navbar title work in Firefox. 2015-07-28 14:15:43 -04:00
Oleksandr Zhurbenko
a813298e56 Small corrections 2015-07-27 16:35:27 -07:00
Oleksandr Zhurbenko
10be3d03e0 Added permissions for viewers and a presenter. Viewers can't retreive the total number of votes. Also, viewers can't retreive any data if they have voted already 2015-07-27 15:55:29 -07:00