Tainan Felipe
|
d2b29f8d29
|
add return in componentwillReceiveProps
|
2017-11-02 14:47:49 -02:00 |
|
Anton Georgiev
|
1fdd1f1353
|
Merge pull request #4585 from Gcampes/end-meeting-fix
Fix issue that prevented end meeting button to appear
|
2017-11-02 12:40:12 -02:00 |
|
Anton Georgiev
|
8b80d7e9c2
|
Merge pull request #4621 from Tainan404/fix-upload-percentage
[HTML 5] Rounds upload percentage, localize messages in presentation uploader
|
2017-11-02 11:03:03 -02:00 |
|
Anton Georgiev
|
63eb812f85
|
Merge pull request #4578 from OZhurbenko/meteor-react-16-update
React 16 and packages update
|
2017-11-02 10:41:45 -02:00 |
|
Gabriel Carvalho de Campes
|
333916e59a
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into end-meeting-fix
|
2017-11-02 10:38:06 -02:00 |
|
Richard Alam
|
06e974847e
|
- send validate conn token
|
2017-11-01 19:54:24 -07:00 |
|
Richard Alam
|
4e8f2abbb3
|
- pass token on video connect
|
2017-11-01 14:55:48 -07:00 |
|
Anton Georgiev
|
7e75432f41
|
Merge pull request #4623 from antobinary/add-multi-login-html5-flash
Add portal with HTML5 *AND* Flash entry point
|
2017-11-01 18:50:51 -02:00 |
|
Oleksandr Zhurbenko
|
e883995379
|
Breaking proptypes validation, sorry, any questions to @oswaldoacauan
|
2017-11-01 13:11:35 -07:00 |
|
Richard Alam
|
0e8ec5f3b4
|
Merge pull request #4622 from ritzalam/screenshare-chapter-breaks
Screenshare chapter breaks
|
2017-11-01 16:04:30 -04:00 |
|
Anton Georgiev
|
8f1dfe55f5
|
switch version to 2.0-beta
|
2017-11-01 16:02:14 -04:00 |
|
Anton Georgiev
|
05a31d53c1
|
add portal with html5 AND Flash entry point
|
2017-11-01 15:50:33 -04:00 |
|
Richard Alam
|
f9b4209d74
|
- make chapter break length configurable
|
2017-11-01 12:23:03 -07:00 |
|
Richard Alam
|
e71ac6bf0d
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into screenshare-chapter-breaks
|
2017-11-01 12:12:58 -07:00 |
|
Richard Alam
|
4e9185b68f
|
- add support for chapter break recording for screenshare
|
2017-11-01 12:12:14 -07:00 |
|
Anton Georgiev
|
548b63ecb9
|
Merge pull request #4620 from antobinary/pods_vol4
Presentation Pods - independent cursor control. Fully separate presenter assign control
|
2017-11-01 15:24:58 -02:00 |
|
Tainan Felipe
|
9db759074f
|
moved intl messages to locales/en
|
2017-11-01 14:37:44 -02:00 |
|
KDSBrowne
|
2de6540f89
|
fix audio modal close Btn scroll bug
|
2017-11-01 09:35:46 -07:00 |
|
Calvin Walton
|
a78997d1a1
|
Work in progress on segment archiving
|
2017-11-01 12:31:07 -04:00 |
|
KDSBrowne
|
ead38ef07c
|
use existing border-radius variable
|
2017-11-01 09:25:08 -07:00 |
|
KDSBrowne
|
6d18220921
|
remove outline showing around buttons
|
2017-11-01 09:22:37 -07:00 |
|
KDSBrowne
|
37c4380146
|
remove focus.scss from variables folder
|
2017-11-01 09:08:02 -07:00 |
|
KDSBrowne
|
900c20f86a
|
move and convert focus styles to mixins
|
2017-11-01 09:01:55 -07:00 |
|
Gabriel Carvalho de Campes
|
c9d7c9cae4
|
fix endmeeting handler with incorrect name
|
2017-11-01 13:47:14 -02:00 |
|
Anton Georgiev
|
5659b88b80
|
Merge pull request #4618 from OZhurbenko/fix-logClient-function-call
[HTML5] - Fixed a logClient function call
|
2017-11-01 13:24:10 -02:00 |
|
Anton Georgiev
|
d6a7e04715
|
avoid null items in presenter pod dropdown
|
2017-11-01 11:18:57 -04:00 |
|
KDSBrowne
|
26129e7141
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into z10-convert-styles-mixins
|
2017-11-01 08:10:13 -07:00 |
|
Anton Georgiev
|
9818fca29e
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
|
2017-11-01 09:56:58 -04:00 |
|
Tainan Felipe
|
c1df1da3c4
|
rounds the file upload percentage
|
2017-11-01 10:19:18 -02:00 |
|
Anton Georgiev
|
81d643bcde
|
handle pod presenter change on whiteboard toolbar and text toolbar
|
2017-11-01 07:05:20 -04:00 |
|
Anton Georgiev
|
28f1809a70
|
independent control of presenter for modules Present and Whiteboard
|
2017-10-31 18:49:25 -04:00 |
|
Richard Alam
|
c01d22096e
|
Merge pull request #4619 from ritzalam/synch-with-v2.0
Synch with v2.0.x
|
2017-10-31 18:05:10 -04:00 |
|
Richard Alam
|
72a1745c65
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-10-31 14:58:36 -07:00 |
|
Oleksandr Zhurbenko
|
6ba09a3184
|
Fixed a logClient function call
|
2017-10-31 14:52:18 -07:00 |
|
Richard Alam
|
c7ba367a39
|
Merge pull request #4617 from ritzalam/implement-multi-chat
- open guest window when new guest joins
|
2017-10-31 17:42:46 -04:00 |
|
Richard Alam
|
9ef812707c
|
- open guest window when new guest joins
|
2017-10-31 14:31:12 -07:00 |
|
Anton Georgiev
|
8450921362
|
separate cursor events depending on whiteboardId (pod)
|
2017-10-31 15:55:59 -04:00 |
|
Richard Alam
|
e665f2ac6e
|
Merge pull request #4616 from ritzalam/implement-multi-chat
- setup polling of guest while waiting for approval from moderator
|
2017-10-31 15:55:21 -04:00 |
|
Richard Alam
|
3056622283
|
- setup polling of guest while waiting for approval from moderator
|
2017-10-31 12:50:54 -07:00 |
|
Chad Pilkey
|
383893c517
|
Merge pull request #4611 from capilkey/implement-rights-management
Add some of the rights management checks
|
2017-10-31 13:46:26 -04:00 |
|
Chad Pilkey
|
db44e24b9d
|
Merge pull request #4609 from capilkey/load-swf-cdn
Allow loading SWFs from a CDN
|
2017-10-31 13:46:07 -04:00 |
|
Anton Georgiev
|
0b7424d147
|
Merge pull request #4615 from antobinary/pods_vol4
Presentation Pods - Handle default presentation pod missing ownerId
|
2017-10-31 15:42:08 -02:00 |
|
Anton Georgiev
|
8853d562ce
|
Merge pull request #4497 from Gcampes/audio-refactor
[HTML5] Refactor Audio
|
2017-10-31 15:39:37 -02:00 |
|
Gabriel Carvalho de Campes
|
2cca0c1724
|
change device selector key generation
|
2017-10-31 15:34:06 -02:00 |
|
Gabriel Carvalho de Campes
|
5237f200b5
|
removes console.log
|
2017-10-31 15:29:44 -02:00 |
|
Gabriel Carvalho de Campes
|
2e982114b5
|
Fix locale fetching issues
|
2017-10-31 15:13:44 -02:00 |
|
Chad Pilkey
|
a51274c7ad
|
add security check for ChangeUserEmoji
|
2017-10-31 13:07:53 -04:00 |
|
Chad Pilkey
|
3b91a87658
|
change two security checks to header userId from body
|
2017-10-31 13:06:00 -04:00 |
|
Chad Pilkey
|
7e47a08f29
|
allow users to mute themselves again
|
2017-10-31 13:05:07 -04:00 |
|
Gabriel Carvalho de Campes
|
fde5d56d87
|
change ask permissions timing, small code fixes
|
2017-10-31 08:53:06 -02:00 |
|