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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Klaus
|
9d42ca9bd7
|
Move from users to voice-users
|
2017-08-01 10:10:12 -03:00 |
|
Klaus
|
eea2c0ee8b
|
Refactor user
|
2017-07-26 11:09:07 -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 |
|
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
|
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 |
|
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 Klein
|
c627deca36
|
Move api to api/1.1
|
2017-06-19 08:57:32 -03:00 |
|
Oswaldo Acauan
|
1c5c74db67
|
Fix merge conflicts
|
2017-06-05 13:52:46 +00: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
|
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 |
|
Klaus Klein
|
e56546137b
|
Change callServer function name
|
2017-04-26 10:47:44 -03:00 |
|
Klaus Klein
|
3ad7f9b5a0
|
Fix a few lint problems
|
2017-04-12 17:19:39 -03:00 |
|
Klaus Klein
|
3ac33c79d6
|
Fix merge algoritm problem
|
2017-04-12 09:03:14 -03:00 |
|
Klaus Klein
|
419902cc8b
|
Fixed user leave problem on private chat, close #3799 HTML5
|
2017-04-11 16:46:51 -03:00 |
|
JaeeunCho
|
fd08d99b6f
|
HTML5 - removed unused imports, fixed variable names
|
2017-03-23 12:02:40 -07:00 |
|
JaeeunCho
|
75dbfc23b6
|
HTML5 - changed underscore to lodash
|
2017-03-21 14:52:10 -07:00 |
|
JaeeunCho
|
eb176e77ac
|
HTML5 - changed session and variables name
|
2017-03-17 08:27:37 -07: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 |
|