Commit Graph

3600 Commits

Author SHA1 Message Date
Bobak Oftadeh
21b84a5303 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b 2018-10-12 09:17:19 -07:00
Bobak Oftadeh
52aa4fd3c1 Mute meeting functionality implemented 2018-10-11 14:27:56 -07:00
Maxim Khlobystov
97ebd02595
Merge pull request #6090 from jfsiebel/ini-configuration-file
Remove settings and use yml file
2018-10-11 13:03:48 -04:00
Bobak Oftadeh
f4a6947313 Moved isModerator check to the user-options container 2018-09-26 09:04:53 -07:00
Tainan Felipe
33655682f0 change modal overlay color for client consistency 2018-09-25 17:29:54 -03:00
Bobak Oftadeh
7ced847512 Manage user button implemented 2018-09-25 09:31:27 -07:00
João Francisco Siebel
531f739f12 Merge remote-tracking branch 'upstream/master' into ini-configuration-file 2018-09-25 09:42:24 -03:00
João Francisco Siebel
68aa29de68 rename file and add users-settings subscription 2018-09-25 09:37:45 -03:00
Anton Georgiev
76180a0580
Merge pull request #6076 from jfsiebel/custom-user-settings
Custom user settings
2018-09-25 08:29:48 -04:00
João Francisco Siebel
296ef8fb88 Merge remote-tracking branch 'upstream/master' into HEAD 2018-09-24 14:46:17 -03:00
João Francisco Siebel
b832921be2 fix settings list 2018-09-19 17:34:23 -03:00
João Francisco Siebel
bb58a3fde6 let server handle parameters 2018-09-19 17:32:17 -03:00
Anton Georgiev
8c0394f52e
Merge pull request #6085 from oswaldoacauan/fix-missing-stuff-on-meeting-removal
Fix not clearing pods and token when removing a meeting
2018-09-19 14:45:02 -04:00
Anton Georgiev
7ca66965da
Merge pull request #6086 from oswaldoacauan/fix-6012
Fix fuzzy chat font rendering.
2018-09-19 14:40:32 -04:00
Anton Georgiev
8df901e0bf
Merge pull request #6087 from Tainan404/zoom-implementation
Zoom call only for presenter
2018-09-19 14:15:41 -04:00
Tainan Felipe
61c4c62e54 Zoom call only for presenter 2018-09-19 15:13:09 -03:00
Oswaldo Acauan
750f1bc35a Fix fuzzy chat font rendering. Closes #6012 2018-09-19 14:57:39 -03:00
Oswaldo Acauan
1c12b380a2 Fix not clearing pods and token when removing a meeting 2018-09-19 14:48:15 -03:00
Anton Georgiev
fd02b04a2d
Merge pull request #6025 from BobakOftadeh/chat-width-increased-window
Extended the Width of the Chat Area
2018-09-19 13:05:06 -04:00
Bobak Oftadeh
121e47982f Changed chat-width from pixel to precent. 2018-09-19 08:21:14 -07:00
Tainan Felipe
7d202ada62 Remove comment 2018-09-19 09:55:47 -03:00
Tainan Felipe
24e0fc55cd Remove unused code 2018-09-19 09:09:45 -03:00
João Francisco Siebel
6f8a3fd9cd read settings from ini file 2018-09-18 13:12:16 -03:00
Tainan Felipe
2d045b415c Put the hand by default in mobile 2018-09-18 11:16:11 -03:00
Tainan Felipe
210dbbbeaf Merge remote-tracking branch 'upstream/master' into zoom-implementation 2018-09-17 15:20:20 -03:00
Tainan Felipe
ab75ffdddd Add pinch and double-tap zoom 2018-09-17 15:02:52 -03:00
João Francisco Siebel
e750ceb0a1 make a single makeCall in auth 2018-09-17 14:05:39 -03:00
João Francisco Siebel
ebe4b83a10 remove unnecessary comments 2018-09-14 15:01:24 -03:00
João Francisco Siebel
ebad6cf6a4 remove debug 2018-09-14 14:53:29 -03:00
Anton Georgiev
f2092114e0
Merge pull request #6061 from BobakOftadeh/Userlist-spacing
Fixed locked user to have the same height as a default user
2018-09-13 15:25:06 -04:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Tainan Felipe
0372f736fc Add Double tap zoom and pan navigation 2018-09-12 11:36:04 -03:00
Bobak Oftadeh
5c3f6202b3 Fixed locked user to have the same height as a default user 2018-09-11 13:42:36 -07:00
Oswaldo Acauan
88f7d6d7dd Merge remote-tracking branch 'upstream/master' into upload-token 2018-09-11 16:17:38 -03:00
Oswaldo Acauan
5c9518bd27 Adjust the presentation upload to use the security token introduced in 2.1. Closes #4948 2018-09-11 16:00:49 -03:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
2018-09-10 15:09:55 -04:00
Anton Georgiev
cae1cc2190
Merge pull request #6052 from BobakOftadeh/publish-fix
Only propagate necessary information to client
2018-09-10 15:00:54 -04:00
Bobak Oftadeh
053e0f93fc Fixed issue where unnecessary information was being published to the client. 2018-09-10 08:34:25 -07:00
Anton Georgiev
7508f1d4f8
Merge pull request #6034 from KDSBrowne/02-iphone-polling-fix
Fix poll answers not being displayed on mobile safari
2018-09-10 10:08:51 -04:00
KDSBrowne
5f31deee11 use mq() instead of @media 2018-09-09 05:23:33 +00:00
Anton Georgiev
68e02efe80 add missing Meeting const in addUser.js 2018-09-06 22:33:32 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Anton Georgiev
681422dc61 fix listenOnly being interpreted as muted audio (client side) 2018-09-06 18:44:59 +00:00
Tainan Felipe
cce66b352e Add hand icon 2018-09-05 16:28:10 -03:00
Chad Pilkey
625e351af8 fetch fullInfo from Auth every time instead of caching 2018-09-04 13:28:04 -07:00
Chad Pilkey
c58d71533f
Merge pull request #6007 from fcecagno/multi-container-docker
Multi container docker
2018-09-04 15:30:30 -04:00
Tainan Felipe
e501b9e5cc Implement pan zoom 2018-09-04 14:37:36 -03:00
Anton Georgiev
73fd896fb0
Merge pull request #6032 from Tainan404/fix-safary-animaiton
Split animation to own span to run in safari.
2018-09-04 13:14:29 -04:00
Anton Georgiev
49c0e7b9b1
Merge pull request #5998 from MaximKhlobystov/ice-connection-state-errors-2
Better handling of screensharing ice connection state errors.
2018-09-04 13:14:08 -04:00
Anton Georgiev
8e553ab0c6
Merge pull request #5855 from musickiper/discard-cur-annotation-via-right-click
Add fuctionality for discard current annotation via right-click
2018-09-04 11:13:00 -04:00