Commit Graph

17465 Commits

Author SHA1 Message Date
Richard Alam
4248d7e4f9 Merge branch 'capilkey-move-chat-messages-2x' into bbb-2x-mconf 2017-07-08 08:41:58 -07:00
Richard Alam
77de38e2f3 Merge branch 'move-chat-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-chat-messages-2x 2017-07-08 08:41:20 -07:00
perroned
f77b29bad3 Restores 1.1 ss 2017-07-08 11:29:13 -04:00
Richard Alam
c442554cd7 Merge pull request #4059 from ritzalam/implement-meeting-status
Removing old messages
2017-07-08 11:07:59 -04:00
Richard Alam
0cf4227273 Merge branch 'implement-bbb-web-msgs' into implement-meeting-status 2017-07-08 08:04:13 -07:00
Richard Alam
2212d95a28 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into implement-meeting-status 2017-07-08 07:23:30 -07:00
Richard Alam
1320988a95 - handle register user properly 2017-07-08 07:22:45 -07:00
KDSBrowne
50eb4d81ef wrap form elements with label 2017-07-07 23:50:33 -07:00
KDSBrowne
44e918b9e6 remove if condition 2017-07-07 23:29:31 -07:00
Chad Pilkey
e30ba20323 avoid exception when cursor user isn't found 2017-07-07 20:16:43 -04:00
Chad Pilkey
bf9f6df9b1 remove all 1.1 chat messaging code 2017-07-07 20:16:14 -04:00
Chad Pilkey
550b880db7 convert chat messages to 2x 2017-07-07 19:14:00 -04:00
Ghazi Triki
436094cd6e Added new skin for ComboBox component. 2017-07-07 22:53:53 +01:00
Richard Alam
507cc69939 - fix compile issues 2017-07-07 14:51:25 -07:00
Fred Dixon
853984f535 Merge pull request #4057 from capilkey/remove-ss-from-presentation-2x
Remove screenshare from presentation
2017-07-07 17:42:36 -04:00
perroned
1b92aba481 Hangup and reconnect safely 2017-07-07 17:27:28 -04:00
Richard Alam
70c7ebc1a1 - continue removing old messages in akka-apps 2017-07-07 14:23:56 -07:00
perroned
f5650b1d16 Makes utility for webrtc capabilities 2017-07-07 17:06:52 -04:00
perroned
c08f9d4d7b Changes handler to WebRTC status class 2017-07-07 17:02:07 -04:00
perroned
cc497136e8 Add screenshare fallbacks 2017-07-07 17:01:53 -04:00
perroned
f92be502cc Moves constraints to initialization 2017-07-07 17:01:33 -04:00
Chad Pilkey
fc3d7a05aa remove the screenshare code from the presentation module 2017-07-07 17:01:27 -04:00
JaeeunCho
a3c8c61d80 HTML5 - added check that current meeting is existed or not 2017-07-07 13:58:55 -07:00
KDSBrowne
e615869472 adjust contrast in user avatar 2017-07-07 12:12:35 -07:00
Anton Georgiev
5970481ecd Merge pull request #4054 from JaeeunCho/bug_end_meeting_apimate
HTML5 - fixed errors when the meeting is ended by apimate
2017-07-07 13:20:19 -04:00
KDSBrowne
e4e15008dc add new line to end of file 2017-07-07 09:42:14 -07:00
KDSBrowne
0a81d59542 remove comments and more palette changes 2017-07-07 09:38:17 -07:00
KDSBrowne
7b25b7470d make shadow color more visible on toggle switch 2017-07-07 09:17:45 -07:00
KDSBrowne
44afafc448 fix color contrast issues 2017-07-07 09:11:22 -07:00
Anton Georgiev
a0f90f181d assign proper userId for assignedBy 2017-07-07 11:25:48 -04:00
JaeeunCho
28b81b32eb changed function to pass two parameters 2017-07-07 08:18:19 -07:00
Anton Georgiev
dd38cebe58 trigger UI changes if we are the presenter 2017-07-07 10:51:11 -04:00
Anton Georgiev
0ec660c8d3 handle assign presenter in flash client and akka apps 2017-07-07 10:32:38 -04:00
KDSBrowne
70cb30310b remove invalid ARIA attribute values 2017-07-07 06:53:44 -07:00
Klaus
743e128b0f Fix Poll display on html5 2017-07-07 09:18:54 -03:00
Klaus
4138f54f17 Fix Poll display on html5 2017-07-07 09:18:37 -03:00
Klaus
28b69208f9 Fix lint problems 2017-07-07 08:23:31 -03:00
Klaus
90ca216507 Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-07 08:19:39 -03:00
Klaus
8ef23a559e Fix lint problems 2017-07-07 08:17:49 -03:00
Richard Alam
a0ed7685ce - continue removing old code 2017-07-06 18:48:26 -07:00
Ghazi Triki
6123a83586 Improved ButtonSkin and implemented AudioSelectionWindow new design. 2017-07-07 00:42:57 +01:00
Richard Alam
2945c0e6fc - continue removing old messages 2017-07-06 14:50:34 -07:00
Klaus
4c1c7ad65a Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages 2017-07-06 17:36:56 -03:00
Anton Georgiev
3237f9a653 Merge pull request #4055 from Klauswk/html5-2x-getAll-messages
[Html5 2.0] Move Sync and Presentations Messages to 2.0
2017-07-06 15:57:52 -04:00
Klaus
3d091e7a26 Change if 2017-07-06 15:07:52 -03:00
Klaus
9b32a4db2d Remove 'nodeJSapp' stuff, is deprecated 2017-07-06 15:01:05 -03:00
prlanzarin
4b0b155d53 Added video-broadcast path to RTP->RTMP transcoder
Will turn that into a parameter later
2017-07-06 16:17:29 +00:00
KDSBrowne
889209b26d give ARIA attribute valid values 2017-07-06 09:17:14 -07:00
KDSBrowne
54c16c796a fix listitem element semantics 2017-07-06 09:01:59 -07:00
KDSBrowne
8aee85ed72 ensure form elements have labels 2017-07-06 08:54:18 -07:00