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

3809 Commits

Author SHA1 Message Date
Felipe Cecagno
ed34c99313 Merge branch '090-branding-logo' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-05 22:03:36 -03:00
Felipe Cecagno
5f2f2662af Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
 2014-10-05 22:00:28 -03:00
Felipe Cecagno
fc96d14984 reset the video message warning label style (lost in a merge) 2014-10-05 20:37:59 -03:00
Felipe Cecagno
26b8697b19 replaced logo and background image 2014-10-05 15:53:50 -03:00
Felipe Cecagno
a6aef4b3d4 Merge branch 'branding-logo' into 090-branding-logo 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2014-10-05 15:49:11 -03:00
syeshchenko
14b401851d resized and positioned some of the components to fit with Russian and German locales, changed and added some Russian translation 2014-10-01 15:18:31 -04:00
Fred Dixon
c89b9c63d8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-09-18 08:53:08 -04:00
Fred Dixon
b4d49a0f2b Added build numbers into loading JS libraries to ensure they don't get cached 2014-09-17 17:38:19 -04:00
Chad Pilkey
00ef1d50a1 fixed a crash related to deleting presentations, two ui problems with presentations, and cleaned up an event listener that wasn't used anymore 2014-09-17 11:47:25 -07:00
Richard Alam
90bf3ade5d - new jars with better controls for deskshare applet dragging and resizing 2014-09-17 10:33:17 -07:00
Richard Alam
58302721c0 Merge branch 'chrome-camera-settings' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into SenecaCDOT-BigBlueButton-chrome-camera-settings 2014-09-15 13:36:24 -07:00
syeshchenko
4a1c793390 fixed Chrome permission hint arrow 2014-09-15 13:28:26 -07:00
Richard Alam
a0a6172a4f - fix lock settings for muteme and webcam buttons for mods and presenter 2014-09-15 09:38:05 -07:00
Fred Dixon
35cad7b4f8 Merge pull request #395 from SenecaCDOT-BigBlueButton/use-nginx-for-audio 
change the webrtc websocket connection to use an nginx proxy
 2014-09-14 18:32:20 -04:00
Chad Pilkey
e15de759e3 change the webrtc websocket connection to use an nginx proxy 2014-09-14 13:49:12 -07:00
Richard Alam
d03f532b08 - ignore transifex dir when building locales 2014-09-12 13:13:34 -07:00
Richard Alam
6ca675fd83 - update locales 2014-09-11 12:16:08 -07:00
Chad Pilkey
2c6b060ba5 replace deprecated escape() with encodeURIComponent() 2014-09-09 14:27:03 -07:00
Chad Pilkey
681aedbdde fixed the glowing listen only indicator 2014-09-09 09:24:55 -07:00
Richard Alam
025ac35c3a Merge pull request #390 from SenecaCDOT-BigBlueButton/slide-zoom-change-presenter-sync 
fixed 'zoom slider won't update value after presenter have changed'
 2014-09-08 14:54:43 -04:00
Richard Alam
4c312d5c2e Merge pull request #388 from speakserve/copy-chat-selection 
Copy chat selection as text
 2014-09-08 14:54:29 -04:00
Richard Alam
83d15332d6 Merge pull request #387 from SenecaCDOT-BigBlueButton/chrome-webcam-permission-prompt 
Chrome webcam permission prompt
 2014-09-08 14:54:09 -04:00
syeshchenko
fb3966921e fixed 'zoom slider won't update value after presenter have changed' 2014-09-04 13:22:33 -07:00
Mateus Dalepiane
89d8eabd76 Check if user is already talking when video window is opened 2014-09-04 16:30:52 -03:00
Felipe Cecagno
c2eed678d9 cleanup 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2014-09-04 15:02:16 -03:00
Mateus Dalepiane
28fd83b9b8 Integrated multiple connection support with multiple camera 
+ Since now a user might have multiple cameras, the mechanism fo multiple
connections for streams had to be modified.
+ Included handling of connection failed and connection closed
+ Implemented event for stream stopped

Now the event STREAM_STARTED and STREAM_STOPPED are sent only with the streams
that actually started or stopped. Also, now a status change may trigger a
STREAM_STOPPED event, before it only triggered STREAM_STARTED events.
Close camera window when stream connection is closed
 2014-09-04 14:59:28 -03:00
Mateus Dalepiane
76f6b28e69 Merge branch '090-multivideo' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2014-09-04 13:28:21 -03:00
Chad Pilkey
b65da7ec25 hide switch presenter for phone users, hide presentation thumbnails when you click the presentation 2014-09-03 14:32:34 -07:00
Mateus Dalepiane
77c6bbf500 Merge branch '090-new-videodock' into mconf-live0.6.1 2014-09-03 16:39:03 -03:00
Mateus Dalepiane
f5cb6f4725 Improved multicamera support 
An array is used to store the stream names, instead of using a single string to
store them all.
 2014-09-03 16:28:33 -03:00
Chad Pilkey
8825f0a899 Merge remote-tracking branch 'upstream/master' into sort-raisehand-better 2014-09-02 13:42:00 -07:00
Chad Pilkey
ecfe3831b2 stop webrtc hangup from happening twice 2014-09-02 13:41:48 -07:00
Chad Pilkey
5fa76a872f adjust the positioning of the webrtc chrome title window 2014-09-02 13:41:22 -07:00
Ghazi Triki
c01d91ddaf Setting ChatMessageRenderer Text event listener to keyDown 2014-09-02 21:15:54 +01:00
syeshchenko
8b9c949818 minor bug fixes and optimization 2014-09-02 12:38:08 -07:00
Ghazi Triki
2d283e85b0 Copying chat text selection from mx_internal text field. 2014-09-02 20:11:57 +01:00
Richard Alam
0d3e23db21 - update locales 2014-09-02 12:01:20 -07:00
Ghazi Triki
9597c0cca7 Copy chat message selection. 2014-09-02 19:29:24 +01:00
Fred Dixon
e02476071d Make clear this is a private echo test 2014-09-01 16:48:00 -04:00
syeshchenko
1d148ef624 Merge branch 'master' into chrome-webcam-permission-prompt 2014-09-01 13:18:32 -07:00
syeshchenko
ae6a4d5fa1 on Chrome show webcam permission prompt before webcam preview opened 2014-09-01 13:10:50 -07:00
Richard Alam
2c67bf44ea - move deskshare view control to the top of the window 2014-08-29 13:29:01 -07:00
Richard Alam
a79bea7a3d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 08:58:01 -07:00
Richard Alam
172738534c - fix issue where rectangle shape gets lost when zooming 2014-08-29 08:57:34 -07:00
Richard Alam
117c69e557 - try to fix error when querying for browser type 2014-08-29 08:57:02 -07:00
Fred Dixon
88a0455248 Tweak phrasing for private echo test 2014-08-29 11:51:31 -04:00
Fred Dixon
1683067559 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 11:48:39 -04:00
Ghazi Triki
1c74e58a9f MainApplicationShell mdiCanvas height binded to the application height instead of its parent heignt. 2014-08-28 23:26:01 +01:00
Ghazi Triki
8db78cbe6d Renamed BigBlueButtonMainPanel to BigBlueButtonMainContainer and transformed to a Canvas. 2014-08-28 23:25:16 +01:00
Mateus Dalepiane
a3e35ee08c Revert "Log in multivideo" 
This reverts commit cb99102472.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2014-08-28 19:03:55 -03:00