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
Klaus
b3865ef90d
Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis
2017-06-20 14:11:19 -03:00
KDSBrowne
be009fd9ba
fix chat log aria label to work with jaws
2017-06-20 09:01:42 -07:00
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
KDSBrowne
c189faceff
fix merge conflicts
2017-06-08 11:00:06 -07:00
Oleksandr Zhurbenko
1309bb1808
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
2017-06-07 14:12:04 -07:00
Oleksandr Zhurbenko
017ff470c3
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
2017-06-07 13:29:35 -07:00
KDSBrowne
c2579c7838
fix console error related to messageForm
2017-06-07 11:36:25 -07:00
Oleksandr Zhurbenko
1ba4018629
Cleanup
2017-06-05 20:15:37 -07:00
Oleksandr Zhurbenko
52fae1b8c8
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks
2017-06-05 19:51:20 -07:00
Oleksandr Zhurbenko
9f497d8991
Fixed scrollArea usage
2017-06-05 19:10:06 -07:00
Oswaldo Acauan
1c5c74db67
Fix merge conflicts
2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
06493fda7f
Switched to prop-types package to remove new React 15 warnings
2017-06-03 19:40:14 -07:00
Oleksandr Zhurbenko
a0224dcffc
Replaced String refs with callback refs
...
String refs will be deprecated in the next React releases, since they have some performance issues
2017-06-03 16:58:27 -07:00
Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +00:00
Oswaldo Acauan
067bd96272
Fix merge conflicts
2017-06-01 14:27:12 +00:00
Oswaldo Acauan
3702da3e08
Add check for min/max length for chat message
2017-06-01 14:24:29 +00:00
KDSBrowne
159a47694e
add suggested changes
2017-05-18 16:16:17 -07:00
KDSBrowne
16e507fbb2
fix merge conflicts
2017-05-17 08:54:48 -07:00
KDSBrowne
97514dc5c5
remove default messages
2017-05-16 17:30:42 -07:00
KDSBrowne
2f79f3ff20
change locale stringformat
2017-05-16 17:02:27 -07:00
KDSBrowne
df76d33cba
set files permission to 644
2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c
Fix client lint issues except those which are comment related
2017-05-16 08:37:17 -07:00
Klauswk
30b7c3c1e4
Merge branch 'master' into AddServerCallback
2017-04-28 17:28:45 -03:00
Oswaldo Acauan
4dd5e3c6ac
Re-add messages concatenation
2017-04-28 15:01:50 +00:00
Oswaldo Acauan
3d0c0d38e1
Fix merge conflicts
2017-04-28 14:59:09 +00:00
Oswaldo Acauan
9467731f47
Improve chat performance
2017-04-28 14:52:54 +00:00
Klaus Klein
e56546137b
Change callServer function name
2017-04-26 10:47:44 -03:00
KDSBrowne
97402b4628
add aria-label to chat log
2017-04-20 06:53:03 -07:00
KDSBrowne
cb4f6005d6
add aria label
2017-04-17 09:23:24 -07:00
KDSBrowne
2b8c9812ee
fix merge conflict
2017-04-17 06:34:11 -07:00
KDSBrowne
4a480f77eb
fix aria labels for hide and close chat btns
2017-04-14 16:18:40 -07:00
Anton Georgiev
07d2cf9b14
Merge pull request #3810 from Klauswk/FixPrivateOfflineChatProblem
...
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-12 16:32:01 -04:00
Klaus Klein
3ad7f9b5a0
Fix a few lint problems
2017-04-12 17:19:39 -03:00
Anton Georgiev
573db8dcc3
updated icons to v11, adjusted few icons
2017-04-12 12:12:47 -04:00
Klaus Klein
3ac33c79d6
Fix merge algoritm problem
2017-04-12 09:03:14 -03:00
Klauswk
9649f7523d
Merge branch 'master' into FixPrivateOfflineChatProblem
2017-04-12 08:33:07 -03:00
Anton Georgiev
026274f47f
set chat input color to gray (text-color)
2017-04-11 17:05:10 -04:00
Klaus Klein
419902cc8b
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-11 16:46:51 -03:00
Anton Georgiev
d8faea566f
Merge pull request #3798 from antobinary/private-chat-3786
...
[HTML5] Fix client freeze on private chat partner leaving. Fix for #3786
2017-04-11 15:02:22 -04:00
KDSBrowne
24f3eb721d
switch aria-atomic to false
2017-04-10 14:07:14 -07:00
KDSBrowne
a5f1857c67
add descriptions to defined messages
2017-04-10 08:50:03 -07:00
Anton Georgiev
28165f2584
improved logic for updating message-list
2017-04-10 11:02:58 -04:00
Oswaldo Acauan
3f1f8fb693
Prevent rendering when the chat message is out of the viewport
2017-04-07 19:58:23 +00:00
Anton Georgiev
d9592aba04
fix issue with new chat session opened
2017-04-07 11:00:44 -04:00
Anton Georgiev
e3f66da499
update chat unless user just left
2017-04-06 17:08:20 -04:00
KDSBrowne
3ff1096cf4
fix merge conflict
2017-04-06 07:11:57 -07:00
Anton Georgiev
fe998aacd3
Merge pull request #3769 from Gcampes/settings-refactor
...
[HTML5] Adds settings service
2017-04-06 08:31:59 -04:00
Anton Georgiev
ed7d09b8a2
Merge pull request #3783 from Klauswk/AddSendButton
...
HTML5 close #3765 , Added send button aside chat textbox
2017-04-06 08:20:02 -04:00
KDSBrowne
800c47f462
remove default messages
2017-04-05 17:02:07 -07:00
gcampes
f0ac39f420
Merge remote-tracking branch 'upstream/master' into settings-refactor
...
* upstream/master: (63 commits)
add styles for separator
In whiteboard text tool, a single click while editing a text sends it without creating a new text zone.
Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777
- escape all user passed strings
- display length of recording in minutes instead of milliseconds
- fix window size - run dos2unix to remove ^M but it formatted the whole file :(
- add dimension of screen share
add formatted message for close chat link
add formatted message for userlist toggle btn label
remove unused import
fix DropdownListSeparator to work with NVDA
remove local storage usage and add separator
change role from section to region
add menu item separation NVDA fiendly
add formatted messages and remove generic divs
remove direct DOM manipulation
remove span element
add aria-label for unread messages
add missing import to fix JoinAudio Btn
fix lint issues
...
2017-04-05 13:56:07 -03:00
Klaus Klein
8095620fac
Change to arrow function
2017-04-05 11:23:05 -03:00
Klaus Klein
a140f7567a
HTML5 close #3765 ,Added send button aside chat textbox
2017-04-05 10:21:30 -03:00
KDSBrowne
00f77d1fd4
add formatted message for close chat link
2017-03-29 08:35:07 -07:00
gcampes
1a15f83690
adds settings service
2017-03-28 15:41:48 -03:00
KDSBrowne
eb3ac219e9
fix merge conflicts
2017-03-24 07:25:25 -07:00
Oleksandr Zhurbenko
a50a883bf9
Switched to a different way of scaling the slide
2017-03-23 14:52:36 -07:00
JaeeunCho
fd08d99b6f
HTML5 - removed unused imports, fixed variable names
2017-03-23 12:02:40 -07:00
KDSBrowne
2d876550db
merge with master
2017-03-23 07:16:47 -07:00
JaeeunCho
75dbfc23b6
HTML5 - changed underscore to lodash
2017-03-21 14:52:10 -07:00
JaeeunCho
b81957da43
HTML5 - fixed conflict
2017-03-21 13:29:46 -07:00
JaeeunCho
823c667cac
HTML5 - changed session method to props
2017-03-17 11:25:41 -07:00
JaeeunCho
eb176e77ac
HTML5 - changed session and variables name
2017-03-17 08:27:37 -07:00
JaeeunCho
cb56e0771d
HTML5 - changed variable name
2017-03-16 15:39:34 -07:00
Oswaldo Acauan
22bb1adab2
Refactor of the chat notification for unread messages
2017-03-16 19:57:45 +00:00
KDSBrowne
8be9f4ee26
add label and role to close chat link
2017-03-15 08:53:12 -07:00
Oswaldo Acauan
be7f36e00c
Refactor the i18n server code
2017-03-09 19:50:21 +00:00
JaeeunCho
3fb3d614fa
HTML5 - changed comment and moved into block
2017-03-06 09:25:35 -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
Oleksandr Zhurbenko
80666bd688
Updated icons in the html5 client
2017-03-01 17:03:02 -08:00
JaeeunCho
fa7d46af73
HTML5 - added session array for close private chat
2017-03-01 13:27:05 -08: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
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
KDSBrowne
d7e4dae341
Fix chat auto scroll
2017-02-09 08:04:18 -08:00
Matthew Marangoni
b175d260ca
fixed scrollbar spacing in chat
2017-02-08 11:05:58 -08:00
Matthew Marangoni
e42e4c759a
fixed userlist and chat scrolling in Firefox
2017-01-27 14:13:25 -08:00
Lajellu
9a77ace223
Merge remote-tracking branch 'upstream/master' into completeEmojiIcons
2016-12-21 09:00:12 -08:00
Anton Georgiev
69f3571101
Merge pull request #3524 from KDSBrowne/UI-Update-Changes01
...
UI Changes Update
2016-12-21 11:10:27 -05:00
Lajellu
b3f1d9f804
HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues
2016-12-20 10:06:01 -08:00
KDSBrowne
959208f86e
align chevron vertically with text to right
2016-12-15 09:29:17 -08:00
KDSBrowne
4a4df3512a
removed bold font style
2016-12-15 08:28:45 -08:00
Anton Georgiev
2df9f6e10b
Merge pull request #3479 from JaeeunCho/scroll_v1
...
HTML5-clent scroll on chat
2016-12-15 10:31:32 -05:00
Oswaldo Acauan
48da206411
Fix chat placeholder and user left messages on private chats
2016-12-07 11:48:29 -02:00
Oswaldo Acauan
d3ac2f4061
Improve chat design based on feedback
2016-12-06 15:30:56 -02:00
Oswaldo Acauan
3155b9a7c5
Improve chat design based on feedback
2016-12-06 15:07:22 -02:00
JaeeunCho
b57742df79
HTML5-clent scroll on chat - added notification button
2016-12-02 11:47:44 -08:00
JaeeunCho
d673d477e2
Merge remote-tracking branch 'upstream/master' into scroll_v1
2016-12-02 11:30:22 -08:00
Oswaldo Acauan
19a81e1d90
Add visual indicator when someone is talking
2016-11-22 18:26:01 +00:00
JaeeunCho
c7e43f2b77
HTML5-clent scroll on chat - changed to display messages automatically
2016-11-21 15:02:12 -08:00
JaeeunCho
909862e44c
HTML5-clent messages on chat - changed icon for logged out users
2016-11-14 14:18:25 -08:00
JaeeunCho
aedf4561de
HTML5-client messages for logged out user on chat
2016-10-31 15:17:06 -07:00
JaeeunCho
e541487596
Merge remote-tracking branch 'upstream/master' into messages_v1
2016-10-31 14:18:37 -07:00
JaeeunCho
8bb915e8cd
HTML5-clent messages on chat
2016-10-25 10:22:55 -07:00
Oswaldo Acauan
8874c15e9f
Rename meteor method on the client
2016-10-21 18:47:33 +00:00
Gabriel Carvalho de Campes
edee8f5097
Removes capitalize from chat title
2016-09-12 17:11:37 -03:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
Oleksandr Zhurbenko
d9ddbfbda6
Cleanup, linting, fixed css modules' imports
2016-08-20 18:14:12 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
Oleksandr Zhurbenko
d510907179
Upgraded Meteor to 1.4
2016-07-27 14:50:35 -07:00
Oswaldo Acauan
a32617cf65
Remove unused import/prop
2016-07-12 14:04:39 +00:00
Oswaldo Acauan
306ef94237
Fix conflicts
2016-07-12 14:02:48 +00:00
Oswaldo Acauan
97389d7edf
Fix React warnings for unknown props
2016-07-11 20:10:55 +00:00
Oswaldo Acauan
2d1b9ede84
Minor fixes
2016-07-11 19:42:54 +00:00
Oswaldo Acauan
6760723565
Prevent useless rerenders on MessageList
2016-07-11 18:22:06 +00:00
Oswaldo Acauan
0f77c8fa13
Change reduce/map order on chat service
2016-07-11 17:12:01 +00:00
Oswaldo Acauan
b70b724d99
Change reduce/map order on chat service
2016-07-11 17:07:35 +00:00
Oswaldo Acauan
9b53090c81
Change Auth service to be a singleton class
2016-07-11 13:45:24 +00:00
Oswaldo Acauan
1c0132ed5b
Merge after git conflict/lost object
2016-07-11 12:34:58 +00:00
Gabriel Carvalho de Campes
0dd7f3811c
Separates user status in avatar
2016-07-08 19:09:16 +00:00
Oswaldo Acauan
b33e26a43d
Improve chat form events
2016-07-07 18:52:21 +00:00
Oswaldo Acauan
03aa1aada3
Fix some chat styles
2016-07-07 18:16:08 +00:00
Oswaldo Acauan
930f92932d
Add chat notification for unread messages
2016-07-07 16:51:55 +00:00
Oswaldo Acauan
dad812aa5d
Add unread messages service
2016-07-07 12:50:32 +00:00
Oswaldo Acauan
4e85501768
Fix unread notification
2016-07-05 16:47:40 +00:00
Oswaldo Acauan
a4fcfd2275
Add tip for unread chat messages
2016-07-05 13:34:13 +00:00
Oswaldo Acauan
3b1c0328c2
Add chat unread messages functionality
2016-07-04 18:53:47 +00:00
Oswaldo Acauan
852545665d
Add chat scroll position history
2016-06-30 17:10:36 +00:00
Oswaldo Acauan
a70ec42c6e
Fix styles for big messages
2016-06-28 16:18:37 +00:00
Oswaldo Acauan
d2e8d3d954
Improve auto-scroll behaviour
2016-06-27 19:00:10 +00:00
Oswaldo Acauan
6414d6358a
Remove debug messages
2016-06-13 14:15:15 -03:00
Oswaldo Acauan
76b8aca4bb
Add lock behavior to HTML5 chat
2016-06-13 14:00:38 -03:00
Oswaldo Acauan
23a5045cec
Add disable property for chat form
2016-06-07 11:19:19 -03:00
Oswaldo Acauan
c7225d9738
Add i18n to chat form
2016-06-02 17:32:42 -03:00
Oswaldo Acauan
f204e6007a
Sanitize chat messages client and server-side
2016-06-02 16:08:17 -03:00
Oswaldo Acauan
d642cb1c99
Add chat send message functionality
2016-06-02 15:40:27 -03:00
Oswaldo Acauan
f39b7171af
Move session/auth logic to separated services
2016-06-02 10:46:35 -03:00
Oswaldo Acauan
f4fbc658e0
Fetch chat messages from server instead of mock
2016-06-02 10:00:57 -03:00
Oswaldo Acauan
1d8a36564d
Add base components and style for Chat
2016-06-01 13:33:19 -03:00
Oswaldo Acauan
877e91a43e
Rename to new structure
2016-05-23 10:09:47 -03:00
Oswaldo Acauan
99c2e94c80
Remove unnecessary extension on imports
2016-05-20 10:46:30 -03:00
Oswaldo Acauan
ddd38c57ac
Add i18n, modular layouts and basic styles
2016-05-03 17:40:46 -03:00
Oswaldo Acauan
01860a8804
Add basic styles for new design
2016-05-02 19:42:54 -03:00
