Anton Georgiev
|
abf4a2b149
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into css-warnings
|
2019-02-14 18:35:38 +00:00 |
|
bobakoftadeh
|
540d909f07
|
Fix dropdown issue for firefox
|
2019-02-14 17:40:34 +00:00 |
|
Anton Georgiev
|
7968341f3a
|
Merge pull request #6776 from antobinary/meteor-version
Update meteor from 1.8.0.1 to 1.8.0.2 (patch)
|
2019-02-14 12:30:09 -05:00 |
|
bobakoftadeh
|
56d0d142fa
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into increase-display-name-area
|
2019-02-14 17:09:30 +00:00 |
|
Anton Georgiev
|
20d3a2bd54
|
Merge pull request #6563 from MaximKhlobystov/mobile-tooltip-target
Fix for the tooltip error on mobile
|
2019-02-14 11:55:51 -05:00 |
|
Vitor Mateus
|
61ceab5938
|
Updated the slide control toolbar look. #5191
|
2019-02-14 10:03:25 -02:00 |
|
Vitor Mateus
|
243baf50e7
|
Merge remote-tracking branch 'upstream/master' into issue-5191
|
2019-02-14 09:58:54 -02:00 |
|
Anton Georgiev
|
4b18d50b42
|
update npm packages versions
|
2019-02-13 19:44:21 +00:00 |
|
Anton Georgiev
|
627280ac41
|
update meteor from 1.8.0.1 to 1.8.0.2 (patch)
|
2019-02-13 18:55:58 +00:00 |
|
Anton Georgiev
|
babc34118d
|
add missed linting in user-notes
|
2019-02-13 18:46:59 +00:00 |
|
Anton Georgiev
|
7858eb6f4b
|
remove missing css class references
|
2019-02-13 18:44:05 +00:00 |
|
Joao Siebel
|
9cba56d0f9
|
fix drawing problem by guaranteeing points order. close #6038
|
2019-02-13 14:15:09 -02:00 |
|
Anton Georgiev
|
5776e9b432
|
Merge pull request #6716 from KDSBrowne/2.2-SR-cust-poll-options
Make SR announce poll inputs individually
|
2019-02-13 09:55:23 -05:00 |
|
Fred Dixon
|
e44365491b
|
Merge pull request #6768 from kepstin/break-captions
Break captions
|
2019-02-12 20:21:24 -08:00 |
|
Fred Dixon
|
e04365f84b
|
Merge pull request #6773 from ffdixon/fix-bbb-conf-20
Ensure default.yml is owned by bigbluebutton
|
2019-02-12 20:19:19 -08:00 |
|
Fred Dixon
|
6fe5439ae8
|
Ensure default.yml is owned by bigbluebutton
|
2019-02-12 22:18:42 -06:00 |
|
Maxim Khlobystov
|
5dc2051bf5
|
Put the code for finding the text for tooltip label into a recursive function
|
2019-02-12 17:20:46 -05:00 |
|
Richard Alam
|
9cfec5c229
|
Merge pull request #6772 from ritzalam/fix-signout-api-exception
- signout api throwing exception when it cannot find the user session
|
2019-02-12 17:14:21 -05:00 |
|
Richard Alam
|
361776a2fe
|
- signout api throwing exception when it cannot find the user session
|
2019-02-12 14:12:46 -08:00 |
|
Richard Alam
|
2317457cd1
|
Merge branch 'riadvice-redis-transaction'
|
2019-02-12 13:52:34 -08:00 |
|
Richard Alam
|
6657b9bf03
|
Merge branch 'redis-transaction' of https://github.com/riadvice/bigbluebutton into riadvice-redis-transaction
|
2019-02-12 13:25:37 -08:00 |
|
Anton Georgiev
|
c3f45bae64
|
Merge pull request #6769 from MaximKhlobystov/duplication-in-logs
Fix for duplication in logs
|
2019-02-12 16:01:48 -05:00 |
|
Anton Georgiev
|
101cf6af19
|
Merge pull request #6699 from pedrobmarin/fixes-6667
Reset to default view if screenshare or sync'ed video is initiated
|
2019-02-12 15:25:25 -05:00 |
|
Maxim Khlobystov
|
52525194fa
|
Make sure logContents is not duplicated
|
2019-02-12 15:13:35 -05:00 |
|
Anton Georgiev
|
9a7f18ae6e
|
Merge pull request #6722 from KDSBrowne/2.2-breakout-SR-timer
Prevent SR seeing timer notifications as alerts
|
2019-02-12 14:51:39 -05:00 |
|
Calvin Walton
|
d9f6ec7560
|
Revert "Wait until the media is ready before initializing the acorn player."
This reverts commit 04d31d300f.
|
2019-02-12 14:36:44 -05:00 |
|
Calvin Walton
|
08125c227b
|
Revert "Fix loading slide images in presentation format"
This reverts commit 4346b0fc9e.
|
2019-02-12 14:36:36 -05:00 |
|
Anton Georgiev
|
51e3cac2ff
|
Merge pull request #6761 from capilkey/fix-html5-ismoderator-check
Fix ActionBar moderator check
|
2019-02-12 14:30:23 -05:00 |
|
Ghazi Triki
|
78232d8b92
|
Remove RedisStorageService commands logging and use transactions for multiple commands.
|
2019-02-12 20:04:47 +01:00 |
|
Anton Georgiev
|
1a180bccd9
|
Merge pull request #6735 from antobinary/record-indicator
Recording toggle - allow clicking on the text && Restyling
|
2019-02-12 11:35:56 -05:00 |
|
Vitor Mateus
|
7998f46391
|
Modified presentation toolbar styles
|
2019-02-12 11:35:52 -02:00 |
|
Fred Dixon
|
ef52de0bbd
|
Merge pull request #6765 from ffdixon/fix-bbb-conf-18
Properly assign kurento[0].url in default.yaml
|
2019-02-11 23:59:48 -08:00 |
|
Fred Dixon
|
915393ba1a
|
Properly assign kurento[0].url in default.yaml
|
2019-02-12 01:58:47 -06:00 |
|
Chad Pilkey
|
b7ab7d2306
|
fix actionbar moderator check
|
2019-02-11 15:35:36 -08:00 |
|
Anton Georgiev
|
e7383f78ee
|
Merge pull request #6760 from BobakOftadeh/fix-remove-presentations
Fix remove presentation feature
|
2019-02-11 18:19:02 -05:00 |
|
bobakoftadeh
|
9c81a06e68
|
Fix removing presentation feature
|
2019-02-11 23:02:32 +00:00 |
|
Chad Pilkey
|
82721ed115
|
Merge pull request #6759 from ritzalam/fix-api-array-responses
- fix json response format for stuns and enter api
|
2019-02-11 17:44:41 -05:00 |
|
Richard Alam
|
e85e48c64a
|
- fix json response format for stuns and enter api
|
2019-02-11 14:38:15 -08:00 |
|
Anton Georgiev
|
38b743b895
|
Merge pull request #6711 from jfsiebel/sync-lock-settings-status
Sync meeting lock settings status
|
2019-02-11 17:34:44 -05:00 |
|
Anton Georgiev
|
094e4c90f4
|
Merge pull request #6758 from bigbluebutton/revert-6729-issue-6565
Revert "Fix error when user is not moderator"
|
2019-02-11 17:18:14 -05:00 |
|
Anton Georgiev
|
a61e3e17d3
|
Revert "Fix error when user is not moderator"
|
2019-02-11 17:14:35 -05:00 |
|
Anton Georgiev
|
208e806ced
|
Merge pull request #6733 from vitormateusalmeida/issue-6665
Fix sidebar elements appearance
|
2019-02-11 11:55:04 -05:00 |
|
Anton Georgiev
|
1b37c284a4
|
Merge pull request #6698 from vitormateusalmeida/issue-6601
Fix chat input between chats
|
2019-02-11 10:39:39 -05:00 |
|
Fred Dixon
|
6f7ffdf83d
|
Increase timeout for waiting for bbb-web to startup
|
2019-02-10 23:03:18 -08:00 |
|
Fred Dixon
|
e26df7cf06
|
Merge pull request #6754 from riadvice/fix-stun-turn
Fix API stuns call
|
2019-02-10 22:57:08 -08:00 |
|
Ghazi Triki
|
b2a4b1efbe
|
Fix API stuns call.
|
2019-02-11 07:56:13 +01:00 |
|
Fred Dixon
|
0c09e63d21
|
Merge pull request #6753 from ffdixon/fix-bbbconf-17
Clear previous SIP errors in sip.log
|
2019-02-10 22:24:53 -08:00 |
|
Fred Dixon
|
d2119bd29e
|
Clear previous SIP errors in sip.log
|
2019-02-11 00:23:10 -06:00 |
|
Fred Dixon
|
d2ff73145d
|
Merge pull request #6752 from ffdixon/fix-bbb-web-17
Restored declaration for PROTOCOL_RTMP
|
2019-02-10 20:41:19 -08:00 |
|
Fred Dixon
|
2e86350807
|
Restored declaration for PROTOCOL_RTMP
|
2019-02-10 22:40:36 -06:00 |
|