Oleksandr Zhurbenko
|
015ca3d719
|
Changed imports and removed 'initializeCursor.js' since it's not needed
|
2017-10-11 19:00:28 -07:00 |
|
gcampes
|
189760d393
|
fix breakout not closing on end
|
2017-10-06 11:58:21 -03:00 |
|
KDSBrowne
|
7225590c05
|
fix userEjected modifier and change if condition
|
2017-10-04 07:57:16 -07:00 |
|
KDSBrowne
|
bc0647ad50
|
fix merge conflicts
|
2017-09-29 12:04:27 -07:00 |
|
KDSBrowne
|
10c75afe99
|
switch handler, modifier and collection prop to ejected
|
2017-09-27 14:20:22 -07:00 |
|
KDSBrowne
|
cad085a495
|
add kicked prop
|
2017-09-25 11:38:36 -07:00 |
|
KDSBrowne
|
9a145c64a8
|
fix set properties and client kicked condition
|
2017-09-25 11:32:09 -07:00 |
|
Oleksandr Zhurbenko
|
251bd22738
|
PR review fixes
|
2017-09-06 12:36:52 -07:00 |
|
Klaus
|
de6b40a666
|
Fix counter in breakout notification
|
2017-08-11 17:17:35 -03:00 |
|
Klaus
|
2343ef3f1f
|
Add missing merge file
|
2017-07-17 13:38:18 -03:00 |
|
Klaus
|
3af281d648
|
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
|
2017-07-17 13:33:45 -03:00 |
|
Oswaldo Acauan
|
5353a3a80d
|
Add guest policy to html5
|
2017-07-14 11:18:07 -03:00 |
|
JaeeunCho
|
28b81b32eb
|
changed function to pass two parameters
|
2017-07-07 08:18:19 -07:00 |
|
JaeeunCho
|
440c675e23
|
made function for duplicated code
|
2017-07-05 15:56:13 -07:00 |
|
JaeeunCho
|
1a1fb6dc57
|
HTML5 - fixed errors when the meeting is ended by apimate
|
2017-07-05 07:59:18 -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 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 |
|
Oleksandr Zhurbenko
|
06493fda7f
|
Switched to prop-types package to remove new React 15 warnings
|
2017-06-03 19:40:14 -07:00 |
|
Oswaldo Acauan
|
e6412275a6
|
Linter auto fix
|
2017-06-02 19:25:02 +00:00 |
|
JaeeunCho
|
5ee206e73e
|
HTML5 - fixed order and slide control position
|
2017-05-17 13:06:07 -07:00 |
|
JaeeunCho
|
4695395508
|
Merge remote-tracking branch 'upstream/master' into hidden_closedCaption
|
2017-05-17 13:04:09 -07:00 |
|
KDSBrowne
|
97514dc5c5
|
remove default messages
|
2017-05-16 17:30:42 -07:00 |
|
JaeeunCho
|
87b013fd5b
|
HTML5 - fixed fixed closed-caption display
|
2017-05-15 14:45:44 -07:00 |
|
Matthew Marangoni
|
99788090ee
|
fixed audio and settings modal reopening when changing locale in settings
|
2017-05-03 14:39:07 -07:00 |
|
Oswaldo Acauan
|
d434ba6893
|
Fix the audio-modal
|
2017-05-01 16:52:57 -03:00 |
|
Oswaldo Acauan
|
edd64a97f4
|
Fix merge conflicts
|
2017-04-28 16:15:29 +00:00 |
|
Klaus Klein
|
d4917e975c
|
Review change
|
2017-04-26 17:07:22 -03:00 |
|
Klaus Klein
|
d32dbb12f5
|
Fix wrong import
|
2017-04-25 14:26:14 -03:00 |
|
Klauswk
|
73fb753edb
|
Merge branch 'master' into FixAuthentication
|
2017-04-25 14:09:47 -03:00 |
|
Klaus Klein
|
6f564ba7b6
|
Fix auth and user kick, HTML5 closes #3844 #3828
|
2017-04-25 14:04:17 -03:00 |
|
Anton Georgiev
|
9152bfbaf9
|
move deskshare verto outside of audio/
|
2017-04-19 10:59:57 -04:00 |
|
Oswaldo Acauan
|
334026833b
|
Refactor Modal related components
|
2017-04-18 19:38:26 +00:00 |
|
Anton Georgiev
|
450d2f3435
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring
|
2017-04-17 11:37:49 -04:00 |
|
gcampes
|
1a15f83690
|
adds settings service
|
2017-03-28 15:41:48 -03:00 |
|
Anton Georgiev
|
7a45a8467b
|
add Audio container and use for modal
|
2017-03-27 16:40:44 -04:00 |
|
Anton Georgiev
|
8bb1386699
|
moved audio-modal and audio-settings under audio/
|
2017-03-24 12:01:35 -04:00 |
|
Oleksandr Zhurbenko
|
0120e3cfe2
|
Added a missing import
|
2017-03-23 09:19:02 -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 |
|
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 |
|
Oswaldo Acauan
|
528be3979e
|
Fix merge conflicts
|
2017-03-13 17:19:43 +00:00 |
|
Oswaldo Acauan
|
be7f36e00c
|
Refactor the i18n server code
|
2017-03-09 19:50:21 +00:00 |
|
gcampes
|
417b2e4500
|
Fix issues based on PR comments
|
2017-03-09 11:34:33 -03:00 |
|
gcampes
|
420918abe8
|
merge conflicts
|
2017-02-24 17:28:42 -03:00 |
|
gcampes
|
3c02848478
|
hide moderator settings, implement default settings
|
2017-02-24 17:19:53 -03: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 |
|