perroned
|
c13cb35c2b
|
Cleans up
|
2017-07-10 12:03:01 -04:00 |
|
Richard Alam
|
2cf5679e3e
|
Merge pull request #4062 from ritzalam/implement-emoji-message
- start implementing lock settings
|
2017-07-10 10:34:57 -04:00 |
|
Richard Alam
|
7a7712d986
|
- start implementing lock settings
|
2017-07-09 15:00:13 -07:00 |
|
perroned
|
03a97fef46
|
Cleans up -> StringUtils
|
2017-07-09 14:43:20 -04:00 |
|
perroned
|
020df250a6
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
|
2017-07-09 14:39:57 -04:00 |
|
Anton Georgiev
|
0e9dcee399
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
|
2017-07-09 11:09:23 -04:00 |
|
Richard Alam
|
2e3d9e1bda
|
Merge pull request #4061 from ritzalam/implement-emoji-message
- implement emoji status message
|
2017-07-09 10:56:03 -04:00 |
|
Richard Alam
|
8d91ef8132
|
- convert several old client messages to new ones
|
2017-07-09 07:44:29 -07:00 |
|
Anton Georgiev
|
35b87ee069
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
|
2017-07-09 10:37:34 -04:00 |
|
Anton Georgiev
|
900518fb1b
|
cleanup
|
2017-07-09 10:26:55 -04:00 |
|
Richard Alam
|
5dbb8d5515
|
- implement emoji status message
|
2017-07-08 13:39:41 -07:00 |
|
Richard Alam
|
6588e6e89a
|
Merge pull request #4052 from capilkey/improve-shell-resize
Skip layout change when dimensions are invalid
|
2017-07-08 15:11:45 -04:00 |
|
Richard Alam
|
366e2033c5
|
Merge pull request #4060 from perroned/fix-ss-2x
Restores 1.1 JWS Screensharing on 2.0
|
2017-07-08 15:11:24 -04:00 |
|
Richard Alam
|
4248d7e4f9
|
Merge branch 'capilkey-move-chat-messages-2x' into bbb-2x-mconf
|
2017-07-08 08:41:58 -07:00 |
|
Richard Alam
|
77de38e2f3
|
Merge branch 'move-chat-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-chat-messages-2x
|
2017-07-08 08:41:20 -07:00 |
|
perroned
|
f77b29bad3
|
Restores 1.1 ss
|
2017-07-08 11:29:13 -04:00 |
|
Richard Alam
|
c442554cd7
|
Merge pull request #4059 from ritzalam/implement-meeting-status
Removing old messages
|
2017-07-08 11:07:59 -04:00 |
|
Richard Alam
|
0cf4227273
|
Merge branch 'implement-bbb-web-msgs' into implement-meeting-status
|
2017-07-08 08:04:13 -07:00 |
|
Richard Alam
|
2212d95a28
|
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into implement-meeting-status
|
2017-07-08 07:23:30 -07:00 |
|
Richard Alam
|
1320988a95
|
- handle register user properly
|
2017-07-08 07:22:45 -07:00 |
|
Chad Pilkey
|
e30ba20323
|
avoid exception when cursor user isn't found
|
2017-07-07 20:16:43 -04:00 |
|
Chad Pilkey
|
bf9f6df9b1
|
remove all 1.1 chat messaging code
|
2017-07-07 20:16:14 -04:00 |
|
Chad Pilkey
|
550b880db7
|
convert chat messages to 2x
|
2017-07-07 19:14:00 -04:00 |
|
Richard Alam
|
507cc69939
|
- fix compile issues
|
2017-07-07 14:51:25 -07:00 |
|
Fred Dixon
|
853984f535
|
Merge pull request #4057 from capilkey/remove-ss-from-presentation-2x
Remove screenshare from presentation
|
2017-07-07 17:42:36 -04:00 |
|
perroned
|
1b92aba481
|
Hangup and reconnect safely
|
2017-07-07 17:27:28 -04:00 |
|
Richard Alam
|
70c7ebc1a1
|
- continue removing old messages in akka-apps
|
2017-07-07 14:23:56 -07:00 |
|
perroned
|
f5650b1d16
|
Makes utility for webrtc capabilities
|
2017-07-07 17:06:52 -04:00 |
|
perroned
|
c08f9d4d7b
|
Changes handler to WebRTC status class
|
2017-07-07 17:02:07 -04:00 |
|
perroned
|
cc497136e8
|
Add screenshare fallbacks
|
2017-07-07 17:01:53 -04:00 |
|
perroned
|
f92be502cc
|
Moves constraints to initialization
|
2017-07-07 17:01:33 -04:00 |
|
Chad Pilkey
|
fc3d7a05aa
|
remove the screenshare code from the presentation module
|
2017-07-07 17:01:27 -04:00 |
|
Anton Georgiev
|
a0f90f181d
|
assign proper userId for assignedBy
|
2017-07-07 11:25:48 -04:00 |
|
Anton Georgiev
|
dd38cebe58
|
trigger UI changes if we are the presenter
|
2017-07-07 10:51:11 -04:00 |
|
Anton Georgiev
|
0ec660c8d3
|
handle assign presenter in flash client and akka apps
|
2017-07-07 10:32:38 -04:00 |
|
Richard Alam
|
a0ed7685ce
|
- continue removing old code
|
2017-07-06 18:48:26 -07:00 |
|
Richard Alam
|
2945c0e6fc
|
- continue removing old messages
|
2017-07-06 14:50:34 -07:00 |
|
Anton Georgiev
|
3237f9a653
|
Merge pull request #4055 from Klauswk/html5-2x-getAll-messages
[Html5 2.0] Move Sync and Presentations Messages to 2.0
|
2017-07-06 15:57:52 -04:00 |
|
Klaus
|
3d091e7a26
|
Change if
|
2017-07-06 15:07:52 -03:00 |
|
Klaus
|
9b32a4db2d
|
Remove 'nodeJSapp' stuff, is deprecated
|
2017-07-06 15:01:05 -03:00 |
|
Klaus
|
dfa13b30f6
|
Add comment to change in the redis2x
|
2017-07-06 09:56:39 -03:00 |
|
Klaus
|
94da6f636f
|
Merge branch 'html5-2x-getAll-messages' of https://github.com/Klauswk/bigbluebutton into html5-2x-getAll-messages
|
2017-07-06 09:32:14 -03:00 |
|
Klaus
|
2058e14ae7
|
Fix lint problems
|
2017-07-06 09:29:17 -03:00 |
|
Klaus
|
cc38576f79
|
Add missing events
|
2017-07-06 08:58:38 -03:00 |
|
Richard Alam
|
246fded4ff
|
- start removing old out messages
|
2017-07-05 14:08:30 -07:00 |
|
Klauswk
|
ebb3984828
|
Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages
|
2017-07-05 15:28:35 -03:00 |
|
Richard Alam
|
44f7b0c622
|
- remove old users model
|
2017-07-05 11:20:48 -07:00 |
|
Klaus
|
3f445bc92e
|
Change log
|
2017-07-05 14:26:22 -03:00 |
|
Anton Georgiev
|
23f4521954
|
Merge pull request #4038 from oswaldoacauan/flat-add-meeting
[HTML5 2.0] Add flat package and implement on addMeeting modifier
|
2017-07-05 11:13:23 -04:00 |
|
Chad Pilkey
|
f0ce1c416f
|
change main app shell resize handler
|
2017-07-04 17:17:56 -04:00 |
|