Commit Graph

17187 Commits

Author SHA1 Message Date
Klaus
dfa13b30f6 Add comment to change in the redis2x 2017-07-06 09:56:39 -03:00
Klaus
94da6f636f Merge branch 'html5-2x-getAll-messages' of https://github.com/Klauswk/bigbluebutton into html5-2x-getAll-messages 2017-07-06 09:32:14 -03:00
Klaus
2058e14ae7 Fix lint problems 2017-07-06 09:29:17 -03:00
Klaus
cc38576f79 Add missing events 2017-07-06 08:58:38 -03:00
JaeeunCho
440c675e23 made function for duplicated code 2017-07-05 15:56:13 -07:00
Richard Alam
246fded4ff - start removing old out messages 2017-07-05 14:08:30 -07:00
JaeeunCho
fd2b5926bc changed error to warn and add clearUsers 2017-07-05 13:16:21 -07:00
Klauswk
ebb3984828 Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages 2017-07-05 15:28:35 -03:00
Richard Alam
44f7b0c622 - remove old users model 2017-07-05 11:20:48 -07:00
prlanzarin
f26a275b05 Updated kurento lib in BigBlueButton.html
Generic addresses for Kurento on the screenshare server
2017-07-05 17:58:19 +00:00
Ghazi Triki
859b0cd33d Updated to mdi window buttons and style. 2017-07-05 18:38:44 +01:00
Klaus
3f445bc92e Change log 2017-07-05 14:26:22 -03:00
Anton Georgiev
23f4521954 Merge pull request #4038 from oswaldoacauan/flat-add-meeting
[HTML5 2.0] Add flat package and implement on addMeeting modifier
2017-07-05 11:13:23 -04:00
JaeeunCho
1a1fb6dc57 HTML5 - fixed errors when the meeting is ended by apimate 2017-07-05 07:59:18 -07:00
Ghazi Triki
8bf90835ec Replace main png logo by a swf logo. 2017-07-05 15:56:53 +01:00
Ghazi Triki
fff2ad8f50 Updated layout.xml by adding gaps between windows. 2017-07-05 15:18:43 +01:00
Chad Pilkey
f0ce1c416f change main app shell resize handler 2017-07-04 17:17:56 -04:00
Anton Georgiev
054b53b591 Merge pull request #4049 from oswaldoacauan/meteor-1.5
[HTML5 2.0] Upgrade Meteor to 1.5
2017-07-04 17:07:43 -04:00
Anton Georgiev
80b18c212f Merge pull request #4051 from ritzalam/implement-bbb-web-msgs
handle messages from akka-apps
2017-07-04 17:06:42 -04:00
Richard Alam
50d73880bd - cleanup 2017-07-04 13:02:51 -07:00
Richard Alam
53bdd7f008 - handle messages from akka-apps to update meeting state in bbb-web used to return
in GetMeetingInfo API requests
2017-07-04 12:58:26 -07:00
Anton Georgiev
416d47a445 Merge pull request #4050 from ritzalam/implement-bbb-web-msgs
Tested, worked as expected
2017-07-04 15:49:24 -04:00
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
Ghazi Triki
97ba9e29a4 Implemented progress bar skins. 2017-07-04 16:44:39 +01:00
KDSBrowne
05d16db6e8 set unique id attribute 2017-07-04 08:09:23 -07:00
Ghazi Triki
fccf1920f2 Added SourceSansPro font as default font. 2017-07-04 15:51:53 +01: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
Ghazi Triki
5cb30b7bc3 Activated old button icons from legacy default theme. 2017-07-04 15:26:56 +01: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
Ghazi Triki
b4ee163e33 Added v2 styles for Alert, Button and CombBox. 2017-07-04 12:08:45 +01: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
Ghazi Triki
d5e0098a52 Added new theme named V2Theme with a brand fresh new style. 2017-07-03 18:36:53 +01:00
Ghazi Triki
b1a8ba17b6 Added SkinningApplication.mxml to test new theme implementation. 2017-07-03 18:35:40 +01:00
Ghazi Triki
8c4e58b111 Do not load style embedded to the application by default. 2017-07-03 18:34:15 +01: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