Commit Graph

17108 Commits

Author SHA1 Message Date
Richard Alam
955b162915 - send new presentation conversion progress messages 2017-07-04 10:32:30 -07:00
prlanzarin
89fe4df880 Merge branch '1.1-transcode' of https://github.com/pedrobmarin/bigbluebutton into 1.1-transcode-screenshare-merge 2017-07-04 16:27:14 +00:00
KDSBrowne
05d16db6e8 set unique id attribute 2017-07-04 08:09:23 -07:00
KDSBrowne
61672b4ac7 remove tabIndex attributes 2017-07-04 07:38:55 -07:00
KDSBrowne
33da4d391e add missing lang attribute 2017-07-04 07:32:22 -07:00
Richard Alam
caa49b84cd Merge branch 'bbb-2x-mconf' into implement-bbb-web-msgs 2017-07-04 07:20:08 -07:00
Richard Alam
c18f7e2f60 Merge branch 'pedrobmarin-2.0-sharednotes-messages' into bbb-2x-mconf 2017-07-04 07:17:46 -07:00
Richard Alam
dfabf2f224 Merge branch '2.0-sharednotes-messages' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-sharednotes-messages 2017-07-04 07:02:11 -07:00
Oswaldo Acauan
6f76fd30c6 Upgrade Meteor to 1.5 2017-07-04 09:40:02 -03:00
Pedro Beschorner Marin
962deb555d Removed synchronized blocks from sharednotes akka-app 2017-07-03 20:22:13 +00:00
Richard Alam
33b4cf45cd - remove not needed files 2017-07-03 12:31:34 -07:00
Fred Dixon
b6280ac915 Update README.md
Fixed typos.
2017-07-03 15:28:01 -04:00
prlanzarin
5b8109a566 Added support for Firefox WebRTC screensharing with KMS
Fixed Chrome getUserMedia constraints

Added client-side draft methods for HTML5 screenshare
2017-07-03 19:13:00 +00:00
Pedro Beschorner Marin
0c3d5990ff Replaced sharednotes mutable Stack undo/redo structures for immutable List 2017-07-03 17:29:39 +00:00
Pedro Beschorner Marin
79cf6bb623 Moved sharednotes messages to 2.0 format 2017-07-03 17:28:12 +00:00
prlanzarin
114be67f29 Added AVPF profile to WebRTC screenshare SDP
Some server-side cleanup
2017-07-03 16:54:00 +00:00
Klaus
86d3e27d47 Merged info with anton's branch 2017-07-03 12:05:35 -03:00
Richard Alam
8ca0d6c9fe - wire up new message path 2017-07-03 07:44:13 -07:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Anton Georgiev
189230cc43 Merge branch 'sync' into presentation-and-slides 2017-06-30 14:12:25 -04:00
Anton Georgiev
2e0f6d8610 trigger syncing with state from akka-apps 2017-06-30 11:19:11 -04:00
Anton Georgiev
19d89c6f92 trigger syncing with state from akka-apps 2017-06-30 10:58:49 -04:00
Klaus
be2caf92a3 Working poll vote 2017-06-30 11:26:19 -03:00
Klaus
5e868f37ac Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-polls-messages 2017-06-30 08:47:58 -03:00
Richard Alam
3f9ac22a1c Merge pull request #4041 from ritzalam/handle-guest-policy
Layout message and package reorg
2017-06-29 21:23:37 -04:00
Richard Alam
50acc517af Merge branch 'fix-2.0-layout' of https://github.com/capilkey/bigbluebutton into capilkey-fix-2.0-layout 2017-06-29 18:20:40 -07:00
Chad Pilkey
4e5df30ac4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout 2017-06-29 16:57:28 -04:00
Richard Alam
fcf41c9f61 - move to different packages 2017-06-29 13:55:37 -07:00
Chad Pilkey
9f904e6267 reorganized the layout code in akka-apps and fixed layout broadcast 2017-06-29 16:55:25 -04:00
Klaus
9b63e0c215 Add caption messages 2017-06-29 17:22:09 -03:00
Richard Alam
2c0a6adca6 Merge pull request #4039 from ritzalam/handle-guest-policy
Guest policy
2017-06-29 14:36:00 -04:00
Richard Alam
a11c45fa02 - implement handlers for guest policy 2017-06-29 11:34:08 -07:00
Chad Pilkey
15c938e9cd fixed layout message response and removed redundant props 2017-06-29 14:32:31 -04:00
Oswaldo Acauan
096b4d96a5 Update package-lock.json 2017-06-29 13:11:53 -03:00
Anton Georgiev
c9b877c465 Merge branch 'handle-messages' into presentation-and-slides 2017-06-29 10:39:00 -04:00
Anton Georgiev
ec8cf493d8 Merge pull request #4028 from Klauswk/html5-whiteboard-messages
Html5  - whiteboard messages 2x
2017-06-29 10:32:17 -04:00
Richard Alam
29052e6f79 - send layout response to requester user instead of whole meeting 2017-06-29 07:31:23 -07:00
Klaus
1c62543715 Remove check from meetingId 2017-06-29 10:27:59 -03:00
Klaus
27a92698cc Moved the meetingId to be last param 2017-06-29 10:09:11 -03:00
Klaus
6f93a5f9f6 Change to have default meeting param 2017-06-29 09:23:04 -03:00
Klaus
93927a3b53 Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages 2017-06-29 09:22:34 -03:00
Oswaldo Acauan
ace3afeb70 Remove console.log 2017-06-29 09:01:10 -03:00
Oswaldo Acauan
63522c6a95 Use flat package on mongo upsert 2017-06-29 08:54:19 -03:00
Richard Alam
0aed46c986 - add validate token handler tests 2017-06-28 14:56:35 -07:00
Klaus
2098c2dff7 Handle polls messages 2017-06-28 17:37:45 -03:00
Anton Georgiev
3ab794cbdb obtain meetingId outside handler 2017-06-28 16:04:41 -04:00
Anton Georgiev
5ca466c448 Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages 2017-06-28 15:24:46 -04:00
Anton Georgiev
7e798b96dd clearing some linting issues 2017-06-28 15:24:19 -04:00
Anton Georgiev
56da45f071 handle adding presentation, slide 2.0 2017-06-28 15:05:50 -04:00
Klaus
4a24769f20 Change var name 2017-06-28 15:34:22 -03:00