Anton Georgiev
|
c810c2cf73
|
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs
|
2017-07-10 17:26:04 -04:00 |
|
Anton Georgiev
|
797b2904aa
|
handle eject user from meeting (a.k.a. kick)
|
2017-07-10 15:36:26 -04:00 |
|
Richard Alam
|
7a7712d986
|
- start implementing lock settings
|
2017-07-09 15:00:13 -07: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
|
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
|
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 |
|
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
|
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
|
70c7ebc1a1
|
- continue removing old messages in akka-apps
|
2017-07-07 14:23:56 -07: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 |
|
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 |
|
Richard Alam
|
53bdd7f008
|
- handle messages from akka-apps to update meeting state in bbb-web used to return
in GetMeetingInfo API requests
|
2017-07-04 12:58:26 -07:00 |
|
Richard Alam
|
955b162915
|
- send new presentation conversion progress messages
|
2017-07-04 10:32:30 -07:00 |
|
Richard Alam
|
dfabf2f224
|
Merge branch '2.0-sharednotes-messages' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-2.0-sharednotes-messages
|
2017-07-04 07:02:11 -07:00 |
|
Pedro Beschorner Marin
|
962deb555d
|
Removed synchronized blocks from sharednotes akka-app
|
2017-07-03 20:22:13 +00:00 |
|
Pedro Beschorner Marin
|
0c3d5990ff
|
Replaced sharednotes mutable Stack undo/redo structures for immutable List
|
2017-07-03 17:29:39 +00:00 |
|
Pedro Beschorner Marin
|
79cf6bb623
|
Moved sharednotes messages to 2.0 format
|
2017-07-03 17:28:12 +00:00 |
|
Anton Georgiev
|
189230cc43
|
Merge branch 'sync' into presentation-and-slides
|
2017-06-30 14:12:25 -04:00 |
|
Anton Georgiev
|
2e0f6d8610
|
trigger syncing with state from akka-apps
|
2017-06-30 11:19:11 -04:00 |
|
Anton Georgiev
|
19d89c6f92
|
trigger syncing with state from akka-apps
|
2017-06-30 10:58:49 -04:00 |
|
Richard Alam
|
50acc517af
|
Merge branch 'fix-2.0-layout' of https://github.com/capilkey/bigbluebutton into capilkey-fix-2.0-layout
|
2017-06-29 18:20:40 -07:00 |
|
Chad Pilkey
|
4e5df30ac4
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout
|
2017-06-29 16:57:28 -04:00 |
|
Richard Alam
|
fcf41c9f61
|
- move to different packages
|
2017-06-29 13:55:37 -07:00 |
|
Chad Pilkey
|
9f904e6267
|
reorganized the layout code in akka-apps and fixed layout broadcast
|
2017-06-29 16:55:25 -04:00 |
|
Richard Alam
|
a11c45fa02
|
- implement handlers for guest policy
|
2017-06-29 11:34:08 -07:00 |
|
Chad Pilkey
|
15c938e9cd
|
fixed layout message response and removed redundant props
|
2017-06-29 14:32:31 -04:00 |
|
Richard Alam
|
29052e6f79
|
- send layout response to requester user instead of whole meeting
|
2017-06-29 07:31:23 -07:00 |
|
Richard Alam
|
0aed46c986
|
- add validate token handler tests
|
2017-06-28 14:56:35 -07:00 |
|
Richard Alam
|
f4bf6912d4
|
- add create meeting request test for BigBlueButtonActor
|
2017-06-28 09:01:45 -07:00 |
|
Richard Alam
|
04e55a1dd4
|
Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x
|
2017-06-28 07:47:56 -07:00 |
|
Richard Alam
|
30827f680e
|
- move messages into different package
|
2017-06-27 19:44:47 -07:00 |
|
Richard Alam
|
a32193bd68
|
- reorganize messages
|
2017-06-27 15:01:42 -07:00 |
|
Richard Alam
|
03010eedb2
|
- put users messages in one file
- put guest policy into it's own class
|
2017-06-27 13:05:38 -07:00 |
|
Chad Pilkey
|
4c66393dbd
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x
|
2017-06-26 18:09:56 -04:00 |
|
Richard Alam
|
f4bcb2421a
|
- send poll voting to client
|
2017-06-26 14:39:52 -07:00 |
|
Richard Alam
|
2316e73c26
|
Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls
|
2017-06-26 14:00:38 -07:00 |
|
Chad Pilkey
|
7c19972d24
|
remove pre-2.0 caption server code
|
2017-06-26 16:47:18 -04:00 |
|
Chad Pilkey
|
d690b49898
|
clear transcript owner when they leave the meeting
|
2017-06-26 16:46:09 -04:00 |
|
Anton Georgiev
|
f98bd01c3f
|
send poll result without extra stringify
|
2017-06-26 15:45:15 -04:00 |
|
Richard Alam
|
99046fb685
|
- handle emoji status changed message in client
|
2017-06-26 12:38:00 -07:00 |
|