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 |
|
Anton Georgiev
|
054b53b591
|
Merge pull request #4049 from oswaldoacauan/meteor-1.5
[HTML5 2.0] Upgrade Meteor to 1.5
|
2017-07-04 17:07:43 -04:00 |
|
Anton Georgiev
|
80b18c212f
|
Merge pull request #4051 from ritzalam/implement-bbb-web-msgs
handle messages from akka-apps
|
2017-07-04 17:06:42 -04:00 |
|
Richard Alam
|
50d73880bd
|
- cleanup
|
2017-07-04 13:02:51 -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 |
|
Anton Georgiev
|
416d47a445
|
Merge pull request #4050 from ritzalam/implement-bbb-web-msgs
Tested, worked as expected
|
2017-07-04 15:49:24 -04:00 |
|
Richard Alam
|
955b162915
|
- send new presentation conversion progress messages
|
2017-07-04 10:32:30 -07:00 |
|
Richard Alam
|
caa49b84cd
|
Merge branch 'bbb-2x-mconf' into implement-bbb-web-msgs
|
2017-07-04 07:20:08 -07:00 |
|
Richard Alam
|
c18f7e2f60
|
Merge branch 'pedrobmarin-2.0-sharednotes-messages' into bbb-2x-mconf
|
2017-07-04 07:17:46 -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 |
|
Oswaldo Acauan
|
6f76fd30c6
|
Upgrade Meteor to 1.5
|
2017-07-04 09:40:02 -03:00 |
|
Pedro Beschorner Marin
|
962deb555d
|
Removed synchronized blocks from sharednotes akka-app
|
2017-07-03 20:22:13 +00:00 |
|
Richard Alam
|
33b4cf45cd
|
- remove not needed files
|
2017-07-03 12:31:34 -07: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 |
|
Klaus
|
86d3e27d47
|
Merged info with anton's branch
|
2017-07-03 12:05:35 -03:00 |
|
Richard Alam
|
8ca0d6c9fe
|
- wire up new message path
|
2017-07-03 07:44:13 -07:00 |
|
Anton Georgiev
|
83e14e8206
|
handle slides messages
|
2017-06-30 15:16:00 -04: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
|
3f9ac22a1c
|
Merge pull request #4041 from ritzalam/handle-guest-policy
Layout message and package reorg
|
2017-06-29 21:23:37 -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
|
2c0a6adca6
|
Merge pull request #4039 from ritzalam/handle-guest-policy
Guest policy
|
2017-06-29 14:36:00 -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 |
|
Oswaldo Acauan
|
096b4d96a5
|
Update package-lock.json
|
2017-06-29 13:11:53 -03:00 |
|
Anton Georgiev
|
c9b877c465
|
Merge branch 'handle-messages' into presentation-and-slides
|
2017-06-29 10:39:00 -04:00 |
|
Anton Georgiev
|
ec8cf493d8
|
Merge pull request #4028 from Klauswk/html5-whiteboard-messages
Html5 - whiteboard messages 2x
|
2017-06-29 10:32:17 -04:00 |
|
Richard Alam
|
29052e6f79
|
- send layout response to requester user instead of whole meeting
|
2017-06-29 07:31:23 -07:00 |
|