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

8144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
a3f594172f - update locales from transifex 2014-10-07 09:29:31 -07:00
Richard Alam
f7ff1bee42 Merge pull request #404 from SenecaCDOT-BigBlueButton/webrtc-connection-upgrades 
Fixed some issues where people got stuck at connecting with webrtc
 2014-10-06 18:22:59 -04:00
Chad Pilkey
7d9b26912e Merge remote-tracking branch 'upstream/master' into fix-no-presentation-problems 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2014-10-06 15:09:36 -07:00
Chad Pilkey
4ec65bc300 enhannced LoggedOutWindow to allow for easy reconnect 2014-10-06 15:07:22 -07:00
Calvin Walton
1078aef49d Add a note to the nginx config to tell 0.9.0 beta users of a possible upgrade path 2014-10-06 17:30:32 -04:00
Calvin Walton
630ef4c72c Move 0.81 files to a subdir, add nginx redirect for them. 
Now the 0.81 presentation playback files are in an appropriate versioned
directory. If desired, the recording metadata can be updated to reference
the versioned files directly, but an nginx redirect has been added so
that unmodified recordings will also work.
 2014-10-06 17:17:20 -04:00
Chad Pilkey
de7dbd0b44 Multiple fixes to our webrtc implementation. Hopefully there's less holes now 2014-10-06 14:14:34 -07:00
Calvin Walton
8673d353bb Use the directory presentation/0.9.0 instead of presentation2 
This makes it a bit more obvious how the versioning can work going
forwards, and makes it so that we do not need to update the nginx
config each time we have a new version of the playback files.

The 0.81 files remain at the top level of the presentation directory
for compatibility reasons.
 2014-10-06 16:46:55 -04:00
Calvin Walton
852ea7b822 Revert 'presentation' dir to 0.81 code, add 'presentation2' for 0.9 
This fixes an issue where recordings copied from a 0.81 server might
not play back correctly on a 0.9 server.

This changes the 0.9 recording scripts to use playback support files
from a different subdirectory, 'presentation2', while existing 0.81
recordings continue to use the 'presentation' directory.

If the raw files from an old recording are reprocessed, it will
switch to using the newer playback support files.
 2014-10-06 16:15:25 -04: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
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
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
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
Richard Alam
6ca675fd83 - update locales 2014-09-11 12:16:08 -07:00
Richard Alam
4b2c0883bf Merge pull request #393 from SenecaCDOT-BigBlueButton/fix-hieroglyphics-audio 
replace deprecated escape() with encodeURIComponent()
 2014-09-09 17:29:12 -04:00
Richard Alam
dacbad24ed Merge pull request #392 from kepstin/recording-updates 
Actually fix slide indexes.
 2014-09-09 17:28:34 -04:00
Chad Pilkey
2c6b060ba5 replace deprecated escape() with encodeURIComponent() 2014-09-09 14:27:03 -07:00
Calvin Walton
72fc36caef Actually fix slide indexes. 
While the page numbers from BigBlueButton are zero-based, the slide images
are generated as 1-based.
 2014-09-09 17:15:57 -04:00
Richard Alam
8f208ca28b Merge pull request #391 from SenecaCDOT-BigBlueButton/fix-listenonly-talking 
fixed the glowing listen only indicator
 2014-09-09 13:04:36 -04:00
Chad Pilkey
681aedbdde fixed the glowing listen only indicator 2014-09-09 09:24:55 -07:00