Commit Graph

25314 Commits

Author SHA1 Message Date
Tainan Felipe
ebd950e8ff Fix same name files failing in upload 2019-07-11 14:46:44 -03:00
Vitor Mateus
fc3f23266b Fix z-index 2019-07-11 10:49:06 -03:00
Ghazi Triki
3585998c40 Update all recording types link tags. 2019-07-11 13:47:30 +03:00
Richard Alam
e409190114 - convert tabs to spaces 2019-07-10 13:09:38 -07:00
Anton Georgiev
ad42acb16a
Merge pull request #7759 from KDSBrowne/add-locale-override
Add property in setting.yml to override default locale
2019-07-10 14:57:45 -04:00
Anton Georgiev
71a080a6ad
Merge pull request #7755 from KDSBrowne/issue-7747
Fix publishing second custom poll not working
2019-07-10 13:31:48 -04:00
KDSBrowne
5c8407ccb6 add undefined as default setting 2019-07-10 15:25:30 +00:00
KDSBrowne
4a9a833755 add browser locale detection override prop to settings.yml 2019-07-10 13:19:00 +00:00
Vitor Mateus
68ec6411aa Webcam draggable refactoring 2019-07-09 20:11:48 -03:00
KDSBrowne
220afa2f0d switch PureComponent with Component for Poll / lint issues 2019-07-08 22:57:10 +00:00
Anton Georgiev
3093c75b09
Bump up version to 2.2.0-beta-16 2019-07-08 17:26:26 -04:00
Anton Georgiev
a4328749b0
Merge pull request #7754 from antobinary/pull-locales-2
Pulled html5 logs July 8, 2019
2019-07-08 17:18:28 -04:00
Anton Georgiev
66f73def8c Pulled html5 logs July 8, 2019 2019-07-08 21:14:57 +00:00
Anton Georgiev
c3375cc2a0
Merge pull request #7752 from capilkey/fix-pingpong-crash
Fix crash from invalid online users
2019-07-08 15:10:03 -04:00
Chad Pilkey
cb58037ea1 fix crash from invalid online users 2019-07-08 19:04:12 +00:00
Fred Dixon
28cf3ec9cf
Bump to version 2.2-beta-15 2019-07-07 09:10:26 -04:00
Fred Dixon
aedb653fd5
Merge pull request #7738 from KDSBrowne/closed-captioning-access
Fix accessibility issues in closed captions
2019-07-06 22:50:28 -04:00
Fred Dixon
cea3010345
Merge pull request #7743 from capilkey/convert-users-upserts
Change unsafe Users upserts to updates
2019-07-06 22:49:41 -04:00
Fred Dixon
287ae8bcfb
Merge pull request #7742 from capilkey/b14-fix-exceptions
Fix HTML5 server exceptions
2019-07-06 22:49:03 -04:00
Chad Pilkey
87381b240e change unsafe Users upserts to updates 2019-07-06 23:47:33 +00:00
Chad Pilkey
e720bcf60c fix html5 server exceptions 2019-07-06 22:48:33 +00:00
Chad Pilkey
b336b12dcc
Merge pull request #7741 from capilkey/b14-fix-exceptions
Fix audio input selector
2019-07-06 18:11:35 -04:00
Chad Pilkey
c71de81b03 fix audio input selector 2019-07-06 22:04:05 +00:00
KDSBrowne
55b1ca8c77 fix accessibility issues in captions reader menu 2019-07-05 19:44:12 +00:00
Fred Dixon
d01c673825
Merge pull request #7737 from ffdixon/prepare-for-14
Prepare for 14
2019-07-05 15:17:38 -04:00
Fred Dixon
ee7d54145d Make release version 14 2019-07-05 14:16:50 -05:00
Fred Dixon
fe0442ce6d Make suggestion match docs 2019-07-05 14:16:29 -05:00
Fred Dixon
f57e1998b2
Change bbb-lti port so no conflict with tomcat7 2019-07-05 15:14:06 -04:00
Richard Alam
d30a413e40 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into keep-events-for-non-recorded-meeting 2019-07-05 09:14:32 -07:00
Richard Alam
ec1343931c - add comments to explain how rap-archive-worker and rap-events-worker work together 2019-07-05 08:57:51 -07:00
Richard Alam
40c6dd8827 - run post events scripts 2019-07-05 08:57:22 -07:00
Anton Georgiev
91f10e4f9b
Merge pull request #7733 from antobinary/pull-locales
Align You are disconnected label to the left; tweak label text
2019-07-05 11:38:54 -04:00
Anton Georgiev
cd2caf8175
Merge branch 'master' into pull-locales 2019-07-05 11:36:16 -04:00
Anton Georgiev
b496a7d39b align You are disconnected label to the left 2019-07-05 15:29:45 +00:00
Anton Georgiev
249e5b2c47
Fix typo in html5 en.json 2019-07-05 11:20:38 -04:00
Anton Georgiev
1ff3443542
Merge pull request #7731 from antobinary/pull-locales
Handle default value for isBreakoutUser property for dummy users
2019-07-04 18:02:26 -04:00
Anton Georgiev
aaf9810589 handle default value for isBreakoutUser property for dummy users 2019-07-04 21:58:30 +00:00
Anton Georgiev
f96ae6033a
Merge pull request #7692 from KDSBrowne/issue-7137
Fix blue screen after selecting share webcam (Chrome iOS)
2019-07-04 16:18:16 -04:00
Anton Georgiev
86d33bbc1c
Merge pull request #7712 from MaximKhlobystov/user-ejection-permission-error
Prevent user from being ejected when confirming start/stop recording or end meeting after losing moderator role
2019-07-04 15:29:02 -04:00
Anton Georgiev
8e9cf43f71
Merge pull request #7730 from antobinary/pull-locales
Pulled html5 locales Jul 4, 2019
2019-07-04 15:27:36 -04:00
Anton Georgiev
d9ccd4131f pulled html5 locales Jul 4, 2019 2019-07-04 19:25:43 +00:00
Maxim Khlobystov
5f6a1c3a08 Add additional checks to verify that the user exists + Small cleanup 2019-07-04 15:25:25 -04:00
Anton Georgiev
14162aef96
Merge pull request #7691 from diegobenetti/issue7671-take-ownership-button
Implements tooltip and label to the button to take over the captions
2019-07-04 15:07:08 -04:00
Anton Georgiev
f095f04fd3
Merge pull request #7702 from capilkey/fix-user-roles
Clean up user roles
2019-07-04 14:57:19 -04:00
Anton Georgiev
1622b4ad53
Merge pull request #7583 from jfsiebel/reconnection-improvement
Improve client reconnection
2019-07-04 14:53:35 -04:00
Anton Georgiev
c14e6074d9
Merge pull request #7708 from Tainan404/fix-user-leaving
Add ping-pong message to html5 client
2019-07-04 14:41:59 -04:00
KDSBrowne
392aac9857 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-7137 2019-07-04 18:37:40 +00:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
Richard Alam
61d9223a70 - format spaces to tabs 2019-07-04 11:07:57 -07:00
Anton Georgiev
595d46f9e2
Merge pull request #7727 from KDSBrowne/issue-7725
Fix cannot read property 'focus' of null
2019-07-04 14:02:22 -04:00