Anton Georgiev
|
ee78238348
|
Merge pull request #4583 from jfsiebel/add-moderator-unmute-config
add moderatorUnmute feature in HTML5 client
|
2017-11-14 16:41:33 -02:00 |
|
Anton Georgiev
|
3c0371c911
|
Merge pull request #4666 from riadvice/layout-naming-fallback
Fall back to the layout name if a translation could not be found
|
2017-11-14 15:20:20 -02:00 |
|
Anton Georgiev
|
1c49057e14
|
Merge pull request #4664 from ritzalam/remove-user-when-user-leaves
- provide a way to skip whitelist filter in bbb-apps
|
2017-11-14 15:17:48 -02:00 |
|
Anton Georgiev
|
16e7f5867b
|
I missed a line when resolving the conflict
|
2017-11-14 12:16:29 -05:00 |
|
Anton Georgiev
|
2276522c2e
|
Merge branch 'master' into remove-user-when-user-leaves
|
2017-11-14 14:57:19 -02:00 |
|
Anton Georgiev
|
d95dc9c22c
|
Merge pull request #4665 from riadvice/private-chat
Display red dot in chat tab
|
2017-11-14 14:53:05 -02:00 |
|
Anton Georgiev
|
bb89bb5c05
|
Merge pull request #4663 from ritzalam/fix-chat-issues
Fix chat issues
|
2017-11-14 14:30:24 -02:00 |
|
Ghazi Triki
|
669594298e
|
Fall back to the layout name if a translation could not be found.
|
2017-11-14 09:40:20 +01:00 |
|
Richard Alam
|
420b6a9a14
|
- provide a way to skip whitelist filter in bbb-apps
- tell akka-apps to eject user for client that violates whitelist
- when validate token fails, disconnect client.
|
2017-11-13 14:25:31 -08:00 |
|
Ghazi Triki
|
04e259a16e
|
Fix highlightedTabStyle style.
|
2017-11-13 22:47:48 +01:00 |
|
Richard Alam
|
f411f24c92
|
- clear main public chat box when clear chat button is clicked.
|
2017-11-13 11:17:50 -08:00 |
|
Richard Alam
|
f22cab9ac7
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues
|
2017-11-13 08:54:19 -08:00 |
|
Richard Alam
|
b2aae3ab3c
|
- clear public chat (incomplete)
TODO: client doesn't clear yet
|
2017-11-13 05:56:14 -08:00 |
|
Chad Pilkey
|
8e019f5abc
|
Merge pull request #4659 from capilkey/2.1-message-whitelist
Add a message whitelist
|
2017-11-10 18:37:20 -05:00 |
|
Chad Pilkey
|
92ded6ed81
|
whitelist messages coming from the Flash client
|
2017-11-10 18:30:47 -05:00 |
|
Anton Georgiev
|
62ccb317e6
|
Merge pull request #4658 from antobinary/pods_vol4
Force currentPodPresenter value
|
2017-11-10 17:46:18 -02:00 |
|
Anton Georgiev
|
87051ecc92
|
force currentPodPresenter value
|
2017-11-10 14:41:58 -05:00 |
|
Chad Pilkey
|
44d1e252ad
|
move header rewrite higher to avoid spoofing
|
2017-11-10 13:50:26 -05:00 |
|
Calvin Walton
|
4824f3c86d
|
Merge pull request #4656 from kepstin/recording-segment-process
Fix parsing meeting id for segments in publish step
|
2017-11-10 13:11:50 -05:00 |
|
Calvin Walton
|
feee34c144
|
Fix parsing meeting id for segments in publish step
|
2017-11-10 13:10:58 -05:00 |
|
Anton Georgiev
|
7b7a40a333
|
Merge pull request #4655 from antobinary/guest-work
Show guests waiting to late joining moderator
|
2017-11-10 15:55:31 -02:00 |
|
Anton Georgiev
|
6cee63a79c
|
do not display guest notification for self
|
2017-11-10 12:31:07 -05:00 |
|
Anton Georgiev
|
490f717502
|
show guests waiting to late joining moderator
|
2017-11-10 12:06:41 -05:00 |
|
Calvin Walton
|
a50ba64322
|
Merge pull request #4649 from kepstin/recording-segment-process
Recording segment process
|
2017-11-10 10:30:58 -05:00 |
|
Anton Georgiev
|
4523c65535
|
Merge pull request #4654 from ritzalam/fix-chat-issues
- save and copy main public chat messages
|
2017-11-10 13:07:23 -02:00 |
|
Richard Alam
|
038ac70f3e
|
- save and copy main public chat messages
|
2017-11-10 05:40:31 -08:00 |
|
Chad Pilkey
|
82ea62a7ac
|
Merge pull request #4653 from capilkey/2.1-update-record-events
Modify presentation, chat, and cursor record events to match 2.1 specs
|
2017-11-09 19:20:53 -05:00 |
|
Chad Pilkey
|
627a4e332e
|
modify presentation, chat, and cursor record events to match 2.1 specs
|
2017-11-09 19:03:55 -05:00 |
|
Anton Georgiev
|
d834fa7161
|
Merge pull request #4652 from antobinary/pods_vol4
Allow moderator to add self to presenter group
|
2017-11-09 21:31:09 -02:00 |
|
Anton Georgiev
|
97c5d89cb8
|
allow moderator to add self to presenter group
|
2017-11-09 17:58:20 -05:00 |
|
Anton Georgiev
|
056c33a11e
|
Merge branch 'multi-pod-improve' of github.com:riadvice/bigbluebutton into pods_vol4
|
2017-11-09 17:31:02 -05:00 |
|
Anton Georgiev
|
08dc7f117d
|
Merge pull request #4651 from ritzalam/fix-chat-issues
Fix chat issues
|
2017-11-09 20:13:45 -02:00 |
|
Richard Alam
|
c50dab1b81
|
- try forcing to switch focus to private chat
|
2017-11-09 13:59:20 -08:00 |
|
Richard Alam
|
943fbbb086
|
- open private chat window if closed and new message is received
|
2017-11-09 13:24:28 -08:00 |
|
Anton Georgiev
|
d7d7e6ab15
|
Merge pull request #4650 from antobinary/guest-work
Make guest-wait url relative to avoid issues with http/https
|
2017-11-09 18:58:12 -02:00 |
|
Anton Georgiev
|
7b940bd96f
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into guest-work
|
2017-11-09 15:45:40 -05:00 |
|
Anton Georgiev
|
e387c824c4
|
make guest-wait url relative to avoid issues with http/https
|
2017-11-09 15:44:38 -05:00 |
|
Anton Georgiev
|
67c7c9a2cf
|
Merge pull request #4645 from capilkey/implement-rights-management
Tested - seems to work fine. Merging
|
2017-11-09 18:11:00 -02:00 |
|
Chad Pilkey
|
46e0253f17
|
Merge remote-tracking branch 'upstream/master' into implement-rights-management
|
2017-11-09 14:36:25 -05:00 |
|
Ghazi Triki
|
08eda408cd
|
Add a new UnselectableItemsComboBox component for PresentationWindow.
|
2017-11-09 20:25:09 +01:00 |
|
Calvin Walton
|
d35dd90530
|
Applying segment breaks after recording marks doesn't work
The timestamps no longer line up after applying one edit, so these
have to be all done at the same time in one step.
|
2017-11-09 13:48:27 -05:00 |
|
Anton Georgiev
|
84df0dfdd4
|
Merge pull request #4646 from ritzalam/fix-chat-issues
Fix chat issues
|
2017-11-09 13:46:31 -02:00 |
|
Anton Georgiev
|
3dc6c183d6
|
Merge pull request #4644 from antobinary/guest-work
Guest Management - handle individual guests approv vs deny (client side improvements)
|
2017-11-09 13:09:49 -02:00 |
|
Richard Alam
|
3673f563e4
|
- add focus on chat box todo list
|
2017-11-09 04:45:51 -08:00 |
|
Richard Alam
|
4acb15cb66
|
- remove box mapper on chat box closed event
|
2017-11-09 04:06:08 -08:00 |
|
Richard Alam
|
d684efe2f3
|
- do not open new chat box if already chatting with user
|
2017-11-08 19:43:05 -08:00 |
|
Chad Pilkey
|
d1ebaa249b
|
Merge remote-tracking branch 'upstream/master' into implement-rights-management
|
2017-11-08 19:47:50 -05:00 |
|
Chad Pilkey
|
9f9cef6088
|
add rights-management for creating chat groups and sending messages
|
2017-11-08 19:24:53 -05:00 |
|
Chad Pilkey
|
c615d36cd8
|
fix two null exceptions in the Flash client
|
2017-11-08 18:49:25 -05:00 |
|
Chad Pilkey
|
bd20efea20
|
finished rights-management checks (minus chat)
|
2017-11-08 18:48:25 -05:00 |
|