Leonardo Crauss Daronco
af87bc2d3f
Merge remote-tracking branch 'upstream/master' into v1.1.0-rap-on-resque
2017-10-09 16:37:28 -03:00
Anton Georgiev
9550d70184
Merge pull request #4458 from antobinary/pods_vol3
...
Enable presentation token storage in bbb-web
2017-10-04 18:40:01 -04:00
Anton Georgiev
b4210ea12f
enable presentation token storage in bbb-web
2017-10-04 18:38:28 -04:00
Richard Alam
c42fb1e0fc
Merge pull request #4456 from ritzalam/implement-multi-chat
...
- fix passing of guest policy through create api
2017-10-03 17:46:30 -04:00
Richard Alam
b87adb98fb
- fix passing of guest policy through create api
2017-10-03 14:45:32 -07:00
Richard Alam
79dccefecb
Merge branch 'riadvice-information-bar'
2017-10-03 14:19:50 -07:00
Richard Alam
3a9c4bb8ff
Merge branch 'implement-multi-chat' into riadvice-information-bar
2017-10-03 14:05:34 -07:00
Richard Alam
a3e37dffa5
Merge branch 'information-bar' of https://github.com/riadvice/bigbluebutton
2017-10-03 14:04:12 -07:00
Richard Alam
6ce535b0d2
- change default policy to always accept
2017-10-03 14:03:16 -07:00
Ghazi Triki
e96d6ae726
Add new API options to display a banner in the client.
2017-10-03 21:49:06 +01:00
Richard Alam
7975b7da13
Merge pull request #4454 from ritzalam/implement-multi-chat
...
- create private and public chats
2017-10-03 16:43:36 -04:00
Richard Alam
2958095b32
- create private and public chats
2017-10-03 13:42:24 -07:00
Richard Alam
5a2e4cbf9e
Merge pull request #4450 from ritzalam/implement-multi-chat
...
Developing next release
2017-10-03 14:13:59 -04:00
Richard Alam
5b2cda0723
Merge branch 'antobinary-pods_vol3' into implement-multi-chat
2017-10-03 11:02:52 -07:00
Richard Alam
04ae60f6aa
- fix determining of guest status
2017-10-03 11:01:48 -07:00
Richard Alam
5628ee9004
Merge pull request #4448 from ritzalam/implement-multi-chat
...
Development for the next release
2017-10-03 13:41:02 -04:00
Richard Alam
058751c3f2
Merge branch 'pods_vol3' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol3
2017-10-03 08:44:26 -07:00
Anton Georgiev
301003bc2d
cleanup
2017-10-03 11:43:16 -04:00
Richard Alam
ac599366be
- remove akka http prototype as redis scala is incompatible with the latest akka release
2017-10-03 08:36:18 -07:00
Richard Alam
51405e4018
- open private chat only in main chat window
2017-10-03 08:20:53 -07:00
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
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
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
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
