Anton Georgiev
eae765cc69
move styles.sccs to audio-test
2017-03-27 11:45:24 -04:00
KDSBrowne
93d1aed4c3
remove unneeded variable
2017-03-24 12:27:45 -07:00
Ubuntu
5e0a5f019c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-24 19:14:21 +00:00
Anton Georgiev
3107f3cae3
move audio-notifications under audio/
2017-03-24 12:38:49 -04:00
Anton Georgiev
8bb1386699
moved audio-modal and audio-settings under audio/
2017-03-24 12:01:35 -04:00
KDSBrowne
1edb4ec736
remove console log
2017-03-24 08:37:33 -07:00
KDSBrowne
a633492b98
move user and presenter views to main render function
2017-03-24 08:34:45 -07:00
Anton Georgiev
feac446be4
moved audio-menu under audio/
2017-03-24 11:34:03 -04:00
Anton Georgiev
d7eb3ba3a6
remove listen-only component
2017-03-24 11:26:18 -04:00
KDSBrowne
507393a09b
add missing import to fix JoinAudio btn
2017-03-24 07:56:08 -07:00
Anton Georgiev
8ca0fc1eb3
moved audio-settings under audio/
2017-03-24 10:55:42 -04:00
KDSBrowne
c26965e794
make actions button display only for Presenter
2017-03-24 07:49:38 -07:00
Anton Georgiev
e007a60e7d
Merge branch 'audio-ui-touches' into audio-restructuring
2017-03-24 10:46:46 -04:00
KDSBrowne
eb3ac219e9
fix merge conflicts
2017-03-24 07:25:25 -07:00
Anton Georgiev
5e36c97213
adjust audio modal ui
2017-03-24 10:24:23 -04:00
gcampes
c7f7d5b58a
Merge remote-tracking branch 'upstream/master' into settings-refactor
...
* upstream/master: (53 commits)
center modal title
HTML5 - removed unused imports, fixed variable names
Added a missing import
Updated icon sets to the latest
Moved the recording systemd scripts into the core directory
record-and-playback: Split rap-worker into separate workers per step.
cleanup
audio join - apply structure and style from designs
"Video Chat" Layout has a dark background, controls are and title are removed in this layout.
Delete unused layout event class and videconf view.
HTML5 - changed underscore to lodash
revert tabIndex change
add local folder
remove unused imports
move handleExitAudio to service
remove merge conflict
fix more linting issues
lint nav settings dropdown container
remove unused imports
change function name
...
2017-03-24 09:30:41 -03:00
Anton Georgiev
6b8e9146c7
Merge pull request #3751 from antobinary/audio-1
...
[HTML5] Modify the looks of the audio modal to match designs
2017-03-24 08:21:41 -04:00
Anton Georgiev
bd409e3919
Merge pull request #3749 from OZhurbenko/icons-update
...
Icons update and a missing import
2017-03-23 18:56:45 -04:00
Anton Georgiev
937f020ca1
center modal title
2017-03-23 18:50:30 -04:00
KDSBrowne
4b2928f2fb
remove span element
2017-03-23 12:13:09 -07:00
JaeeunCho
fd08d99b6f
HTML5 - removed unused imports, fixed variable names
2017-03-23 12:02:40 -07:00
JaeeunCho
aa2615b52b
Merge remote-tracking branch 'upstream/master' into close
2017-03-23 11:59:54 -07:00
KDSBrowne
d6bdbeb448
add aria-label for unread messages
2017-03-23 11:26:44 -07:00
Oleksandr Zhurbenko
0120e3cfe2
Added a missing import
2017-03-23 09:19:02 -07:00
KDSBrowne
e1bdeffa46
add missing import to fix JoinAudio Btn
2017-03-23 07:34:59 -07:00
KDSBrowne
c4c9ce5577
fix lint issues
2017-03-23 07:31:54 -07:00
KDSBrowne
918684b6c7
change variable name
2017-03-23 07:22:02 -07:00
KDSBrowne
2d876550db
merge with master
2017-03-23 07:16:47 -07:00
Anton Georgiev
d585e2f882
moved audio-test component under audio/
2017-03-23 09:19:44 -04:00
Anton Georgiev
a2e0029c65
drop Audio tab from settings
2017-03-23 08:53:04 -04:00
Anton Georgiev
a1f3d48819
cleanup
2017-03-22 16:52:41 -04:00
Ubuntu
a096e25a72
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-22 20:37:41 +00:00
Anton Georgiev
18508b2632
audio join - apply structure and style from designs
2017-03-22 16:10:49 -04:00
gcampes
8582c18be9
Merge conflicts
2017-03-22 10:00:37 -03:00
JaeeunCho
75dbfc23b6
HTML5 - changed underscore to lodash
2017-03-21 14:52:10 -07:00
perroned
c64c97b582
Html5 clean up
2017-03-21 21:46:41 +00:00
JaeeunCho
b81957da43
HTML5 - fixed conflict
2017-03-21 13:29:46 -07:00
perroned
8c338f42d2
Fixes bug with call not always going through x2
2017-03-21 17:00:58 +00:00
Anton Georgiev
5575d32438
Merge pull request #3730 from KDSBrowne/action-buttons-center
...
Actions Bar Positioning
2017-03-21 12:18:46 -04:00
Anton Georgiev
09833f6c22
Merge pull request #3740 from antobinary/br-kick
...
[HTML5] Handle properly 'Cancel' on breakout room invitation. Drop unused packages
2017-03-21 12:10:41 -04:00
Anton Georgiev
55ce33e7bb
revert tabIndex change
2017-03-21 12:09:44 -04:00
KDSBrowne
ceeb66ceed
Merge remote-tracking branch 'upstream/master' into Fullscreen-Label-Change
2017-03-21 08:50:09 -07:00
perroned
3dfb5bba43
Fixes bug with call not always going through
2017-03-21 15:42:14 +00:00
KDSBrowne
8f76ec495c
remove unused imports
2017-03-21 07:35:09 -07:00
KDSBrowne
7479570a8c
move handleExitAudio to service
2017-03-21 07:29:54 -07:00
KDSBrowne
79e1d0bcbe
fix more linting issues
2017-03-21 06:56:38 -07:00
KDSBrowne
25f745cf32
lint nav settings dropdown container
2017-03-21 06:52:59 -07:00
KDSBrowne
1234325a02
remove unused imports
2017-03-21 06:44:14 -07:00
KDSBrowne
d92a0f5188
change function name
2017-03-21 06:41:13 -07:00
Anton Georgiev
2223172612
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into br-kick
2017-03-20 14:44:51 -04:00
Anton Georgiev
a183595d73
improve check for dismiss object
2017-03-20 14:33:32 -04:00
gcampes
acb8b1155b
Merge conflicts
2017-03-20 15:00:04 -03:00
JaeeunCho
823c667cac
HTML5 - changed session method to props
2017-03-17 11:25:41 -07:00
Ubuntu
4da7d6d03f
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-17 15:55:23 +00:00
JaeeunCho
eb176e77ac
HTML5 - changed session and variables name
2017-03-17 08:27:37 -07:00
Oswaldo Acauan
72dc94ab31
Remove old Kicked screen in favor of the new error screen
2017-03-17 14:38:18 +00:00
Oswaldo Acauan
2090883b03
Refactor Auth logout and credentials getter
2017-03-17 14:23:00 +00:00
KDSBrowne
ed8fdf6f89
remove the else block
2017-03-16 17:29:58 -07:00
KDSBrowne
c6e08c5518
improve adding and removing of events
2017-03-16 17:06:34 -07:00
KDSBrowne
d2405d4c61
pass props down from createContainer
2017-03-16 16:30:46 -07:00
JaeeunCho
cb56e0771d
HTML5 - changed variable name
2017-03-16 15:39:34 -07:00
Oswaldo Acauan
f020964c50
Fix merge conflicts
2017-03-16 20:25:14 +00:00
Oswaldo Acauan
22bb1adab2
Refactor of the chat notification for unread messages
2017-03-16 19:57:45 +00:00
Oswaldo Acauan
8d21c435b5
Refactor of the App component
2017-03-16 16:52:43 +00:00
gcampes
b9f5eb7a94
Change dropdown styles
2017-03-16 11:56:39 -03:00
Anton Georgiev
59d6f12fad
Merge pull request #3734 from Gcampes/settings-refactor
...
[HTML5] Increases default font size
2017-03-16 10:34:29 -04:00
gcampes
9ac3c01b01
tweaks to the dropdown styling on mobile
2017-03-16 11:34:03 -03:00
gcampes
31adb14543
Increases default font size
2017-03-16 10:10:39 -03:00
gcampes
8ef43d9270
Remove unused code. Fix button size issue
2017-03-16 09:34:00 -03:00
gcampes
66e9680d48
Merge remote-tracking branch 'upstream/master' into dropdown-mobile-fix
...
* upstream/master:
add isBreakoutRoom on render
pass flag as a property
pass flag as a property
evaluate in container, pass boolean flag to component
apply recommendations from pr comments
reuse isMeetingBreakout
don't allow kick user in breakout rooms
Linting
Corrected the fix
[HTML5] Open first submenu for settings
Fixed permissions and some exceptions
2017-03-15 17:16:02 -03:00
gcampes
9ed21657c5
Adds localization to dropdown
2017-03-15 17:11:34 -03:00
Anton Georgiev
3a20663873
breakouts cancel join: only trigger callback if defined
2017-03-15 15:52:35 -04:00
Anton Georgiev
85a445b919
add isBreakoutRoom on render
2017-03-15 15:03:56 -04:00
gcampes
7c42f3a535
Makes dropdown usable on mobile devices
2017-03-15 15:09:20 -03:00
Anton Georgiev
70ad071d5b
pass flag as a property
2017-03-15 14:03:58 -04:00
Anton Georgiev
26582033f2
pass flag as a property
2017-03-15 13:54:40 -04:00
Anton Georgiev
29de597e10
evaluate in container, pass boolean flag to component
2017-03-15 13:43:03 -04:00
Anton Georgiev
9315b79b6c
apply recommendations from pr comments
2017-03-15 12:21:26 -04:00
KDSBrowne
8be9f4ee26
add label and role to close chat link
2017-03-15 08:53:12 -07:00
KDSBrowne
cafe64c0de
add aria-expanded to user-list button
2017-03-15 08:43:59 -07:00
KDSBrowne
c510921509
remove DropdownListSeparator
2017-03-15 08:36:42 -07:00
KDSBrowne
c4e8dffdb7
add landmark roles and labels
2017-03-15 08:24:57 -07:00
KDSBrowne
6fba48fae6
move openJoinAudio to container
2017-03-14 16:21:55 -07:00
KDSBrowne
dd34a9cbd7
change prop names
2017-03-14 15:34:57 -07:00
Anton Georgiev
64c43f4084
reuse isMeetingBreakout
2017-03-14 17:06:52 -04:00
Anton Georgiev
ae7aa7b3df
don't allow kick user in breakout rooms
2017-03-14 16:57:22 -04:00
KDSBrowne
e385e28445
rename open and close function
2017-03-14 10:17:59 -07:00
KDSBrowne
75f3f8cc2e
move if condition
2017-03-14 10:16:33 -07:00
KDSBrowne
c913d81578
rename open and close function
2017-03-14 09:40:17 -07:00
KDSBrowne
b112a5573e
add in suggestions
2017-03-14 09:32:50 -07:00
Gabriel Carvalho de Campes
bc969c8aad
[HTML5] Open first submenu for settings
2017-03-13 17:03:18 -03:00
Oswaldo Acauan
528be3979e
Fix merge conflicts
2017-03-13 17:19:43 +00:00
KDSBrowne
cc00f38602
move api function to container
2017-03-13 09:05:54 -07:00
KDSBrowne
251066045c
make mute button return null if not in Audio
2017-03-13 08:55:16 -07:00
Oswaldo Acauan
090890aacd
Move critical css to inline instead o external file
2017-03-13 14:38:32 +00:00
gcampes
ed4f1cf5c2
Fix issues based on PR comments
2017-03-13 08:48:00 -03:00
Oswaldo Acauan
2129979112
Fix error screen
2017-03-10 20:47:23 +00:00
Oswaldo Acauan
9c84105319
Add missing packages
2017-03-10 19:18:23 +00:00
Oswaldo Acauan
d6780c3013
Refactor Authentication flow
2017-03-10 18:33:46 +00:00
Oswaldo Acauan
be7f36e00c
Refactor the i18n server code
2017-03-09 19:50:21 +00:00
gcampes
985b9d6939
Change icon names to the new ones
2017-03-09 13:49:28 -03:00
gcampes
b422ab10e9
Merge conflicts
2017-03-09 11:42:31 -03:00
gcampes
417b2e4500
Fix issues based on PR comments
2017-03-09 11:34:33 -03:00
Oleksandr Zhurbenko
ccef7e9562
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update
2017-03-06 12:44:19 -08:00
perroned
dcdd4d0756
Cleans up html5
2017-03-06 20:30:07 +00:00
perroned
03b854e6b1
Update media service for new name
2017-03-06 19:34:30 +00:00
perroned
dab5adb5be
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-html5/imports/ui/components/media/container.jsx
bigbluebutton-html5/server/main.js
2017-03-06 19:21:40 +00:00
JaeeunCho
3fb3d614fa
HTML5 - changed comment and moved into block
2017-03-06 09:25:35 -08:00
JaeeunCho
e2964d2c8f
HTML5 - changed the location of slide's arrow buttons
2017-03-03 09:55:11 -08:00
JaeeunCho
3355ad5d82
HTML5 - did lint code and chaged it
2017-03-02 13:42:39 -08:00
JaeeunCho
a67ef17930
HTML5 - changed code for session
2017-03-02 12:33:49 -08:00
JaeeunCho
a485873bf2
Merge remote-tracking branch 'upstream/master' into close
2017-03-02 12:32:29 -08:00
Oleksandr Zhurbenko
7b3bc48be4
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update
2017-03-02 10:11:59 -08:00
Anton Georgiev
c92baed843
Merge pull request #3685 from OZhurbenko/whiteboard-restructuring
...
HTML5 Whiteboard Restructuring
2017-03-02 11:37:18 -05:00
Oleksandr Zhurbenko
80666bd688
Updated icons in the html5 client
2017-03-01 17:03:02 -08:00
Oleksandr Zhurbenko
7e54305850
Fixed warnings in the polling component
2017-03-01 14:55:44 -08:00
JaeeunCho
fa7d46af73
HTML5 - added session array for close private chat
2017-03-01 13:27:05 -08:00
gcampes
8d2a51a00a
Remove console log
2017-03-01 17:29:18 -03:00
gcampes
91da3e0262
Fix font size not showing in settings modal
2017-03-01 14:37:55 -03:00
gcampes
4918cf9160
fix bug with focus
2017-03-01 09:22:11 -03:00
JaeeunCho
775dd27309
HTML5 - added array for close private chat
2017-02-28 14:55:00 -08:00
JaeeunCho
07f45f695a
HTML5 - close private chat
2017-02-28 14:40:16 -08:00
perroned
05d32bdbd3
Removes html5 video player controls
2017-02-27 18:18:54 +00:00
gcampes
439e7a97f2
fix font size on modal cancel
2017-02-24 17:38:16 -03:00
gcampes
8e2bb6a799
revert unwanted changes
2017-02-24 17:35:41 -03:00
gcampes
420918abe8
merge conflicts
2017-02-24 17:28:42 -03:00
gcampes
ef6bc76ea3
remove old settings folder
2017-02-24 17:20:22 -03:00
gcampes
3c02848478
hide moderator settings, implement default settings
2017-02-24 17:19:53 -03:00
KDSBrowne
1de05d1f23
remove event listeners
2017-02-24 10:54:52 -08:00
Oleksandr Zhurbenko
fe01f81e27
changed slide-controls to presentation-toolbar
...
.. and removed duplicate strings from the locales
2017-02-23 12:20:21 -08:00
perroned
92c3cdb746
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
2017-02-23 19:20:37 +00:00
perroned
2f0b726ede
Missing comma
2017-02-23 19:05:53 +00:00
perroned
8916f6e0e5
Fixes deskshare restart - html5
2017-02-23 19:00:20 +00:00
Oleksandr Zhurbenko
48c3c5252e
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-restructuring
2017-02-23 10:26:03 -08:00
Oleksandr Zhurbenko
119beae88b
Restructured whiteboard code
2017-02-23 10:20:45 -08:00
Oleksandr Zhurbenko
09090eda13
Removed an unnecessary import from the cursor service
2017-02-23 10:20:29 -08:00
Oleksandr Zhurbenko
8f74e984ac
Restructured the whiteboard code
2017-02-23 10:19:59 -08:00
Oleksandr Zhurbenko
649b0a2738
Fixed presentation imports
2017-02-23 10:15:25 -08:00
Oleksandr Zhurbenko
10c8b86a0d
Renamed whiteboard to presentation
2017-02-23 10:14:35 -08:00
Oswaldo Acauan
8bd65c1a43
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Updated with correct version
Check for initial values in application.conf
remove defaultMessage
Remove wrong selector when upserting captions
Localize other labels through the application
localize labels for AudioSettings component
localize label for AudioTest component
hide option to reset status if there is no status (emojis)
drop voice in main room when joining breakout room
add defaultMessage for Public Chat
localize Join/Leave Audio labels
Remove console logs
Fix ´get_all_meetings_request´ being published multiple times
Clean captions when handling the history reply
Fix presentation slide coordinates
- when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
use localized Public Chat label
finish locals for the audio modal
Returning number of users that participated in each meeting in getRecordings call
add comment for condition
...
2017-02-23 17:46:30 +00:00
Oswaldo Acauan
f16926c94d
Refactor emojiStatus method
2017-02-22 13:11:47 +00:00
Oswaldo Acauan
09481987ce
Refactor assignPresenter method
2017-02-22 12:56:32 +00:00
gcampes
f941eaea3d
solve closed captions settings issue, continue settings implementation
2017-02-21 17:29:36 -03:00
Anton Georgiev
327ea70ce3
Merge pull request #3669 from antobinary/locals-2
...
HTML5: Localize more client side strings
2017-02-17 13:48:12 -05:00
Anton Georgiev
e7345ed7a2
remove defaultMessage
2017-02-17 13:44:17 -05:00
Anton Georgiev
1577fbd35a
Merge pull request #3591 from oswaldoacauan/refactor-api-captions
...
[HTML5] Refactor API Closed Captions
2017-02-17 13:21:20 -05:00
Anton Georgiev
f4ea3445d7
Localize other labels through the application
2017-02-16 17:14:10 -05:00
Anton Georgiev
216f494346
localize labels for AudioSettings component
2017-02-16 15:57:57 -05:00
Anton Georgiev
b1f0282c52
localize label for AudioTest component
2017-02-16 14:47:12 -05:00
Anton Georgiev
c6a15d6f7f
Merge pull request #3664 from antobinary/drop-voice-in-main
...
HTML5: Drop voice in main room when joining breakout room
2017-02-16 14:04:28 -05:00
