Richard Alam
|
baadb8bb68
|
Merge branch 'master' of /home/ubuntu/dev/bigbluebutton into reroute-client-messages
|
2018-04-09 08:27:41 -07:00 |
|
Richard Alam
|
5440bdd1a5
|
- setup wss in haproxy
|
2018-03-28 12:31:19 -07:00 |
|
Richard Alam
|
54fcaf70ef
|
- send message through vertx
|
2018-03-27 17:40:31 -07:00 |
|
Richard Alam
|
b1a56ac285
|
- add vertx lib
|
2018-03-25 18:27:57 -07:00 |
|
Richard Alam
|
1eece33887
|
- send messages
|
2018-03-23 18:57:58 -07:00 |
|
Richard Alam
|
ef2f7740fc
|
- reroute message
|
2018-03-23 14:18:04 -07:00 |
|
Richard Alam
|
efaf450472
|
- allow promoting of non-guest viewers to moderator role
|
2018-03-23 12:34:50 -07:00 |
|
Chad Pilkey
|
8e5f3093e6
|
improve interaction between multiuser and cursors
|
2018-02-09 19:02:34 -05:00 |
|
Richard Alam
|
34bc824472
|
- hide broadcast layout button for viewers
|
2018-02-07 12:36:12 -08:00 |
|
Richard Alam
|
96a77ef9c6
|
- remove trace logs
|
2018-02-05 11:08:56 -08:00 |
|
Richard Alam
|
8188dff9dc
|
- fix double welcome messages
|
2018-02-05 08:47:41 -08:00 |
|
Richard Alam
|
b91f2abde5
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master
|
2018-02-01 12:50:43 -08:00 |
|
Richard Alam
|
5a5232d43d
|
- put logos into its own directory
|
2018-02-01 08:47:36 -08:00 |
|
Richard Alam
|
6f7669c390
|
Merge branch 'moderator-message-ui' of https://github.com/riadvice/bigbluebutton into riadvice-moderator-message-ui
|
2018-02-01 08:26:15 -08:00 |
|
Richard Alam
|
d58f1ec5e7
|
Merge branch '2.0-updates' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-updates
|
2018-02-01 07:40:27 -08:00 |
|
Fred Dixon
|
feff36a352
|
Merge pull request #5076 from riadvice/remove-spark
Replace remnant spark labels by mx label and text
|
2018-02-01 09:03:29 -05:00 |
|
Ghazi Triki
|
26aa84c4cc
|
Replace remnant spark labels by mx label and text.
|
2018-02-01 11:17:34 +01:00 |
|
Ghazi Triki
|
47cd5309b0
|
Show "Viewers Locked" when webcamsOnlyForModerator is on.
|
2018-02-01 10:26:09 +01:00 |
|
Fred Dixon
|
7617828770
|
Merge pull request #5064 from riadvice/microphone-highlight
Highlight microphone icon in users list when microphone is locked
|
2018-01-31 20:03:53 -05:00 |
|
Richard Alam
|
06faa8a448
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master
|
2018-01-31 14:38:43 -08:00 |
|
Richard Alam
|
40b3c6aff8
|
Merge pull request #5069 from ritzalam/backport-rtmps-support-to-2.0
Backport rtmps support to 2.0
|
2018-01-31 16:43:36 -05:00 |
|
Ghazi Triki
|
e407060486
|
Fully rely on binding to display chat messages.
|
2018-01-31 21:40:18 +01:00 |
|
Richard Alam
|
6485110a72
|
- clean up logging
|
2018-01-31 08:38:54 -08:00 |
|
Richard Alam
|
c4085c4482
|
- use proper video context url
|
2018-01-30 13:17:23 -08:00 |
|
Richard Alam
|
0bc3a06837
|
- backpot rtmp support
|
2018-01-30 12:54:20 -08:00 |
|
Ghazi Triki
|
017e324496
|
Highlight microphone icon in users list when microphone is locked.
|
2018-01-30 18:30:57 +01:00 |
|
Richard Alam
|
f88f6c3d64
|
- determine voice connection type
|
2018-01-30 08:31:20 -08:00 |
|
Richard Alam
|
77a477b5cc
|
- port test connection
|
2018-01-30 08:16:24 -08:00 |
|
Richard Alam
|
b0e5d61dee
|
- determine port test connection type
|
2018-01-30 08:16:08 -08:00 |
|
Richard Alam
|
3f467cb579
|
- remove port test server url
|
2018-01-30 08:09:10 -08:00 |
|
Richard Alam
|
418d2184a4
|
- add protocol for bwmon and port test
|
2018-01-30 07:47:29 -08:00 |
|
Richard Alam
|
e388173f1f
|
- bw mon determine connection type
|
2018-01-30 07:45:17 -08:00 |
|
Richard Alam
|
a3f3760d49
|
- add bw mon options and some string constants
|
2018-01-30 07:43:33 -08:00 |
|
Ghazi Triki
|
018e23d149
|
Add a new graphic callout for chrome permissions on windows.
|
2018-01-30 11:45:19 +01:00 |
|
Ghazi Triki
|
83f8d4d393
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.0-updates
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/util/QueryStringParameters.as
|
2018-01-30 07:13:54 +01:00 |
|
Richard Alam
|
962b520d6a
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master
|
2018-01-29 12:53:20 -08:00 |
|
Richard Alam
|
1354b065be
|
Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master
|
2018-01-29 12:36:41 -08:00 |
|
Richard Alam
|
b0ce2ac0c1
|
Merge pull request #5057 from ritzalam/log-network-change-event
- add more logging when screenshare auto-reconnects
|
2018-01-29 10:35:45 -05:00 |
|
Richard Alam
|
e2416dc665
|
- add more logging when screenshare auto-reconnects
|
2018-01-29 07:34:41 -08:00 |
|
Ghazi Triki
|
4e46ad806a
|
Acoid null params array in QueryStringParameters.
|
2018-01-29 14:23:19 +01:00 |
|
Ghazi Triki
|
718d260c9b
|
Do not display user feedback window in breakout rooms.
|
2018-01-29 07:59:57 +01:00 |
|
Ghazi Triki
|
4c039507e0
|
Keep only one green color in color pickers.
|
2018-01-29 07:58:14 +01:00 |
|
Fred Dixon
|
036a23cfb1
|
Updated copyright date
|
2018-01-28 13:33:18 -05:00 |
|
Fred Dixon
|
189c05001e
|
Adjusting the wording in Lock Settings dialog
|
2018-01-28 13:06:58 -05:00 |
|
Fred Dixon
|
728c71c327
|
Minor tweek in wording for Polling dialog
|
2018-01-28 12:17:16 -05:00 |
|
Richard Alam
|
7d1d0b55f8
|
Merge pull request #5026 from ritzalam/require-auth-token-on-red5-connect
Require auth token on red5 connect
|
2018-01-26 17:22:07 -05:00 |
|
Richard Alam
|
4bb9f22a12
|
- log flash network change event to figure out if that is the one causing reconnects
|
2018-01-26 13:24:56 -08:00 |
|
Richard Alam
|
b05237b075
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master
|
2018-01-26 12:51:39 -08:00 |
|
Richard Alam
|
0985750ae6
|
Merge pull request #5038 from riadvice/2.0-ui-fixes
Use a separate label for LoadingBar
|
2018-01-26 12:02:37 -05:00 |
|
Ghazi Triki
|
2fc30ec310
|
Use a separate label for LoadingBar.
|
2018-01-26 17:06:00 +01:00 |
|