Anton Georgiev
d521b19623
Merge branch 'implement-multi-chat' of github.com:ritzalam/bigbluebutton into pods_vol3
2017-10-03 11:13:48 -04:00
Anton Georgiev
0866bc01ce
independent pods, visible slide on presenter side
2017-10-03 11:06:54 -04:00
Richard Alam
046b9780fe
- fix compile error
2017-10-02 18:41:04 -07:00
Richard Alam
a3ad18347e
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat
2017-10-02 18:28:02 -07:00
Richard Alam
5dcb173ff9
Merge branch 'riadvice-2x-client-theme' into v2.0.x-release
2017-10-02 18:02:02 -07:00
Richard Alam
8ae38b6f5a
- format
2017-10-02 18:01:33 -07:00
Richard Alam
5b05df9562
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
2017-10-02 17:44:58 -07:00
Richard Alam
3194735a0b
- handle private chat
2017-10-02 14:43:18 -07:00
Richard Alam
8d38f7fcc2
- create group chat message
2017-10-02 14:04:05 -07:00
KDSBrowne
67a621c6c5
add focus-border-offset css variable
2017-10-02 13:39:04 -07:00
KDSBrowne
0b50594b91
remove cal funtion
2017-10-02 13:36:37 -07:00
Ghazi Triki
0276a0fc41
Fix toolbar background color option.
2017-10-02 21:06:13 +01:00
Richard Alam
1f8186fea6
- handle public chat message
2017-10-02 13:05:19 -07:00
KDSBrowne
97aca5ee91
re apply userlist focus styles
2017-10-02 12:49:26 -07:00
KDSBrowne
10f95f11e1
fix merge conflicts
2017-10-02 12:37:51 -07:00
Richard Alam
e066b7de3b
Merge pull request #4444 from kepstin/bbb-20-rec-fixes
...
Correctly handle a recording start being the last event in a recording.
2017-10-02 14:17:08 -04:00
Richard Alam
fb72db4c8d
- open new public chat window
2017-10-02 11:04:11 -07:00
Ghazi Triki
ab93ae6c22
Fix send breakout room join url for late joiners.
2017-10-02 18:56:36 +01:00
Fred Dixon
798520daa9
Update bigbluebutton-release
2017-10-02 13:45:26 -04:00
Anton Georgiev
5c071756a0
Merge pull request #4438 from KDSBrowne/xx-04-logoutURL-issue
...
[HTML5] - logoutRouteHandler Fix
2017-10-02 13:33:54 -04:00
Anton Georgiev
48dfc178ba
Merge pull request #4423 from oswaldoacauan/presentation-manager-merge
...
[HTML5 2.0] Presentation Manager
2017-10-02 13:31:28 -04:00
Calvin Walton
e37db34eb4
Correctly handle a recording start being the last event in a recording.
...
In some unusual cases, the recording start can be the last event in the
events file, or at least have the same timestamp as such.
Add some code to check the array bounds and break if needed, so we
don't check the timestamp on the (non-existant) event after the last
event.
2017-10-02 12:31:31 -04:00
Richard Alam
b71aaed133
- open multi chat windows
2017-10-02 08:30:20 -07:00
Oswaldo Acauan
230a2d5263
Fix silent changes caused by the old pr revert
2017-10-02 11:12:58 -03:00
Richard Alam
398e6f7a02
- try opening windows
2017-10-01 17:29:44 -07:00
Anton Georgiev
60904989b3
work on set presentation (client + akka apps)
2017-10-01 09:50:12 -04:00
Anton Georgiev
670f2b2564
add default pod if no pods in meeting
2017-10-01 07:36:01 -04:00
Anton Georgiev
0b87df5067
add existing pods on join
2017-09-30 08:27:16 -04:00
Anton Georgiev
23dadc5477
work on separating pods - client/conversion/apps
2017-09-29 18:20:33 -04:00
Richard Alam
46f1b0ffa8
- display chat history
2017-09-29 14:45:29 -07:00
Oswaldo Acauan
89c2947d78
Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge
2017-09-29 17:32:31 -03:00
KDSBrowne
bc0647ad50
fix merge conflicts
2017-09-29 12:04:27 -07:00
KDSBrowne
3b6aed34ae
check for voice user and remove if exists
2017-09-29 11:58:24 -07:00
Anton Georgiev
7c5683c866
Merge pull request #4291 from Klauswk/html5-refactor-userlist
...
[HTML5 2.0] Refactor UserList Components
2017-09-29 14:08:12 -04:00
Oswaldo Acauan
4063ae548b
Remove debug code
2017-09-29 14:47:16 -03:00
Oswaldo Acauan
f8421d4a62
Fix setPresentation on newly uploaded files
2017-09-29 14:44:18 -03:00
Richard Alam
f6a993763c
- remove users from guests waiting list
2017-09-29 10:32:05 -07:00
Ghazi Triki
f15da651c8
Correctly display users breakout rooms in users list.
2017-09-29 18:24:17 +01:00
Fred Dixon
67aec4e814
Testing builds after the switch to v2.0.x-release
2017-09-29 13:10:05 -04:00
Richard Alam
ffb58bf086
Merge pull request #4443 from ritzalam/merge-2x-mconf-to-master
...
Merge 2x-mconf branch into master
2017-09-29 12:55:22 -04:00
Richard Alam
7837631b88
- approve guest access
2017-09-29 09:38:20 -07:00
KDSBrowne
b2d78b4f8a
remove unused callback function
2017-09-29 09:21:04 -07:00
Richard Alam
a2d403e9fd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-2x-mconf-to-master
2017-09-29 08:41:30 -07:00
Anton Georgiev
35ed73c9ae
Merge pull request #4442 from bigbluebutton/revert-4371-presentation-uploader-2x
...
Revert "[HTML5 2.0] Presentation Manager"
2017-09-29 11:38:20 -04:00
Anton Georgiev
dbd00f3445
Revert "[HTML5 2.0] Presentation Manager"
2017-09-29 11:35:05 -04:00
KDSBrowne
6bb93ff6fd
clean up css, remove duplications
2017-09-29 07:54:24 -07:00
Oswaldo Acauan
c186840c3c
Fix current presentation being unset
2017-09-29 11:13:54 -03:00
Oswaldo Acauan
0e10fa2aa6
Fix typo
2017-09-29 11:10:35 -03:00
Oswaldo Acauan
43685f84d3
Fix intl propType and linter
2017-09-29 11:03:08 -03:00
Oswaldo Acauan
bb94ed6b25
Remove unused defaultProps
2017-09-29 10:51:41 -03:00
