Commit Graph

8177 Commits

Author SHA1 Message Date
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
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
Chad Pilkey
59dbdc55aa Merge remote-tracking branch 'upstream/master' into sort-raisehand-better 2014-09-03 14:34:13 -07: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
Richard Alam
2c53427a0d - meeting with duration=0 should be destroyed after a certain period when last user leaves 2014-09-02 15:25:54 -07: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
Richard Alam
c300eb81e6 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-09-02 13:18:13 -07:00
Richard Alam
4bf941b108 - although the page number is not used in whiteboard recording processing, just match the page number with the goto slide event in events.xml 2014-09-02 13:17:28 -07:00
Ghazi Triki
c01d91ddaf Setting ChatMessageRenderer Text event listener to keyDown 2014-09-02 21:15:54 +01:00
Calvin Walton
c7967810b2 Revert the presentation publish page index altering
This was added because BigBlueButton 0.9 started using 1-based page
numbers in the events.xml file. That change has been reverted, so as
to avoid behaviour changes from 0.81 in places where it's unnecessary.
2014-09-02 15:46:52 -04:00
Richard Alam
d5d541a2c5 - subtract 1 from GotoSlideEvent and ResizeAndMoveSlideEvent to events.xml so that the recording is backwards compatible with 0.81 and earlier 2014-09-02 12:44:52 -07: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