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
Anton Georgiev
3581023b91
hide option to reset status if there is no status (emojis)
2017-02-16 10:53:54 -05:00
gcampes
3243ff32cf
Changes to settings modal
2017-02-15 16:49:40 -02:00
Anton Georgiev
a8df05f3e6
drop voice in main room when joining breakout room
2017-02-15 13:36:30 -05:00
KDSBrowne
b0dfa33723
switch label if Esc key used to exit fullscreen
2017-02-14 11:57:37 -08:00
Anton Georgiev
9110468782
add defaultMessage for Public Chat
2017-02-14 13:12:01 -05:00
Anton Georgiev
f4516180e2
localize Join/Leave Audio labels
2017-02-14 11:28:21 -05:00
KDSBrowne
cbfaf16ac1
add formatted message to local file
2017-02-14 07:11:27 -08:00
Anton Georgiev
8bce68e137
use localized Public Chat label
2017-02-13 13:32:00 -05:00
KDSBrowne
f71f62d19a
modified previous code structure
2017-02-13 08:21:53 -08:00
Anton Georgiev
3362f76604
finish locals for the audio modal
2017-02-10 15:26:52 -05:00
Anton Georgiev
ac140be59a
Merge pull request #3653 from KDSBrowne/Chat-Scroll
...
HTML5 - Chat scroll fix
2017-02-10 13:51:53 -05:00
KDSBrowne
7df8502349
add comment for condition
2017-02-10 10:02:39 -08:00
KDSBrowne
f6c8b2e174
make condition less confusing
2017-02-10 09:59:00 -08:00
KDSBrowne
c80d11e1c3
remove console logs
2017-02-10 08:40:54 -08:00
KDSBrowne
a3ca561c6b
fix condition for shouldScrollBottom
2017-02-10 08:39:31 -08:00
Anton Georgiev
f2a2fcd8d7
Merge pull request #3643 from antobinary/close-tab-br
...
html5: Close breakout room browser tab when breakout room ends
2017-02-10 10:52:06 -05:00
Anton Georgiev
a6bd998684
Merge pull request #3648 from mmarangoni/chatbox-fix
...
Chat List Scrollbar Fix
2017-02-10 10:43:42 -05:00
Anton Georgiev
ad80d31b9a
instead of detecting user remove, track breakout end => close tab
2017-02-09 16:28:41 -05:00
KDSBrowne
d7e4dae341
Fix chat auto scroll
2017-02-09 08:04:18 -08:00
Anton Georgiev
577809b5a3
close breakout room tab when expired
2017-02-08 14:56:29 -05:00
Matthew Marangoni
b175d260ca
fixed scrollbar spacing in chat
2017-02-08 11:05:58 -08:00
Anton Georgiev
2863377ba7
Merge pull request #3637 from KDSBrowne/Audio-Err-Notification-Update1
...
HTML5 - Audio Notification Update1
2017-02-07 16:20:25 -05:00
KDSBrowne
47636857f4
discard notification if connection is successful
2017-02-07 07:16:04 -08:00
JaeeunCho
50b0790dfb
HTML 5 - changed css for divider
2017-02-06 09:44:38 -08:00
JaeeunCho
ed5afbbb90
Merge remote-tracking branch 'upstream/master' into record
2017-02-06 08:55:38 -08:00
Anton Georgiev
7ad046d8be
Merge pull request #3607 from KDSBrowne/Audio-Err-Notification
...
Audio Error notification
2017-02-02 15:37:05 -05:00
Anton Georgiev
d1176678d9
Merge pull request #3609 from KDSBrowne/Audio-Modal-Reduction
...
Add Transaprent Base for Audio Modal only
2017-02-02 12:07:54 -05:00
Anton Georgiev
10b0cfe893
Merge pull request #3611 from KDSBrowne/MuteButton-Voice-Inidicator
...
Mute button glow indicator
2017-02-02 12:06:49 -05:00
KDSBrowne
6c372ed68b
fix lint issues
2017-02-02 08:46:49 -08:00
JaeeunCho
94db42d7b1
HTML5 - changed divider of record button
2017-02-02 07:36:49 -08:00
perroned
1116cc0d1e
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-client/resources/config.xml.template
2017-02-02 15:27:08 +00:00
JaeeunCho
04c5fe1862
Merge remote-tracking branch 'upstream/master' into record
2017-02-02 07:04:31 -08:00
Anton Georgiev
3857d932b6
don't show promote option for presenter user'
2017-02-01 14:44:05 -05:00
KDSBrowne
c6ab4c2687
remove glow prop and use className to change style
2017-02-01 11:40:00 -08:00
Anton Georgiev
1ad5cc1959
reorganize user actions
2017-02-01 14:32:06 -05:00
Anton Georgiev
fc27dc9a5c
clean up
2017-02-01 14:27:25 -05:00
Anton Georgiev
0dbb8d62ca
allow for mute/unmute by moderator
2017-02-01 14:14:32 -05:00
KDSBrowne
1ab0b05e37
rename css class
2017-02-01 10:03:50 -08:00
Anton Georgiev
43922300e8
fix setPresenter and kick user
2017-02-01 11:47:39 -05:00
KDSBrowne
d6370a8808
add box shadow to button and remove label glow
2017-02-01 08:16:02 -08:00
Oswaldo Acauan
b1348fbfb8
Merge remote-tracking branch 'upstream/master' into refactor-api-captions
...
* upstream/master:
bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066
Cleanup formatting of port for nginx in bbb-conf --check
fixed userlist and chat scrolling in Firefox
Escaping Java's properties file instructions
In recording playback, chat links open in a new tab
cleanup
limit sound on unread chat via Settings and Config
2017-02-01 15:28:45 +00:00
Anton Georgiev
b069eed00d
Merge pull request #3613 from mmarangoni/chatbox-fix
...
Fixed userlist and chat scrolling in Firefox
2017-01-31 12:29:05 -05:00
KDSBrowne
f8bfc3ea15
remove duplication for setting color
2017-01-31 08:13:01 -08:00
KDSBrowne
868c615d6a
add getUserMedia failure message
2017-01-31 08:06:12 -08:00
KDSBrowne
3f367a782a
add formatted message
2017-01-30 07:42:58 -08:00
JaeeunCho
6689527505
HTML5 - changed property for checking recording status
2017-01-30 06:55:20 -08:00
JaeeunCho
1ab7cb7c48
Merge remote-tracking branch 'upstream/master' into record
2017-01-30 06:31:35 -08:00
Matthew Marangoni
e42e4c759a
fixed userlist and chat scrolling in Firefox
2017-01-27 14:13:25 -08:00
KDSBrowne
4c6e5a3225
extend overlay class and change background
2017-01-27 11:20:31 -08:00
KDSBrowne
cc3fb848c6
change mute button style if user is talking
2017-01-27 08:57:14 -08:00
gcampes
ce703d3b20
First changes to settings
2017-01-27 13:41:11 -02:00
KDSBrowne
25cff03cb6
rename overlayClassName
2017-01-27 07:35:09 -08:00
KDSBrowne
7ce0c175b9
fix inverted mute status icon
2017-01-27 06:41:22 -08:00
KDSBrowne
813a9a5958
remove duplication in base render
2017-01-27 06:32:54 -08:00
KDSBrowne
5adfec6b5a
remove duplicate component
2017-01-26 13:00:24 -08:00
KDSBrowne
9a72a8fa31
add transaprent base for audio modal
2017-01-26 12:19:09 -08:00
KDSBrowne
49e0ee642a
remove unneeded state variable
2017-01-26 08:45:47 -08:00
KDSBrowne
dbddb304cf
change render condition and move event to switch
2017-01-26 08:25:28 -08:00
KDSBrowne
61de5fe393
add user notification for audio failure
2017-01-25 11:52:17 -08:00
Oleksandr Zhurbenko
86c2cced74
Fixed closed-captions view box placement
2017-01-24 22:40:39 -08:00
JaeeunCho
99d685d818
HTML5 - changed divider of recorded icon
2017-01-24 15:06:57 -08:00
Anton Georgiev
64db5ef257
cleanup
2017-01-24 17:34:58 -05:00
Anton Georgiev
1b950f5e78
limit sound on unread chat via Settings and Config
2017-01-24 17:32:25 -05:00
JaeeunCho
c732e5774b
HTML5 - changed a variable name
2017-01-20 13:47:16 -08:00
JaeeunCho
0243b907e8
HTML5 - added a variable to check currentUser is moderator or the user is currently logged in
2017-01-20 13:38:40 -08:00
JaeeunCho
82eb561dc0
HTML5 - clear status on userlist
2017-01-20 12:13:14 -08:00
JaeeunCho
e6cfcb9ff8
Merge remote-tracking branch 'upstream/master' into slides
2017-01-20 11:16:57 -08:00
JaeeunCho
20399830be
HTML5 - changed arrow color of presentation
2017-01-20 10:49:16 -08:00
JaeeunCho
1ae6738cf0
HTML5 - moved the openChats() to outside of container
2017-01-20 09:50:03 -08:00
JaeeunCho
8312cee1a0
HTML5 - added openChat() in createContainer()
2017-01-17 14:09:32 -08:00
JaeeunCho
5cb5b98562
HTML5 - did lint code
2017-01-16 13:24:21 -08:00
JaeeunCho
5e2fa0fc09
HTML5 - changed componentDidUpdate() and added params
2017-01-16 10:03:02 -08:00
JaeeunCho
81a033c2fd
HTML5 - added checking prevProps is undefined
2017-01-16 07:56:21 -08:00
JaeeunCho
cdea93ad80
HTML5 - added playing sound automatically when the user gets new messages
2017-01-13 15:57:29 -08:00
JaeeunCho
8ef2959ee6
HTML5 - changed file because of conflict
2017-01-13 15:04:22 -08:00
Anton Georgiev
ab12796266
Merge pull request #3554 from KDSBrowne/Audio-Choice-Onload
...
Show audio modal on client load
2017-01-13 14:26:02 -05:00
KDSBrowne
5d3b8b9b6b
Use formatted messages for button labels
2017-01-11 10:00:31 -08:00
KDSBrowne
39d44cecd2
Change CSS to make audio modal buttons visible
2017-01-11 08:50:07 -08:00
KDSBrowne
fc87ca118c
Rename label for join audio button
2017-01-11 08:19:05 -08:00
KDSBrowne
08e6a32e2b
Show audio modal on client load
2017-01-10 15:14:23 -08:00
Anton Georgiev
0b739ad43c
Merge pull request #3534 from KDSBrowne/Audio-Join-UI-Revision
...
JoinAudio Modal UI Update
2017-01-10 11:16:56 -05:00
Anton Georgiev
370e78dd3b
Merge pull request #3535 from OZhurbenko/closed-captioning-ui
...
Closed Captions
2017-01-10 11:12:23 -05:00
KDSBrowne
ef9c98b0ec
fix merge conflict
2017-01-09 11:41:59 -08:00
Anton Georgiev
47c2fef149
Merge branch 'keyboard-nav' of github.com:mmarangoni/bigbluebutton into merge-3530
2017-01-09 18:42:02 +00:00
