Commit Graph

13236 Commits

Author SHA1 Message Date
Richard Alam
ca3788ebb7 Merge pull request #3334 from riadvice/signout-api-redirection
Updated LogoutURL handling by client
2016-08-30 11:52:34 -04:00
Ghazi Triki
0520b66d89 Triggering logoutUrl navigation after calling signOut API in the client. 2016-08-29 23:44:06 +01:00
Richard Alam
9a6ae52832 Merge pull request #3332 from ritzalam/start-pause-stop-screen-sharing-with-webrtc
ffmpeg linux jars
2016-08-29 16:46:08 -04:00
Richard Alam
1faca71ea2 - add ffmpeg linux jars 2016-08-29 20:43:44 +00:00
Richard Alam
bb005186b1 Merge pull request #3331 from jfederico/bbb1.1-fix-for-bugs
Bbb1.1 fix for bugs
2016-08-29 14:25:27 -04:00
jfederico
91beceb8f5 bbb-lti: Fixed error message showing up in javascript when romm was rendered 2016-08-29 13:55:20 -04:00
jfederico
3058564ae1 bbb-web: Fixed issue with registeredUser map not cleaned up 2016-08-29 13:53:50 -04:00
Fred Dixon
d038fa6065 Merge pull request #3330 from ffdixon/update-screenshare-help
Updated help text for launching screen sharing
2016-08-29 11:04:15 -04:00
Fred Dixon
738fc00ddf Updated help text for launching screen sharing 2016-08-29 11:02:30 -04:00
Richard Alam
cf4588203c Merge pull request #3328 from capilkey/screenshare-help-update
Update two Mac screenshare help images
2016-08-26 11:00:36 -04:00
Chad Pilkey
59e1ba93d7 update two Mac screenshare help images 2016-08-26 07:51:00 -07:00
Richard Alam
384ba12d63 Merge pull request #3322 from riadvice/breakout-rooms-close-invitation-window
Auto-remove breakout room join alert at some conditions
2016-08-26 10:07:38 -04:00
Richard Alam
acc55b9af1 Merge pull request #3326 from ritzalam/start-pause-stop-screen-sharing-with-webrtc
- trigger jws failed to start timer when clicking the start button
2016-08-25 17:56:56 -04:00
Richard Alam
22148cc2b0 - trigger jws failed to start timer when clicking the start button 2016-08-25 21:52:31 +00:00
Richard Alam
965d6fefff Merge pull request #3325 from capilkey/screenshare-error-notifications
Screenshare error notifications
2016-08-25 17:06:13 -04:00
Chad Pilkey
69f43b5726 Merge remote-tracking branch 'upstream/master' into screenshare-error-notifications 2016-08-25 14:03:47 -07:00
Chad Pilkey
5dbedbb06f add screenshare error messages to tell user when something goes wrong 2016-08-25 14:03:35 -07:00
Richard Alam
abaf4c6073 Merge pull request #3324 from capilkey/1.1-minor-fixes
Minor fixes for 1.1
2016-08-25 16:59:24 -04:00
Anton Georgiev
fb95afd16c Merge pull request #3273 from mmarangoni/settings-accessibility
HTML5 Settings Accessibility
2016-08-25 15:37:13 -04:00
Matthew Marangoni
cd842e0346 merged to upstream 2016-08-25 12:23:09 -07:00
Matthew Marangoni
43f7369806 Merge remote-tracking branch 'upstream/master' into settings-accessibility 2016-08-25 11:12:40 -07:00
Anton Georgiev
826c6e55bd Merge pull request #3323 from antobinary/html5-audio
HTML5client: rework start.sh; fix for environment selection; fix ._id undefined bug
2016-08-25 13:28:34 -04:00
Anton Georgiev
4811b521a6 Merge pull request #3269 from JaeeunCho/dropdown
HTML5 dropdown for settings menu
2016-08-25 13:27:18 -04:00
Anton Georgiev
a4dc2301a0 fix bug related to change presentation 2016-08-25 15:57:31 +00:00
Matthew Marangoni
0697e3a753 fixed some height/padding/margin issues in submenus 2016-08-25 08:46:22 -07:00
Chad Pilkey
60ea19c642 cc viewer auto-scroll, fix cc options tab scroll bar 2016-08-25 07:57:22 -07:00
Chad Pilkey
da977c55f0 new screenshare image, change screenshare help string, move ss window up 2016-08-25 07:56:28 -07:00
Jaeeun Cho
926387ce63 HTML5 dropdown for settings menu - modify aria-labelledby and aria-describedby for each menus 2016-08-25 07:34:27 -07:00
Anton Georgiev
e1cec10670 clean up 2016-08-24 23:13:42 +00:00
Matthew Marangoni
526923c59e renamed all settings modal files to match conventions 2016-08-24 16:00:38 -07:00
Anton Georgiev
bc79cd0452 rework start.sh so it picks up NODE_ENV 2016-08-24 22:59:18 +00:00
Anton Georgiev
cf45e2ab96 remove obsolete package version and environment path 2016-08-24 22:50:57 +00:00
Ghazi Triki
1ab4fc565a Moved logging out redirection from the client to signOut API. 2016-08-24 22:44:21 +01:00
Jaeeun Cho
c04c71695a HTML5 dropdown for settings menu - modify accessibility for each menus 2016-08-24 13:25:27 -07:00
Jaeeun Cho
8f70d252f2 HTML5 dropdown for settings menu - changing directory structure 2016-08-24 12:22:05 -07:00
Jaeeun Cho
dcf584c4db Merge remote-tracking branch 'upstream/master' into dropdown 2016-08-24 12:17:46 -07:00
Ghazi Triki
2e1b53bfcb Remove breakout room join alert when a new invitation comes to the user or when all breakout rooms are ended. 2016-08-24 19:43:31 +01:00
Jesus Federico
b44b8c165c Merge pull request #3321 from jfederico/bbb-lti_fix_newversion
Fixed the build
2016-08-24 14:07:03 -04:00
jfederico
4275b40b1d bbb-lti: Fixed confirmation on delete recordings 2016-08-24 14:03:52 -04:00
Fred Dixon
08f87c800c Merge pull request #3320 from ritzalam/start-pause-stop-screen-sharing-with-webrtc
Clean up
2016-08-24 14:00:59 -04:00
Richard Alam
e46f06efa1 Clean up
Clean up and format logs.
2016-08-24 17:54:07 +00:00
Jaeeun Cho
724f61ba9b HTML5 dropdown for settings menu 2016-08-24 10:49:57 -07:00
Jaeeun Cho
a838926485 Merge remote-tracking branch 'upstream/master' into dropdown 2016-08-24 08:13:44 -07:00
jfederico
30d7434552 bbb-lti: Refactoring on controller to remove some duplicated code 2016-08-24 11:07:35 -04:00
jfederico
31a2ac107b bbb-lti: Restored jquery to the version included in the native plugin 2016-08-24 11:06:58 -04:00
Matthew Marangoni
aa533468f9 fixed scss import relative paths 2016-08-24 08:06:51 -07:00
jfederico
509a995d84 bbb-lti: Removed button for closing alert message on errors 2016-08-24 10:59:40 -04:00
Matthew Marangoni
f0a5c550a7 Merge remote-tracking branch 'upstream/master' into settings-accessibility 2016-08-24 07:37:54 -07:00
jfederico
785f22bab1 bbb-tool: Removed file that caused the build to break 2016-08-24 10:37:48 -04:00
Anton Georgiev
a9caa13e52 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into html5-audio 2016-08-24 14:36:59 +00:00