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

8069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
f40f9bf767 Merge branch '090-fullscreen' into 090-branding-logo 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-05 23:31:39 -03:00
Felipe Cecagno
b9a149e94d Merge branch '090-fullscreen' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-05 23:08:09 -03:00
Felipe Cecagno
b03f8aafc6 cleanup 2014-10-05 22:57:20 -03:00
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
4d3d6305a4 enable network monitor by default and ignore the network monitor window by the layout module 2014-10-05 18:07:31 -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
Richard Alam
55532d326d Merge pull request #401 from SenecaCDOT-BigBlueButton/localization 
resized and positioned some of the components to fit with Russian and Ge...
 2014-10-01 15:36:59 -04: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
Alan Dias
e1dfd6d440 Merge branch '081-fullscreen' into 090-fullscreen 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-01 12:36:36 -03:00
Mateus Dalepiane
f78cecb07d Fixed network monitor button height 2014-09-30 12:30:06 -03:00
Jesus Federico
5a152c0cb7 bbb-lti: ssl_enabled is now validated only once 2014-09-29 14:48:21 -04:00
Jesus Federico
9c394bba4a bbb-lti: Fixed issue with ssl ping when tiemeout is too long 2014-09-29 14:01:06 -04:00
Mateus Dalepiane
7039dc1da5 Change default position of network monitor window to top right corner 2014-09-29 14:42:28 -03:00
Jesus Federico
ac02f6f8e8 Merge pull request #400 from jfederico/master 
bbb-lti: Updated css
 2014-09-29 13:14:16 -04:00
Jesus Federico
4f1b907daf bbb-lti: Updated css 2014-09-29 13:11:57 -04:00
Fred Dixon
9e87ffa02a Added libraries to make audio work with demo11.jsp (javascript API demo) 2014-09-21 19:01:58 -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
Fred Dixon
6d26b076d3 Added detection for OpenVZ IP address in bbb-conf 2014-09-17 17:37:43 -04:00
Richard Alam
27b38d89b2 Merge pull request #399 from SenecaCDOT-BigBlueButton/fix-no-presentation-problems 
Multiple fixes to the presentation module
 2014-09-17 17:26:37 -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
3581eb9354 Merge pull request #398 from SenecaCDOT-BigBlueButton/deskshare-resize-enhancements 
added default background color to the move icon
 2014-09-17 14:31:54 -04:00
syeshchenko
3dcce2a7d6 added default background color to the move icon 2014-09-17 14:28:21 -04: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
400f62102c Merge pull request #397 from SenecaCDOT-BigBlueButton/deskshare-resize-enhancements 
added resize and move cursors to make moving and resizing more accessibl...
 2014-09-17 13:12:58 -04:00
syeshchenko
d49ca935d6 added resize and move cursors to make moving and resizing more accessible for users 2014-09-17 13:08:14 -04:00
Richard Alam
51cdd5ab42 Merge branch 'SenecaCDOT-BigBlueButton-chrome-camera-settings' 2014-09-15 13:56:52 -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
Mateus Dalepiane
cdb2fa5d3e Moved network monitor button to MainToolbar 2014-09-15 16:35:25 -03:00
Richard Alam
a0a6172a4f - fix lock settings for muteme and webcam buttons for mods and presenter 2014-09-15 09:38:05 -07:00
Richard Alam
50352c0204 - make sure to cancel the thread after presentation conversion 2014-09-15 09:05:03 -07:00
Richard Alam
e313379355 - changed the wrong field to be zero based. Should be the slide field instead of num. 2014-09-15 08:29:15 -07:00
Fred Dixon
1f930c90d4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-09-14 19:42:10 -04:00
Fred Dixon
9e3c96683d Now updates sip.nginx for enabling nginx to proxy web services calls for SIP connections from client 2014-09-14 19:42:02 -04: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
Fred Dixon
f305a9b3cb Slightly lower memory check for 4G for servers to avoid warnings on servers with close to 4G 2014-09-14 14:09:15 -04:00
Fred Dixon
51dbe652ff Minor change to URL for bigbluebutton.org on index.html 2014-09-14 13:56:39 -04:00
Richard Alam
1e2a787af3 - cache default config xml 2014-09-14 09:33:13 -07:00
Richard Alam
38f77259f1 - return false when filter is applied 2014-09-14 09:06:11 -07:00
Richard Alam
e1234fcee4 - make sure the threads are not daemon...need to rework this 2014-09-12 15:10:13 -07:00
Richard Alam
a44362ccbf - change timer to ScheduledExecutorService to use thread from the pool 2014-09-12 14:28:49 -07:00
Richard Alam
d03f532b08 - ignore transifex dir when building locales 2014-09-12 13:13:34 -07:00
Mateus Dalepiane
d94e7eb54c Run the latency measurement when the user opens the network monitor 2014-09-12 12:48:13 -03:00
Mateus Dalepiane
192329a9b7 Changing network monitor icon 2014-09-12 12:43:06 -03:00
Mateus Dalepiane
ccb204ef96 Moved bandwidth data into network monitor button tooltip 2014-09-12 12:09:08 -03:00