Tainan Felipe
|
2bab07044b
|
Remove merge conflict
|
2018-12-14 17:02:55 -02:00 |
|
Tainan Felipe
|
18ba3e402f
|
Merge remote-tracking branch 'upstream/master' into issue-6261
|
2018-12-14 17:01:19 -02:00 |
|
KDSBrowne
|
899c613c3c
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-12-14 17:28:30 +00:00 |
|
Tainan Felipe
|
b279dac9e9
|
Add mobile version to sort user on breakout rooms
|
2018-12-14 10:33:58 -02:00 |
|
Anton Georgiev
|
d80d78589f
|
Merge pull request #6346 from KDSBrowne/html5-packages-upgrade
HTML5 packages upgrade
|
2018-12-13 14:43:47 -05:00 |
|
KDSBrowne
|
46d29fd553
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-12-13 19:14:52 +00:00 |
|
Anton Georgiev
|
fbb12b055e
|
Merge pull request #6276 from Tainan404/issue-6262
Add drag & drop grid for breakout rooms
|
2018-12-13 11:35:24 -05:00 |
|
Bobak Oftadeh
|
5dfbafb30f
|
Implemented recording modal
|
2018-12-12 11:09:33 -08:00 |
|
KDSBrowne
|
775176d9cf
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-panel-manager
|
2018-12-12 17:35:22 +00:00 |
|
KDSBrowne
|
8b30fe00b3
|
Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade
|
2018-12-10 02:12:42 +00:00 |
|
KDSBrowne
|
462f20d9bb
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade
|
2018-12-05 20:54:37 +00:00 |
|
Maxim Khlobystov
|
b0cfc662c1
|
Fix the selectors in presentation tests
|
2018-11-30 15:56:21 -05:00 |
|
Tainan Felipe
|
d1ae927f6f
|
Add warn message and open the breakouts room when create
|
2018-11-29 17:47:04 -02:00 |
|
Tainan Felipe
|
fee219ed07
|
Fix console warning
|
2018-11-29 14:58:39 -02:00 |
|
Tainan Felipe
|
3561681e75
|
Change the buttons on actions bar to ghost buttons
|
2018-11-28 10:59:03 -02:00 |
|
Tainan Felipe
|
eb989ea6bb
|
Add selected state
|
2018-11-27 16:00:15 -02:00 |
|
Tainan Felipe
|
27e012ac56
|
Add drag and drop grid to sort user by room
|
2018-11-27 10:44:22 -02:00 |
|
Tainan Felipe
|
63a268b12f
|
Add intl to free join and change the state to true by dafault
|
2018-11-23 15:20:49 -02:00 |
|
Tainan Felipe
|
f6f1e696e1
|
Fix linter
|
2018-11-21 14:46:29 -02:00 |
|
Tainan Felipe
|
de66a7bd12
|
Add button for set free join status on create breakout room modal
|
2018-11-21 14:46:29 -02:00 |
|
KDSBrowne
|
149b4f091a
|
move render functions from app to panel-manager
|
2018-11-20 15:28:00 +00:00 |
|
KDSBrowne
|
99e15b20ba
|
add panel manager component
|
2018-11-19 23:29:48 +00:00 |
|
Anton Georgiev
|
e3729a7bf3
|
better updates
|
2018-11-12 22:09:04 +00:00 |
|
Anton Georgiev
|
98ac77dc03
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands
|
2018-11-12 17:01:06 +00:00 |
|
Tainan Felipe
|
164835d49b
|
Merge branch 'master' into breakout-room-html5
|
2018-11-09 13:49:15 -02:00 |
|
Anton Georgiev
|
adbe9bb546
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands
|
2018-11-08 19:34:57 +00:00 |
|
Oswaldo Acauan
|
a8c1df7f22
|
Upgrade all npm and meteor packages and fix compatibility issues introduced
|
2018-11-06 12:59:53 -02:00 |
|
KDSBrowne
|
c552b3522c
|
prevent breakout and poll pane both open
|
2018-11-05 17:52:06 +00:00 |
|
Tainan Felipe
|
fd8a63fbbb
|
Change the method permissions for moderator
|
2018-11-05 10:27:56 -02:00 |
|
KDSBrowne
|
538e248058
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-11-02 21:25:40 +00:00 |
|
Anton Georgiev
|
357f341a3e
|
Merge branch 'master' into breakout-room-html5
|
2018-11-02 09:26:09 -04:00 |
|
Anton Georgiev
|
04883ffcdb
|
handle iframe toggleRecording and toggle self muting
|
2018-11-01 15:03:16 +00:00 |
|
Joao Siebel
|
97a0a2a13b
|
configurable shortcuts available. close #6169
|
2018-10-31 15:51:56 -03:00 |
|
Tainan Felipe
|
07d89a0132
|
Add intl to breakout room name
|
2018-10-29 16:29:45 -03:00 |
|
KDSBrowne
|
ee73ec4dd3
|
remove left over react-router code
|
2018-10-28 17:02:54 +00:00 |
|
Tainan Felipe
|
32dd8c4740
|
migrate to session
|
2018-10-26 12:16:29 -03:00 |
|
Tainan Felipe
|
fceeca3795
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-26 11:52:54 -03:00 |
|
KDSBrowne
|
6a16b379d7
|
fix actions poll toggle not working when userlist is closed
|
2018-10-26 12:54:35 +00:00 |
|
KDSBrowne
|
8f24fcfd01
|
make userlist-poll btn toggle menu
|
2018-10-26 12:37:29 +00:00 |
|
KDSBrowne
|
3ced879e41
|
clean up togglePollMenu()
|
2018-10-25 22:41:45 +00:00 |
|
KDSBrowne
|
3f521a6f6a
|
Merge branch 'html5-theming' into test-merge-anton
|
2018-10-25 16:33:56 +00:00 |
|
KDSBrowne
|
abd5e8a224
|
update styling / fix bugs
|
2018-10-24 14:17:13 +00:00 |
|
Tainan Felipe
|
958bd406a6
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-23 14:53:46 -03:00 |
|
Tainan Felipe
|
1bc8ae0b21
|
add join audio only, and imporov UX
|
2018-10-23 14:18:09 -03:00 |
|
Oswaldo Acauan
|
f71d32a464
|
Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP
wip
wip
format
wip
Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
|
2018-10-23 14:21:58 -02:00 |
|
KDSBrowne
|
c8b993a3a9
|
remove use of router in polling
|
2018-10-18 14:31:17 +00:00 |
|
KDSBrowne
|
26404c87f7
|
remove button color type 'primary-outlined'
|
2018-10-02 23:08:32 +00:00 |
|
KDSBrowne
|
b241b93b8a
|
replace indexOf() with includes()
|
2018-10-02 20:30:32 +00:00 |
|
Tainan Felipe
|
ac09d4e69a
|
Add user list item and panel
|
2018-10-02 10:48:12 -03:00 |
|
Tainan Felipe
|
380b8b77e5
|
add intl messages
|
2018-09-28 15:09:15 -03:00 |
|
Tainan Felipe
|
cfd2e3f94b
|
Add create breakout rooms modal
|
2018-09-28 11:42:07 -03:00 |
|
Tainan Felipe
|
adbf0f0098
|
Add breakout room button
|
2018-09-25 14:03:09 -03:00 |
|
KDSBrowne
|
cf23293e10
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-09-25 12:44:38 +00:00 |
|
KDSBrowne
|
8320493e6a
|
add ability to start custom poll
|
2018-09-23 23:05:13 +00:00 |
|
KDSBrowne
|
589a9eb1fd
|
add btn to toggle poll url
|
2018-09-14 16:29:19 +00:00 |
|
João Francisco Siebel
|
4c35608c2b
|
Add users-settings collection and handle dynamic configuration
|
2018-09-13 15:09:30 -03:00 |
|
Maxim Khlobystov
|
fc3e46493e
|
Linting.
|
2018-08-23 11:49:16 -04:00 |
|
Maxim Khlobystov
|
242200ac91
|
Replaced Ice with ICE in strings.
|
2018-08-22 14:51:25 -04:00 |
|
Maxim Khlobystov
|
d67aba6c8a
|
Listening to ice connection failures when screensharing.
|
2018-08-22 14:10:08 -04:00 |
|
Anton Georgiev
|
ca873cd6da
|
Merge pull request #5839 from KDSBrowne/5782-move-set-status
Move set status menu to user item dropdown
|
2018-08-13 15:00:04 -04:00 |
|
KDSBrowne
|
f8026b1b9a
|
toggle screenshare btn color
|
2018-08-07 23:10:24 +00:00 |
|
KDSBrowne
|
155b36f929
|
add desktop unshare icon
|
2018-08-07 23:02:11 +00:00 |
|
KDSBrowne
|
f07599c4e5
|
make desk-share icon toggle / using temp icon
|
2018-08-03 01:34:48 +00:00 |
|
KDSBrowne
|
78c81880db
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 5782-move-set-status
|
2018-08-01 15:43:31 +00:00 |
|
Maxim Khlobystov
|
aa8c656d7d
|
Defaulting to desktop when browser detection package fails.
|
2018-08-01 11:10:21 -04:00 |
|
Anton Georgiev
|
ac581a97fb
|
Merge branch 'v2.0.x-release' into propTypes-screen-share
|
2018-07-25 09:52:56 -04:00 |
|
Bobak Oftadeh
|
1e28d8089e
|
Added propTypes to screenshare variables
|
2018-07-24 14:55:00 -07:00 |
|
Anton Georgiev
|
5e750bb3c6
|
resolve conflicts for 5822
|
2018-07-24 21:10:30 +00:00 |
|
Anton Georgiev
|
75e72e9e72
|
resolve linting issues
|
2018-07-24 21:09:17 +00:00 |
|
Bobak Oftadeh
|
95e62b42e6
|
Moved screen share check to a variable
|
2018-07-24 09:46:30 -07:00 |
|
Bobak Oftadeh
|
e1fbc5059b
|
Desktop share button moved to the action bar component
|
2018-07-20 10:07:10 -07:00 |
|
KDSBrowne
|
aae5cfbd92
|
fix reported bugs / impliment suggested changes
|
2018-07-11 20:08:22 +00:00 |
|
KDSBrowne
|
6a4a3ee160
|
remove emoji service functions from action-bar
|
2018-07-09 17:08:19 +00:00 |
|
KDSBrowne
|
341d19fa52
|
remove old way of setting emoji status
|
2018-07-09 16:14:07 +00:00 |
|
KDSBrowne
|
7896ab9fa8
|
fix menu functionality bugs / add status options
|
2018-07-08 18:53:52 +00:00 |
|
Maxim Khlobystov
|
c7464d6dc4
|
Tiny cleanup.
|
2018-06-21 11:25:47 -04:00 |
|
Maxim Khlobystov
|
c26de92c16
|
Disable screenshare init on mobile.
|
2018-06-21 11:04:00 -04:00 |
|
KDSBrowne
|
d96ed9da3a
|
edit names of access key constants
|
2018-05-01 17:02:45 -07:00 |
|
KDSBrowne
|
5fa65b4390
|
use shortcut config in components
|
2018-04-30 14:09:56 -07:00 |
|
Tainan Felipe
|
7c2309c382
|
change status message to comply with client
|
2018-04-18 14:34:03 -03:00 |
|
Anton Georgiev
|
33362036ff
|
Merge pull request #5351 from oswaldoacauan/dropdown-styling
Update on the Dropdown styling
|
2018-04-16 12:25:46 -04:00 |
|
Oswaldo Acauan
|
928097c7ad
|
Fix emoji selected item while hover
|
2018-04-13 17:38:15 -03:00 |
|
Oswaldo Acauan
|
d8e8fb99f0
|
Revert back all presentation stuff since its a lost battle. BabyRage
|
2018-04-13 09:58:47 -03:00 |
|
KDSBrowne
|
782bd1c65b
|
resolve lint issue
|
2018-04-03 18:04:25 -07:00 |
|
KDSBrowne
|
51c3dbb7a1
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into z-02-accessibility-zeeshan-3
|
2018-03-27 07:33:58 -07:00 |
|
KDSBrowne
|
8801a21f18
|
add access keys
|
2018-03-23 08:42:56 -07:00 |
|
Lucas Fialho Zawacki
|
65a2fb592f
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor
|
2018-03-20 17:22:11 +00:00 |
|
Anton Georgiev
|
d17ca71a60
|
Merge pull request #5157 from jfsiebel/implement-start-stop-recording-html5
Implement start stop recording html5
|
2018-03-09 14:28:14 -05:00 |
|
João Francisco Siebel
|
bfc2f6bc24
|
Fix when to see the record indicator
|
2018-02-28 11:10:00 -03:00 |
|
João Francisco Siebel
|
8f43508b4f
|
Linter some code and simplify action button logic display
|
2018-02-20 15:23:35 -03:00 |
|
João Francisco Siebel
|
56a9bf70ff
|
Change end to stop in labels
|
2018-02-19 15:42:22 -03:00 |
|
João Francisco Siebel
|
c2076c5260
|
Fix logic for showing start/end recording
|
2018-02-19 13:30:21 -03:00 |
|
Lucas Fialho Zawacki
|
388fee31b6
|
Renaming files to better suit html5 structure
|
2018-02-19 04:23:05 +00:00 |
|
João Francisco Siebel
|
919c2aa644
|
Implement start/stop recording logic
|
2018-02-15 17:42:50 -02:00 |
|
Augusto Bennemann
|
1d5bfce167
|
Fix share/unshare video button style and remove old files
|
2018-02-07 12:51:40 -02:00 |
|
Anton Georgiev
|
9b16ae8d51
|
Merge pull request #4938 from KDSBrowne/z.0.1-mobile-btn-alignmet
Fix alignment of ActionsBar buttons for small screens
|
2018-01-18 16:34:27 -02:00 |
|
Augusto Bennemann
|
975525fe9b
|
Fix keys usage on actions-dropdown
|
2018-01-17 19:51:33 -02:00 |
|
Augusto Bennemann
|
10cdd603bc
|
Fix null child element
|
2018-01-17 11:34:35 -02:00 |
|
Augusto Bennemann
|
5bf96b3c84
|
Screenshare button conditional rendering
|
2018-01-17 01:17:07 -02:00 |
|
Augusto Bennemann
|
90adda6a93
|
Display either 'start' or 'stop' screenshare button, if screenshare enabled on config
|
2018-01-16 17:12:41 -02:00 |
|
KDSBrowne
|
2e2a1609a4
|
resolve lint issue
|
2018-01-12 11:32:33 -05:00 |
|
KDSBrowne
|
9593b12904
|
remove css not being used
|
2018-01-10 09:22:03 -08:00 |
|
KDSBrowne
|
57424ecedd
|
add css class to align btns as presenter for small mobile screens
|
2018-01-10 07:44:21 -08:00 |
|
KDSBrowne
|
7c6e490b82
|
fix btn positioning using media queries
|
2018-01-09 13:13:31 -08:00 |
|
KDSBrowne
|
438afc6241
|
reduce margin between btns on action bar
|
2018-01-09 12:30:38 -08:00 |
|
Anton Georgiev
|
980a6490ec
|
Merge pull request #4832 from KDSBrowne/x.0.3-fix-console-warnings
Fix Invalid prop 'children[2]' supplied to `DropdownList`
|
2018-01-09 13:28:17 -02:00 |
|
Oleksandr Zhurbenko
|
ce1f40ac9a
|
Updated Meteor to 1.6.0.1
|
2018-01-07 22:17:18 -08:00 |
|
Oleksandr Zhurbenko
|
962e659378
|
Switched the components from deprecated method to
|
2018-01-07 20:44:42 -08:00 |
|
KDSBrowne
|
3fd964d3ca
|
remove import not being used
|
2018-01-03 09:04:28 -08:00 |
|
KDSBrowne
|
ed3d58f0f2
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into x.0.3-fix-console-warnings
|
2018-01-03 08:56:22 -08:00 |
|
prlanzarin
|
8608fd9f94
|
Tooltips for video buttons and actions-bar container service calls fixes
|
2017-12-21 17:40:00 +00:00 |
|
prlanzarin
|
3a72afa350
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
|
2017-12-21 17:37:07 +00:00 |
|
KDSBrowne
|
0868e98240
|
add comment to actions-dropdown component
|
2017-12-15 20:32:17 -08:00 |
|
KDSBrowne
|
f1cd5f2d6e
|
move _.uniqueId() out of render function
|
2017-12-15 20:25:41 -08:00 |
|
Joao Siebel
|
218890d8a6
|
Alter status tooltip to match selected status
|
2017-12-15 11:11:28 -02:00 |
|
KDSBrowne
|
b59106912a
|
fix console warnings
|
2017-12-14 09:31:05 -08:00 |
|
Joao Siebel
|
845692b9e5
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into hide-audio-labels
|
2017-12-14 09:01:38 -02:00 |
|
Joao Siebel
|
0d2276e8c5
|
Change actions button icon
|
2017-12-11 15:09:09 -02:00 |
|
Joao Siebel
|
8740b7aac6
|
Hide labels from actions, status, mute/unmute and join/leave audio buttons
|
2017-12-11 11:48:50 -02:00 |
|
prlanzarin
|
24e4317f9a
|
Removed unused methods from actions bar component
|
2017-12-08 16:32:08 +00:00 |
|
Tainan Felipe
|
b58248bafc
|
fix React warns in emoji select
|
2017-12-01 11:11:17 -02:00 |
|
Tainan Felipe
|
19723f3da1
|
change id of the intl
|
2017-11-30 08:29:52 -02:00 |
|
Tainan Felipe
|
c7c58fea51
|
remove whitespace and changes in package.json
|
2017-11-23 15:40:38 -02:00 |
|
Tainan Felipe
|
d15bb139bb
|
refactor emoji menu
|
2017-11-23 15:20:27 -02:00 |
|
Tainan Felipe
|
0d25ba5ae7
|
add blue color on emoji menu for ethe emoji selected
|
2017-11-21 08:50:20 -02:00 |
|
Tainan Felipe
|
1e53a17522
|
changed color value by css variable and fix variable declared wrong
|
2017-11-13 13:44:01 -02:00 |
|
Tainan Felipe
|
cb46c8f70c
|
fix design issues
fix design issues
|
2017-11-13 10:58:04 -02:00 |
|
prlanzarin
|
f43b77c19f
|
Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
bigbluebutton-html5/imports/startup/client/base.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/app/container.jsx
bigbluebutton-html5/imports/ui/components/screenshare/service.js
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
|
2017-11-11 03:41:37 +00:00 |
|
prlanzarin
|
2166b56304
|
Added toggle options for kurento video/screensharing in the HTML5 config yaml
Also made cam button respond to those config values
|
2017-11-10 21:08:40 +00:00 |
|
prlanzarin
|
e96fc385f1
|
Handling HTML5 screensharing stop
The action bar stop button is temporary
|
2017-11-06 15:39:55 +00:00 |
|
Gabriel Carvalho de Campes
|
cf73251feb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-26 16:26:19 -02:00 |
|
Anton Georgiev
|
967be17440
|
Merge pull request #4521 from Tainan404/fix-presenter-modal-bug
[HTML5] Fix presentation upload modal bug
|
2017-10-24 17:02:47 -02:00 |
|
gcampes
|
d32330b208
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-24 11:19:58 -02:00 |
|
Tainan Felipe
|
8e2f29e667
|
changed assign of the function
|
2017-10-24 08:52:44 -02:00 |
|
Tainan Felipe
|
98b23640fd
|
solve bug no disppear modal presentation-upload
|
2017-10-12 21:12:00 -03:00 |
|
Tainan Felipe
|
4bda76c5bb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-12 15:36:52 -03:00 |
|
gcampes
|
fafbba06cb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-12 13:58:39 -03:00 |
|
gcampes
|
6b44504e5d
|
Adds timeout to transfer, fix css, remove logs
|
2017-10-12 11:49:50 -03:00 |
|
Oleksandr Zhurbenko
|
015ca3d719
|
Changed imports and removed 'initializeCursor.js' since it's not needed
|
2017-10-11 19:00:28 -07:00 |
|
gcampes
|
3cba60201e
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
|
2017-10-11 18:22:36 -03:00 |
|
gcampes
|
02cdcb2562
|
changes to styles and texts in audio flow
|
2017-10-10 15:03:29 -03:00 |
|
prlanzarin
|
67da01e81c
|
Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare
|
2017-10-10 17:10:03 +00:00 |
|
Tainan Felipe
|
5393051d9d
|
fix errors linter
|
2017-10-10 10:06:34 -03:00 |
|
Oswaldo Acauan
|
38c8ff4abc
|
Update emoji menu to use emoji constants
|
2017-10-06 13:49:46 -03:00 |
|
Oswaldo Acauan
|
29117285ef
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into qa-design
|
2017-10-06 11:59:07 -03:00 |
|
Oswaldo Acauan
|
89c2947d78
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge
|
2017-09-29 17:32:31 -03:00 |
|
gcampes
|
6d0d6f6651
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor
|
2017-09-29 10:52:12 -03:00 |
|
Oswaldo Acauan
|
bb94ed6b25
|
Remove unused defaultProps
|
2017-09-29 10:51:41 -03:00 |
|
Oswaldo Acauan
|
4ac554af56
|
Fix typo
|
2017-09-29 10:51:17 -03:00 |
|
Oswaldo Acauan
|
0300b854d5
|
Update emoji icon status when selected
|
2017-09-28 15:58:25 -03:00 |
|