Commit Graph

319 Commits

Author SHA1 Message Date
Matthew Marangoni
8902742573 wrapped BBB instantiation into init function and added to startup 2017-07-24 11:36:56 -07:00
Klaus
d72df301c6 Move to 2.0 2017-07-24 11:15:46 -03:00
Klaus
5c2369b992 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-24 11:00:30 -03:00
Matthew Marangoni
4e66ecf0e2 moved BBB import to startup 2017-07-20 08:57:12 -07:00
Klaus
b70702dabe Dynamic fetching the stun/turn servers 2017-07-19 09:44:47 -03:00
Klauswk
7173c0e20c Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-17 16:54:37 -03:00
Klaus
5767583a86 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages 2017-07-17 15:37:06 -03:00
Klaus
7fb9bae75e Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-14 14:44:00 -03:00
Klauswk
38087a1669 Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:38:54 -03:00
Klaus
963248163d Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:14:02 -03:00
Klaus
55a9c0673e Handling chat messages 2017-07-11 13:57:54 -03:00
Klaus
90ca216507 Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-07 08:19:39 -03:00
Klaus
4c1c7ad65a Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages 2017-07-06 17:36:56 -03:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Klaus
9b63e0c215 Add caption messages 2017-06-29 17:22:09 -03:00
Klaus
93927a3b53 Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages 2017-06-29 09:22:34 -03:00
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Klaus Klein
e7e1243fef Add const to defaultLang 2017-06-06 09:43:57 -03:00
Klaus Klein
0d9525164f Add support to default system/browser language 2017-06-06 09:33:53 -03:00