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

13197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
349b216928 omit hiredis package; cleanup 2016-08-29 21:34:03 +00:00
Anton Georgiev
899a6de14b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into html5-audio 2016-08-25 18:19:07 +00:00
Anton Georgiev
7f77f5835b apply 1.4.1.1 patch 2016-08-25 18:17:25 +00: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
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
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
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
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
jfederico
509a995d84 bbb-lti: Removed button for closing alert message on errors 2016-08-24 10:59:40 -04: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
Anton Georgiev
64b274a8f9 Merge pull request #3312 from Lajellu/config-organization 
HTML5 Config organization
 2016-08-24 10:33:02 -04:00
Laily Ajellu
401a529450 HTML5 - removes config.js and removes a package not needed anymore from .meteor/packages 2016-08-24 07:23:50 -07:00
Laily Ajellu
d3c6cf6a6c Merge remote-tracking branch 'upstream/master' into config-organization 2016-08-24 07:22:55 -07:00
Jaeeun Cho
8eddccc66c HTML5 dropdown for settings menu 2016-08-24 07:17:30 -07:00
Anton Georgiev
2953697e45 Merge branch 'config-organization' of github.com:lajellu/bigbluebutton into html5-audio 2016-08-24 13:02:02 +00:00
Laily Ajellu
361ce7f19f HTML5 - adds captions to config file 2016-08-23 16:48:11 -07:00
Laily Ajellu
f0cdbfaf2e Fixed merge conflicts 2016-08-23 16:45:28 -07:00
Fred Dixon
4d3a623f3a Merge pull request #3318 from jfederico/bbb-lti_fix_newversion 
bbb-lti: Some fixes to the UI
 2016-08-23 19:33:00 -04:00
Fred Dixon
79aec5f1a2 Merge pull request #3319 from capilkey/remove-screenshare-autostart 
Remove autoStart and autoFullscreen options from new Screenshare Module
 2016-08-23 19:32:38 -04:00
Chad Pilkey
a3854068e0 remove autoStart and autoFullscreen options from the Screenshare module 2016-08-23 16:13:20 -07:00
Jaeeun Cho
426d7baba7 html5-client dropdown settings menu 2016-08-23 15:19:13 -07:00
jfederico
7d8d52ca3c bbb-lti: localised recording format types shown in the list 2016-08-23 18:00:23 -04:00
Anton Georgiev
ff8dfb17d4 Merge pull request #3302 from OZhurbenko/closed-captioning 
Meteor 1.4.1, Closed-Captioning
 2016-08-23 17:42:01 -04:00
Laily Ajellu
2105e911ef HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js 2016-08-23 14:35:28 -07:00
Laily Ajellu
e4e0a61708 Merge remote-tracking branch 'upstream/master' into config-organization 2016-08-23 14:32:19 -07:00
jfederico
6644a26155 bbb-lti: Fixed issues on error page 2016-08-23 17:25:27 -04:00
Richard Alam
8130662890 Merge pull request #3316 from antobinary/nginx-logging2 
Logging to server (to be handled by nginx)
 2016-08-23 17:09:16 -04:00
Anton Georgiev
01ddc0af4b Merge branch 'closed-captioning' of github.com:ozhurbenko/bigbluebutton into html5-audio 2016-08-23 21:07:31 +00:00
Fred Dixon
247da5a07a Merge pull request #3314 from capilkey/screenshare-help-images 
Minor fixes to the deskshare publish UI
 2016-08-23 17:05:30 -04:00
Fred Dixon
2a07b456ed Merge pull request #3317 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
client throws exception when connection to screen share disconnects
 2016-08-23 17:05:19 -04:00
Richard Alam
bdb1aece3b - fix issue where client throws exception when connection to screen share gets disconnected. 2016-08-23 21:02:49 +00:00
jfederico
645e72bcd8 bbb-lti: Added format and localisation to date in recording list 2016-08-23 16:28:33 -04:00
Richard Alam
a4d9c9c627 Merge pull request #3315 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Start pause stop screen sharing
 2016-08-23 15:59:45 -04:00
Anton Georgiev
96e54cecd6 add explanation for logPattern 2016-08-23 19:52:51 +00:00
Anton Georgiev
3560e9447e remove obsolete deskshare config 2016-08-23 19:48:38 +00:00
Anton Georgiev
6ba64ed749 add new field to config.xml 2016-08-23 19:48:25 +00:00