Richard Alam
|
682bc6cd97
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2017-11-23 13:50:29 -08:00 |
|
Richard Alam
|
caaf082e2e
|
Merge branch 'guest-options' of https://github.com/riadvice/bigbluebutton into riadvice-guest-options
|
2017-11-23 13:45:07 -08:00 |
|
Ghazi Triki
|
a8ba5904c6
|
Improve guest box padding.
|
2017-11-23 22:39:30 +01:00 |
|
Richard Alam
|
dcb933a986
|
- fix display of private chat name
|
2017-11-23 13:36:43 -08:00 |
|
Ghazi Triki
|
de500c3dbd
|
Add a new button to display pending guests.
|
2017-11-23 22:30:05 +01:00 |
|
Chad Pilkey
|
df910730c8
|
fix layout name fallback
|
2017-11-23 15:44:42 -05:00 |
|
Richard Alam
|
81aa832448
|
Merge pull request #4716 from ritzalam/synch-with-v2.0
Synch with v2.0
|
2017-11-23 14:15:33 -05:00 |
|
Anton Georgiev
|
116f91d6c8
|
exclude pres pod dropdown from layout for viewer
|
2017-11-23 13:53:06 -05:00 |
|
Anton Georgiev
|
2b4950296e
|
handle promoted/demoted moderator in pres pods
|
2017-11-23 11:35:51 -05:00 |
|
Anton Georgiev
|
85605a803d
|
display pres pod dropdown to moderators only
|
2017-11-23 10:59:31 -05:00 |
|
Ghazi Triki
|
7b0d7d23d9
|
Display notification for incoming private messages.
|
2017-11-22 19:16:09 +01:00 |
|
Richard Alam
|
80212aa218
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-11-22 08:04:29 -08:00 |
|
Richard Alam
|
ec9b0d038a
|
Merge branch 'meeting-name-display' of https://github.com/riadvice/bigbluebutton into riadvice-meeting-name-display
|
2017-11-22 07:52:09 -08:00 |
|
Ghazi Triki
|
1bfeec88bc
|
Fix meeting label width.
|
2017-11-21 17:45:01 +01:00 |
|
Richard Alam
|
59b5e376ec
|
Merge pull request #4707 from ritzalam/synch-with-v2.0
Synch with v2.0
|
2017-11-21 11:24:50 -05:00 |
|
Richard Alam
|
e77b3c1e04
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-11-21 08:10:29 -08:00 |
|
Richard Alam
|
bdba583efa
|
Merge branch 'chat-tabs' of https://github.com/riadvice/bigbluebutton into riadvice-chat-tabs
|
2017-11-21 07:45:23 -08:00 |
|
Ghazi Triki
|
0204564eda
|
Update font color.
|
2017-11-21 16:36:31 +01:00 |
|
Ghazi Triki
|
97a738d1af
|
Use a Text component for long ProgresBar label.
|
2017-11-21 16:24:22 +01:00 |
|
Ghazi Triki
|
830263e436
|
Open group chat after closing it.
|
2017-11-21 08:52:00 +01:00 |
|
Ghazi Triki
|
a90e3ec325
|
Fix record confirmation popup position.
|
2017-11-20 22:16:24 +01:00 |
|
Ghazi Triki
|
7bb517082d
|
Open existing group chat when selecting it from the list.
|
2017-11-20 19:43:37 +01:00 |
|
Ghazi Triki
|
04f46b9eb5
|
Correctly send MDIWindowEvent.CLOSE event to ChatEventMapDelegate when a public chat window is closed.
|
2017-11-20 18:28:46 +01:00 |
|
Richard Alam
|
764bc5a00c
|
Merge branch 'fix-private-chat-issues' of https://github.com/ritzalam/bigbluebutton into ritzalam-fix-private-chat-issues
|
2017-11-20 08:51:50 -08:00 |
|
Richard Alam
|
e13a68377c
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-11-20 08:42:46 -08:00 |
|
Richard Alam
|
8f9606e270
|
Merge branch 'pass-mute-param' of https://github.com/ritzalam/bigbluebutton into ritzalam-pass-mute-param
|
2017-11-20 08:04:18 -08:00 |
|
Richard Alam
|
f600af5145
|
Merge branch 'cleanup-guest-ui' of https://github.com/ritzalam/bigbluebutton into ritzalam-cleanup-guest-ui
|
2017-11-20 07:41:10 -08:00 |
|
Richard Alam
|
1466636d17
|
Merge branch '2.1-presentation-cleanup' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-presentation-cleanup
|
2017-11-20 07:24:21 -08:00 |
|
Chad Pilkey
|
3235f8423c
|
clean up of akka-app presentpod code (removed ownerId and other redundant date)
|
2017-11-19 14:34:19 -05:00 |
|
Chad Pilkey
|
86e89cfd43
|
remove ownerId and prevPresenterId from PresentationModule
|
2017-11-17 19:29:03 -05:00 |
|
Richard Alam
|
49b08fabc1
|
- disable private chat input box if other user leaves
|
2017-11-17 10:46:53 -08:00 |
|
Richard Alam
|
6ff5d0db42
|
- pass mute param on message so we don't rely on toggling mute/unmute state for users
|
2017-11-17 08:46:18 -08:00 |
|
Richard Alam
|
5a406551de
|
- remove authenicated users list for approval as we only deal with guests
|
2017-11-16 12:14:36 -08:00 |
|
Ghazi Triki
|
f3ee06fc5b
|
Update group chats list.
|
2017-11-16 21:12:18 +01:00 |
|
Ghazi Triki
|
11438c3e74
|
Center FileUploadWindow differently.
|
2017-11-16 19:21:39 +01:00 |
|
Richard Alam
|
90b49bb12e
|
Revert "Delay centering popups as FileUploadWindow cannot be directly centered."
This reverts commit acddb48545.
|
2017-11-16 08:21:18 -08:00 |
|
Chad Pilkey
|
3377196b5a
|
only take presentation pod presenter on create if user is mod
|
2017-11-15 18:09:47 -05:00 |
|
Chad Pilkey
|
8edfe1037f
|
initialize whiteboard canvas with current presenter id
|
2017-11-15 18:07:48 -05:00 |
|
Ghazi Triki
|
7124d8b12f
|
Show group chat in options tab.
|
2017-11-15 21:51:46 +01:00 |
|
Ghazi Triki
|
929be96030
|
Rename ChatBox to ChatTab.
|
2017-11-15 20:59:24 +01:00 |
|
Ghazi Triki
|
2f07c4a67a
|
Move create group chat button to chat options tab.
|
2017-11-15 20:32:42 +01:00 |
|
Ghazi Triki
|
acddb48545
|
Delay centering popups as FileUploadWindow cannot be directly centered.
|
2017-11-15 18:01:15 +01:00 |
|
Richard Alam
|
16f58a95ee
|
- pass podId on constructor instead of passing every time the method is called.
|
2017-11-14 14:42:56 -08:00 |
|
Richard Alam
|
d61129927e
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-11-14 13:55:18 -08:00 |
|
Richard Alam
|
a5269c8eda
|
Merge branch 'center-popups' of https://github.com/riadvice/bigbluebutton into riadvice-center-popups
|
2017-11-14 11:49:01 -08: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
|
d95dc9c22c
|
Merge pull request #4665 from riadvice/private-chat
Display red dot in chat tab
|
2017-11-14 14:53:05 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Anton Georgiev
|
84df0dfdd4
|
Merge pull request #4646 from ritzalam/fix-chat-issues
Fix chat issues
|
2017-11-09 13:46:31 -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
|
c615d36cd8
|
fix two null exceptions in the Flash client
|
2017-11-08 18:49:25 -05:00 |
|
Anton Georgiev
|
eb3f8aec5b
|
close PendingGuestsWindow only from parent
|
2017-11-08 18:41:51 -05:00 |
|
Anton Georgiev
|
0d915a0c56
|
handle PendingGuestWindow when there are 1+ guests waiting
|
2017-11-08 18:10:24 -05:00 |
|
Fred Dixon
|
3d5ffed888
|
Merge pull request #4640 from riadvice/fix-presentation-context-menu
Fix presentation context menu when switching locale
|
2017-11-08 08:11:07 -05:00 |
|
Anton Georgiev
|
af578111bc
|
Merge pull request #4632 from ritzalam/guest-manager-remember
- set guest policy when remember choice is checked
|
2017-11-07 19:05:54 -02:00 |
|
Ghazi Triki
|
cc6718007a
|
Center popups and alerts when the application is resized.
|
2017-11-07 17:57:35 +01:00 |
|
Ghazi Triki
|
6b9389d487
|
Fix presentation context menu actions add when switching locale as viewer.
|
2017-11-07 17:18:11 +01:00 |
|
Anton Georgiev
|
1d38e9498a
|
Merge branch 'guest-manager-remember' of github.com:ritzalam/bigbluebutton into guest-work
|
2017-11-07 10:21:07 -05:00 |
|
Richard Alam
|
60d030d436
|
- track chat box closing
|
2017-11-07 04:31:01 -08:00 |
|
Fred Dixon
|
2249fb51f1
|
Merge pull request #4637 from capilkey/fix-presentation-stutter
Improvements to the page move events
|
2017-11-06 17:24:46 -05:00 |
|
Chad Pilkey
|
0b7ee4d694
|
improvements to the page move events
|
2017-11-06 16:36:20 -05:00 |
|
Ghazi Triki
|
ca1fad923e
|
Make logout happen when using a wrong session token.
|
2017-11-06 15:26:17 +01:00 |
|
Richard Alam
|
42b96e370d
|
- propagate guest policy change to bbb-web
|
2017-11-05 20:21:42 -08:00 |
|
Richard Alam
|
a9f160ce99
|
- set guest policy when remember choice is checked
|
2017-11-05 16:49:10 -08:00 |
|
Richard Alam
|
a6b5311f04
|
- add comment to open private chats in main public chat window
|
2017-11-05 16:02:39 -08:00 |
|
Richard Alam
|
fb5723af1e
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues
|
2017-11-05 15:46:06 -08:00 |
|
Richard Alam
|
54d5eb1101
|
Merge branch 'external-swf-modules' of https://github.com/riadvice/bigbluebutton into riadvice-external-swf-modules
|
2017-11-05 13:53:18 -08:00 |
|
Ghazi Triki
|
fc9eab9992
|
Correctly load MainToolbar configuration.
|
2017-11-05 16:05:53 +01:00 |
|
Ghazi Triki
|
da3a604d2a
|
Compile the master locale within the main application to avoid loading it when the application is launched, in that case we only load the preferred locale if needed.
|
2017-11-05 15:36:02 +01:00 |
|
Ghazi Triki
|
356dcf277e
|
Move all logout and close events handlers from MainApplicationShell to new LogoutManager.
|
2017-11-05 10:15:25 +01:00 |
|
Richard Alam
|
8e350724f4
|
- cleanup
|
2017-11-03 14:58:00 -07:00 |
|
Anton Georgiev
|
7d10ac1a98
|
Merge pull request #4630 from antobinary/pods_vol4
Presentation Pods - handle zoom, move and remove; cleanup
|
2017-11-03 18:29:11 -02:00 |
|
Anton Georgiev
|
9cd8491d70
|
pass podId when removing/clearing presentation
|
2017-11-03 16:24:55 -04:00 |
|
Anton Georgiev
|
411307af3f
|
handle zoom and move event in presentation pods
|
2017-11-03 15:35:59 -04:00 |
|
Chad Pilkey
|
6fcf97eaf6
|
Merge pull request #4629 from capilkey/drop-mic-on-call-end
Attempt to release mic when not needed for webrtc
|
2017-11-03 14:54:19 -04:00 |
|
Anton Georgiev
|
2b1d88a358
|
Merge pull request #4628 from antobinary/pods_vol4
Presentation Pods - handle polling (only on default presentation pod)
|
2017-11-03 15:09:58 -02:00 |
|
Chad Pilkey
|
04f268a259
|
Merge pull request #4627 from capilkey/drop-mic-on-call-end
Release the saved WebRTC microphone when call ends
|
2017-11-03 12:49:17 -04:00 |
|
Chad Pilkey
|
22c160008e
|
attempt to release mic when not needed for webrtc
|
2017-11-03 12:47:26 -04:00 |
|