KDSBrowne
538e248058
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
2018-11-02 21:25:40 +00:00
Joao Siebel
97a0a2a13b
configurable shortcuts available. close #6169
2018-10-31 15:51:56 -03:00
KDSBrowne
0551691684
edit css styles
2018-10-26 01:40:15 +00:00
KDSBrowne
935eb1289d
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
2018-10-25 18:39:26 +00:00
Anton Georgiev
14543bb478
adjust chat title
2018-10-25 18:03:25 +00:00
Anton Georgiev
a5c2ddc602
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
2018-10-25 17:58:00 +00:00
KDSBrowne
3f521a6f6a
Merge branch 'html5-theming' into test-merge-anton
2018-10-25 16:33:56 +00:00
KDSBrowne
47218ea351
Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton
2018-10-25 16:18:31 +00:00
Anton Georgiev
ff837fdd09
drop unnecessary Boolean() wrapper
2018-10-25 15:20:37 +00:00
Oswaldo Acauan
1de297c1e2
Fix line-heights and convert scss calculations to calc()
2018-10-24 17:32:09 -02:00
KDSBrowne
9c3a21641b
prevent chat / poll pane being open at the same time
2018-10-24 14:29:51 +00: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
Anton Georgiev
1b9a73a31c
use Session.equals syntax
2018-10-16 17:52:18 +00:00
Anton Georgiev
30c43795af
work on chat alert
2018-10-16 17:48:27 +00:00
Anton Georgiev
b2df10c635
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
2018-10-16 16:06:37 +00:00
Anton Georgiev
58f8738084
Merge branch 'post-router-style-fix' of github.com:KDSBrowne/bigbluebutton into remove-react-router
2018-10-16 15:51:18 +00:00
KDSBrowne
e795cacd97
fix styles for hide public chat btn
2018-10-16 14:33:42 +00:00
Anton Georgiev
0d1b085d54
improved on logic for open private chat
2018-10-15 20:03:17 +00:00
Anton Georgiev
4059fd5fa9
mostly recovered chat. needs UI love and handling of unread
2018-10-11 20:41:37 +00:00
João Francisco Siebel
74dfa52071
handle system messages on main public chat
2018-10-08 11:22:45 -03:00
Anton Georgiev
02905fb90d
react-router removed, lots of code commented out, client loads
2018-10-03 16:14:10 +00:00
Oswaldo Acauan
750f1bc35a
Fix fuzzy chat font rendering. Closes #6012
2018-09-19 14:57:39 -03: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
e03eccab2e
combine isViewer and isLocked by using existing property from mapUser
2018-08-29 17:21:39 +00:00
Anton Georgiev
e756ce1548
comply to lock settings for chat
2018-08-29 16:00:53 +00:00
KDSBrowne
29bcbea923
rename to alerts / missing from #5973
2018-08-15 02:35:58 +00:00
KDSBrowne
fed85fba48
Update font size of chat input to match the text display in the chat area
2018-08-14 19:16:11 +00:00
Anton Georgiev
1e8a4cf1e7
Merge pull request #5973 from KDSBrowne/5963-notifications-rename
...
Rename 'push notifications' to 'alerts'
2018-08-14 13:13:31 -04:00
KDSBrowne
fecbee16b5
change folder / component names & localized strings
2018-08-09 17:02:18 +00:00
Joao Siebel
32516bfbbf
implement welcome message and clear message in group chat messages
2018-08-03 11:03:16 -03: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
Joao Siebel
03389a8adc
fix unread message counter for private chats
2018-07-31 14:13:36 -03:00
João Francisco Siebel
655483576f
fix unread messages counter on public chat and remove some old chat configurations
2018-07-27 10:44:21 -03:00
Joao Siebel
d8391f450b
use group chat messages in html5 client
2018-07-26 11:56:26 -03:00
KDSBrowne
7896ab9fa8
fix menu functionality bugs / add status options
2018-07-08 18:53:52 +00:00
JamesJung
7350c1f81b
Don't push chat notification if chat is open ( #5773 )
...
* Make the public/private chat notification not to be pushed when public/private chat is opened
* Make the public/private chat notification not to be pushed when public/private chat is opened
* Make the public/private chat notification not to be pushed when public/private chat is opened
* Make the public/private chat notification not to be pushed when public/private chat is opened
* Make the public/private chat notification not to be pushed when public/private chat is opened
* Make the public/private chat notification not to be pushed when public/private chat is opened
* Change variable name to more make sense
* Refactoring codes to make functions more readable
* Remove useless condition code
* Remove useless variable and condition
2018-07-06 11:23:47 -03:00
Tainan Felipe
9756517392
fix white blocks when hover toast
2018-07-06 09:08:50 -03:00
James Jung
304c067e26
Fix the problem partially hiding the post button when typing chat on iphone
2018-06-28 13:12:50 -04:00
James Jung
733aa46c6b
Fix the problem partially hiding the post button when typing chat on iphone
2018-06-22 16:55:14 -04:00
Anton Georgiev
eee7f64763
Merge pull request #5713 from musickiper/logChat-cause-resize-problem
...
Prevent long chat message to make the chat area of the client to be resized
2018-06-19 10:03:11 -04:00
Anton Georgiev
2d7cc12603
Merge pull request #5669 from MaximKhlobystov/chat-counter
...
Chat counter and scrolling
2018-06-18 10:34:27 -04:00
Maxim Khlobystov
327f101657
Minor cleanup.
2018-06-15 14:37:57 +00:00
Maxim Khlobystov
ea81b8c203
Adjusted the interval between chat notifications and their lifetime.
2018-06-15 14:22:56 +00:00
Tainan Felipe
c677bc4e09
fix css identation
2018-06-13 17:18:16 -03:00
Maxim Khlobystov
304582b9ec
Passing scrollArea ref instead of its getter.
2018-06-12 19:47:51 +00:00
Tainan Felipe
46807039a4
add a small style for toast notification and add a content prop in toast
2018-06-12 14:21:31 -03:00
Maxim Khlobystov
49243d9170
Fixed the chat counter and how it reacts on scrolling in the chat.
2018-06-12 17:03:13 +00:00
James Jung
855d22fe00
Prevent long chat message to make the chat area of the client to be resized
2018-06-11 15:57:17 -04:00
Tainan Felipe
e59c8df71e
Remove unnecessary export
2018-05-29 14:32:41 -03:00
Tainan Felipe
bfc2e5bc25
remove unnecessary width
2018-05-29 13:50:06 -03:00
Tainan Felipe
b180a7c350
add messages for chat notification and add link to chat
2018-05-29 13:43:11 -03:00
Tainan Felipe
2fc98a4645
add redirect to chat in toast notification
2018-05-18 08:54:26 -03:00
Anton Georgiev
b6b93d8903
Merge pull request #5497 from musickiper/absPathToRelPath
...
Change abs paths to use baseName config
2018-05-16 08:51:05 -04:00
Maxim Khlobystov
a0497b2dd9
Assign server time to outgoing chat messages.
2018-05-15 16:08:30 -04:00
KDSBrowne
a53dc8a294
prevent chat scroll bar and re-size handle overlap
2018-05-13 16:41:29 -07:00
James Jung
583725053c
Change some files permission from 755 to 644
2018-05-08 16:05:04 -04:00
James Jung
ae9d92ea16
Update absolute paths to use baseName config
2018-05-07 19:15:50 -04:00
KDSBrowne
57f3f4389c
add functions to deviceInfo utility / improve shortcut modal
2018-05-02 11:55:46 -07: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
ebbff66e1b
Fix username cliped in right side
2018-04-18 09:44:52 -03:00
Tainan Felipe
399cf2d135
Remove position absolute
2018-04-17 09:55:20 -03:00
Tainan Felipe
84bfca2244
fix username clipped in chat and userList
2018-04-06 16:56:06 -03:00
KDSBrowne
782bd1c65b
resolve lint issue
2018-04-03 18:04:25 -07:00
KDSBrowne
8801a21f18
add access keys
2018-03-23 08:42:56 -07:00
KDSBrowne
ae7b561b9d
hide more messages btn from screen reader
2018-03-21 08:50:28 -07:00
Anton Georgiev
bd56a9e1e9
Merge pull request #4996 from Tainan404/fix-clear-chat
...
Fix issue #4992 . Unable to clear chat.
2018-01-23 14:14:35 -02:00
Tainan Felipe
4301ee6ef7
fix issue #4992
2018-01-19 15:38:04 -02:00
Maxim Khlobystov
927a2bf005
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into selenium-visual-regression
2018-01-09 15:38:29 -05: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
Maxim Khlobystov
9ebc82d29f
Committing additional test specs.
2018-01-08 21:43:34 -05:00
Anton Georgiev
0392634f57
Merge pull request #4841 from MaximKhlobystov/reopen-private-chat-bug
...
[HTML5 Client] Fix for reopening private chat after using X button
2018-01-08 18:42:36 -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
Maxim Khlobystov
9f6d25ab45
Small comment.
2017-12-18 15:12:31 -05:00
Maxim Khlobystov
b9b73de839
Applied the private chat fix to Chat container.
2017-12-18 15:01:13 -05:00
Maxim Khlobystov
cab6d1a19e
Made Chat container a class component
2017-12-18 14:56:08 -05:00
Maxim Khlobystov
56b04d6831
Converted Chat component back to its stateless version.
2017-12-18 14:45:40 -05:00
Maxim Khlobystov
3937a01ffd
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into reopen-private-chat-bug
2017-12-18 13:04:42 -05:00
Maxim Khlobystov
6d84db0bd1
Linting.
2017-12-18 12:41:26 -05:00
Maxim Khlobystov
6130984c7c
Small cleanup - removed unnecesssary import statement.
2017-12-18 12:40:31 -05:00
Maxim Khlobystov
bb5c0a1390
Made sure that when we open a new chat, it is not on the list of closed ones anymore.
2017-12-18 12:38:46 -05:00
Maxim Khlobystov
eba7f9ffec
Convert the stateless Chat component into a class component.
2017-12-18 12:25:40 -05:00
KDSBrowne
284ab5e628
add button label
2017-12-15 13:06:22 -08:00
KDSBrowne
5047c089ca
fix remaining console warnings
2017-12-15 09:45:14 -08:00
KDSBrowne
fbec9fc101
fix failed prop type: scrollPosition in Chat component
2017-12-15 09:18:35 -08:00
Anton Georgiev
334c80083e
Merge pull request #4753 from jfsiebel/html5-tooltip
...
Add tooltip for buttons without label
2017-12-13 17:13:28 -02:00
Maxim Khlobystov
b42668c65f
Merge pull request #4802 from OZhurbenko/fix-message-list-bottom-padding
...
Fixed last chat message view in Firefox
2017-12-12 11:37:46 -05:00
Oleksandr Zhurbenko
c9770c02fb
Fixed bottom padding for the last chat message in Firefox and Edge
2017-12-12 07:44:10 -08:00
Anton Georgiev
bf7c26f02b
Merge pull request #4712 from Tainan404/localize-public-clear
...
Localize message from when clear the chat.
2017-12-07 18:27:55 -02:00
Joao Siebel
b03efc021c
Remove unused package and fix whiteboard toolbar submenu tooltip
2017-12-07 14:11:34 -02:00
Joao Siebel
056dc4051d
Add tooltip feature for buttons without label
2017-12-04 17:43:08 -02:00
Tainan Felipe
964c4195a3
refactor user left message
2017-12-01 10:01:07 -02:00
Tainan Felipe
8eaa48fe69
re-added message when user leaves a meeting
2017-11-24 08:52:03 -02:00
Tainan Felipe
545d9e158b
altered id of the intl message
2017-11-23 11:00:41 -02:00
Tainan Felipe
6845aed0e0
localize message from when clear the chat
2017-11-21 16:31:53 -02:00
Tainan Felipe
03cdc155df
increased size of font of send button
2017-11-17 16:57:39 -02:00
Tainan Felipe
73a0b7c7cb
fix <br> that no appeared in welcome message
2017-11-17 14:07:22 -02:00
Tainan Felipe
a4986cb5b7
fix distance between dropdown and button on public chat
2017-11-17 13:38:07 -02:00
Tainan Felipe
64fb3fc920
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-design
2017-11-17 08:11:46 -02:00
KDSBrowne
9412ce7da1
Merge remote-tracking branch 'upstream/v2.0.x-release' into pr-4555-redone
2017-11-16 10:46:04 -08:00
Tainan Felipe
1f7a3f062b
align button by the flexbox
2017-11-16 15:25:38 -02:00
Tainan Felipe
cb46c8f70c
fix design issues
...
fix design issues
2017-11-13 10:58:04 -02:00
KDSBrowne
ff7371683d
fix icon alignment
2017-11-09 09:17:49 -08:00
KDSBrowne
75c445b582
rename color variables in palette.scss
2017-11-08 08:42:13 -08:00
KDSBrowne
1850bc782c
remove customLinkFocus and replace with elementFocus
2017-11-07 08:06:31 -08:00
KDSBrowne
1a5d6c5ae4
rename customInputFocus and replace borders
2017-11-06 13:14:58 -08:00
Tainan Felipe
d2b29f8d29
add return in componentwillReceiveProps
2017-11-02 14:47:49 -02:00
KDSBrowne
900c20f86a
move and convert focus styles to mixins
2017-11-01 09:01:55 -07:00
Tainan Felipe
e1ca9950a1
add chat push notification and refactor audio notification
2017-10-30 08:34:28 -02:00
Tainan Felipe
19f38f9419
add chat notification
2017-10-26 15:14:50 -02:00
KDSBrowne
a8142287fa
adjust public chat option button position
2017-10-24 09:16:57 -07:00
KDSBrowne
6996aa833e
move css variables to chat-dropdown styles.scss
2017-10-24 09:08:57 -07:00
KDSBrowne
7eb9e420d5
add aria lable to public chat options btn
2017-10-24 09:07:08 -07:00
KDSBrowne
bc0ded7bec
remove unneeded div element
2017-10-24 09:06:29 -07:00
KDSBrowne
445522a8dd
add variables for css values
2017-10-24 09:06:04 -07:00
KDSBrowne
bc0434b6e0
fix oval focus ring on public chat more btn
2017-10-24 09:05:46 -07:00
KDSBrowne
336a1b24a0
add round focus ring to chat more button
2017-10-24 09:05:07 -07:00
Anton Georgiev
4566d82a2a
Merge pull request #4488 from Tainan404/fix-errors-linter
...
[HTML5] Fix errors linter
2017-10-23 12:27:38 -02:00
Anton Georgiev
f1de51595d
Merge pull request #4515 from OZhurbenko/fix-warnings-assign-presenter
...
[HTML5] - Fix for the React console warnings
2017-10-13 14:06:31 -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
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
21dcafb047
Fixed some of the console warning happenning when user is a moderator and he opens user-list/chat
2017-10-11 12:11:04 -07:00
KDSBrowne
392d819905
apply new focus style to message input
2017-10-11 10:27:43 -07:00
Tainan Felipe
50cc876cf7
fix errors linter
2017-10-10 19:08:51 -03:00
Tainan Felipe
5393051d9d
fix errors linter
2017-10-10 10:06:34 -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
1e3470c136
Fix unread button styles
2017-10-05 17:49:02 -03:00
Oswaldo Acauan
30bf1b4425
Change chat-dropdown icon and vertical align it with the title
2017-10-05 17:13:29 -03:00
Oswaldo Acauan
901552abad
Add collapse style for system messages
2017-10-05 16:58:49 -03:00
Anton Georgiev
6b1a29eab4
Merge pull request #4426 from OZhurbenko/presenter-functionality-2x
...
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
2017-10-04 14:05:03 -04:00
KDSBrowne
0838e21674
change css classes to SASS placeholders
2017-10-03 11:00:04 -07:00
Oleksandr Zhurbenko
76bcdd55d6
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-10-03 10:34:10 -07:00
KDSBrowne
10f95f11e1
fix merge conflicts
2017-10-02 12:37:51 -07:00
Oswaldo Acauan
3e24a5e2a4
Update chat styles
2017-09-29 09:13:49 -03:00
Oswaldo Acauan
bcc6e20af2
Update system messages styles
2017-09-28 16:42:10 -03:00
Klaus
b947e27086
Fix makeCall from component, and user.isLocked from mapUser
2017-09-28 15:19:57 -03:00
Oleksandr Zhurbenko
f80d0bc083
Linting and moved whiteboard resize events into HoC
...
Thus we won't clutter the code with unrelated events and can easily switch to a ResizeObserver when it is implemented by the browsers
2017-09-25 16:45:44 -07:00
KDSBrowne
d7335ade60
move focus styles to central location
2017-09-19 07:44:42 -07:00
Oleksandr Zhurbenko
c9552247b2
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-18 12:08:14 -07:00
KDSBrowne
f20f432e74
add focus to chat links
2017-09-18 09:55:10 -07:00
KDSBrowne
72acea229b
remove single quotes from variable
2017-09-12 10:01:07 -07:00
Oleksandr Zhurbenko
43b3b89c6a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-11 12:11:03 -07:00
Anton Georgiev
bf35fa7a4c
Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist
...
[HTML5] - Fix Userlist Lock Notification
2017-09-11 12:07:17 -04:00
KDSBrowne
ef6d3059a7
fix lint issue
2017-09-07 12:06:48 -07:00
KDSBrowne
13e6357b19
fix line endings
2017-09-07 07:31:19 -07:00
KDSBrowne
5a6183dc34
fix undefined check
2017-09-06 12:57:24 -07:00
KDSBrowne
9193ae8849
handle UserLockedInMeetingEvtMsg
2017-09-06 12:53:07 -07:00
Oleksandr Zhurbenko
251bd22738
PR review fixes
2017-09-06 12:36:52 -07:00
KDSBrowne
fd9a4cd98e
fix bug in undefined check
2017-09-06 11:13:24 -07:00
KDSBrowne
d34f138b56
check if lock settings are undefined
2017-09-06 10:50:48 -07:00
KDSBrowne
572bb0b8d3
remove ternary operation
2017-09-06 09:08:26 -07:00
Oleksandr Zhurbenko
65da71c12a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-05 18:53:51 -07:00
KDSBrowne
b20859d1c9
fix chat being locked for moderators
2017-08-31 14:49:13 -07:00
KDSBrowne
7a9cb7d04f
fix the disabling of chat when locked
2017-08-31 14:29:18 -07:00
KDSBrowne
b2fcfef145
move if condition
2017-08-29 16:26:43 -07:00
KDSBrowne
126f4589e1
move if conditions
2017-08-29 12:31:09 -07:00
KDSBrowne
20316be90f
add suggested changes
2017-08-29 12:25:01 -07:00
KDSBrowne
7271be05f8
remove getElementById usage in message-list-item component
2017-08-28 08:30:50 -07:00
KDSBrowne
24bdb2d000
remove getElementById usage in message component
2017-08-28 08:30:50 -07:00
Oleksandr Zhurbenko
643d55938c
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-16 19:24:59 -07:00
Oswaldo Acauan
716ee5902f
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-08 11:52:26 -03:00
Oswaldo Acauan
e07c8b41af
Add autofocus when switching/entering chat
2017-08-04 15:32:21 -03:00
Oswaldo Acauan
720dddec24
Fix chat styles
2017-08-04 15:17:15 -03:00
Oswaldo Acauan
0022c121d3
Fix chat bug and styles
2017-08-04 14:58:55 -03:00
Klaus
e4e7f1da2c
Move domain functions to service.js
2017-08-03 11:10:05 -03:00
Oswaldo Acauan
b53636ec19
Fix avatar colors and text capitalization
2017-08-03 09:36:26 -03:00
Oswaldo Acauan
14f586faad
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-08-03 09:17:50 -03:00
Klaus
e7b9eab5b6
Move makeCall to service file
2017-08-02 14:05:20 -03:00
Klaus
63fee3b615
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-08-02 11:36:16 -03:00
Klaus
d45ae64558
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-08-02 11:29:33 -03:00
Oleksandr Zhurbenko
b207a1275e
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-01 13:49:46 -07:00
Klaus
9d42ca9bd7
Move from users to voice-users
2017-08-01 10:10:12 -03:00
Oswaldo Acauan
83c117ddde
Match user-list with the new styles
2017-07-28 10:43:39 -03:00
Klaus
e2c0971e57
Add new icons
2017-07-27 17:45:40 -03:00
Klaus
eea2c0ee8b
Refactor user
2017-07-26 11:09:07 -03:00
Klaus
d44299d221
Fix the missing string name
2017-07-25 15:57:20 -03:00
Klaus
fade555d55
Add check for user permission
2017-07-21 15:17:25 -03:00
Klaus
39288e6e70
Add clear history, copy and save as chat options
2017-07-21 13:27:28 -03:00
Klaus
a63d8d5cf4
Add function to export public chat to clipboard and file
2017-07-21 11:39:51 -03:00
Oleksandr Zhurbenko
23263c997b
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-17 16:01:05 -07:00
Anton Georgiev
bc9083c0cf
Merge pull request #4109 from Klauswk/fix-sass-path
...
[HTML5 - 2.0] Change relative path of the sass imports to absolute
2017-07-17 14:58:02 -04:00
Klaus
87943cb3f8
Change relative path of the sass to absolute
2017-07-17 15:21:45 -03:00
Klaus
3af281d648
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
2017-07-17 13:33:45 -03:00
Oleksandr Zhurbenko
82a1ad2c8a
Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x
2017-07-14 15:43:41 -07:00
Anton Georgiev
a251305cab
Merge pull request #4036 from KDSBrowne/x0-userlist-jaws-fix
...
[HTML5] - ARIA fixes to work with JAWS
2017-07-14 13:26:07 -04:00
Anton Georgiev
586c51fcac
Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
...
[HTML5 2.0] Move emoji messages to 2.0
2017-07-14 10:39:16 -04:00
Klaus
54234cecac
Handling emoji messages
2017-07-13 10:15:42 -03:00
Klaus
f0e26c1bbb
Change missing strings to const
2017-07-12 17:22:26 -03:00
Klaus
111ad9171b
Remove strings and add constants
2017-07-12 17:15:50 -03:00
Klaus
8cd4b752ef
Remove strings and add constants
2017-07-12 17:02:55 -03:00
Klaus
2aa603d195
Merge branch 'bbb-2x-mconf' into html5-2x-chat-messages
2017-07-12 16:29:07 -03:00
Klaus
1dfb054323
A few hotfixes to make the html5 client join again
2017-07-12 15:51:29 -03:00
Klaus
eb5712e96c
Fix chat list
2017-07-12 13:47:58 -03:00
Klaus
e1004b64d3
Filtering correct the messages
2017-07-12 10:54:54 -03:00
Klaus
898f7c97e3
Sending private message
2017-07-12 10:18:26 -03:00
Klaus
73f49bb46a
Sending public message
2017-07-12 09:42:16 -03:00
KDSBrowne
1cc5c5df92
change variable name and condition
2017-06-27 20:35:15 -07:00
Anton Georgiev
724e21a0d6
we do not have 1.0 user messages coming from bbb so use 2.0 only
2017-06-27 18:14:53 -04:00
