Commit Graph

16378 Commits

Author SHA1 Message Date
Chad Pilkey
28101e5623 moved setting the whiteboard id to display out of preswindow 2017-06-09 15:30:20 -04:00
Chad Pilkey
b4429fbf2d remove mconf branding that shouldn't be there 2017-06-08 18:39:45 -04:00
Chad Pilkey
894b5bcab6 remove unneeded redraw of the annotation history 2017-06-08 18:39:22 -04:00
Chad Pilkey
e1a50bed32 stop sending redundant slide pos updates 2017-06-08 18:38:43 -04:00
Chad Pilkey
e7a2e3d70b send page changes to the whiteboard canvas again 2017-06-08 18:37:36 -04:00
Chad Pilkey
f559a54a95 fix presentation startup race condition 2017-06-08 18:34:38 -04:00
Richard Alam
9d88c8252b Merge pull request #4002 from ritzalam/migrate-messages
handle start/stop broadcast cam on the client
2017-06-07 15:15:04 -04:00
Richard Alam
7db33c594b - handle start/stop brocast cam on the client 2017-06-07 12:12:30 -07:00
Richard Alam
51bd8f5f07 Merge pull request #4001 from ritzalam/migrate-messages
user start/stop broadcast cam message
2017-06-07 14:15:32 -04:00
Richard Alam
7e14c133b3 - send start/stop broadcasting webcam from client to server
- send webcam broadcast started/stopped event from server to client
2017-06-07 11:08:46 -07:00
Richard Alam
d48d06c69f - send validate token using new message 2017-06-07 08:04:33 -07:00
Richard Alam
8fa960e46d Merge pull request #3989 from riadvice/add-show-webrtc-mos-feature
Add showWebRTCMOS option to PhoneModule
2017-06-07 10:44:38 -04:00
Richard Alam
8998737a5f Merge pull request #4000 from ritzalam/migrate-messages
- change how we deserialize message so we can log errors
2017-06-07 10:35:58 -04:00
Richard Alam
15f4a61e52 Merge pull request #3969 from riadvice/flex4-mx
Move the application to Flex 4 MX
2017-06-07 10:33:12 -04:00
Richard Alam
ca7a8d7bad Merge pull request #3995 from capilkey/whiteboard-cursor-fixes
Whiteboard cursor fixes
2017-06-07 10:03:24 -04:00
Ghazi Triki
08cb77c604 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into flex4-mx
# Conflicts:
#	bigbluebutton-client/build.xml
2017-06-07 10:16:35 +01:00
Chad Pilkey
c46f5f8a17 Add instructions for stopping akka apps 2017-06-06 18:18:33 -04:00
Richard Alam
2989e1a694 - create classes for messages in flash client 2017-06-06 15:14:34 -07:00
Richard Alam
5ef4dd9e88 - change how we deserialize message so we can log errors
- add helper methods to add routing info for messages
 - add a way to deserialize message from client
2017-06-06 14:25:40 -07:00
Chad Pilkey
ef8ff6f1b4 add a name next to the whiteboard cursor for clarity 2017-06-05 18:56:10 -04:00
Chad Pilkey
16da46d717 avoid divide by zero case in cursor listener 2017-06-05 18:55:17 -04:00
Chad Pilkey
0913d18661 reset cursor in whiteboard canvas when the canvas is disabled 2017-06-05 18:54:05 -04:00
Richard Alam
6f8f821beb Merge pull request #3983 from antobinary/2.0
Drop requirement for session[sessionToken]Send sessionToken in enterAPI redirect=false
2017-06-05 18:37:51 -04:00
Richard Alam
2714e2c805 Merge pull request #3994 from capilkey/fix-whiteboard-IME
Enable IME for text tool's basic TextField - fixes #2678
2017-06-05 18:37:32 -04:00
Chad Pilkey
5f34a359c5 Enable IME for text tool's basic TextField - fixes #2678 2017-06-05 18:22:40 -04:00
Richard Alam
16f67377e5 Merge pull request #3991 from ritzalam/move-java-classes-from-bbb-web-to-bbb-common-web
Add instructions on how to convert old message to new message
2017-06-05 10:39:49 -04:00
Richard Alam
561c5d88e5 - add instructions on how to convert old message to new message 2017-06-05 07:36:55 -07:00
Richard Alam
61a1734efb Merge pull request #3982 from ritzalam/move-java-classes-from-bbb-web-to-bbb-common-web
Merging new way of sending messages
2017-06-05 09:36:08 -04:00
Ghazi Triki
cd8f09170f Add showWebRTCMOS option. 2017-06-05 13:28:24 +01:00
Anton Georgiev
e59f5ac3ff drop requirement for session[sessionToken]; send sessionToken in enterAPI redirect=false 2017-06-02 13:54:13 -04:00
Richard Alam
5fed6779d4 - enable logging of akka system in bbb-web 2017-06-02 09:35:24 -07:00
Richard Alam
8beab449d5 - enable logging for bbb-apps 2017-06-02 07:17:01 -07:00
Richard Alam
2bbeba686d Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-06-01 10:03:27 -07:00
Richard Alam
4574a9cb87 Merge branch 'move-java-classes-from-bbb-web-to-bbb-common-web' of github.com:ritzalam/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-06-01 09:48:40 -07:00
Richard Alam
1a58703fa4 - redo how we deserialize messages 2017-06-01 09:47:14 -07:00
Richard Alam
2bce70c065 Merge pull request #3968 from capilkey/multi-user-cursor
Fix shape drawing and set max text length for text annotations
2017-06-01 11:08:42 -04:00
Richard Alam
98f178b985 Merge pull request #19 from riadvice/web-and-akka-apps-update
Web and akka apps update
2017-06-01 10:26:36 -04:00
Ghazi Triki
08ff58f2b4 Fix akka-bbb-fsesl build.sbt and upgrade scala to 2.12.2 and akka to 2.5.1 2017-06-01 15:00:32 +01:00
Ghazi Triki
65a3d16fdb Minor fixes to DEVELOPMENT.md 2017-06-01 14:58:38 +01:00
Richard Alam
7f9809459c - try to simpify deserializer 2017-05-31 11:50:59 -07:00
Richard Alam
31958979ef - change localize ant target to locale 2017-05-31 08:13:19 -07:00
Richard Alam
92b06349e5 - update developement doc 2017-05-31 06:50:13 -07:00
Richard Alam
7b393b80fc Merge pull request #3970 from riadvice/fix-hangup
Fix application startup hanging
2017-05-31 09:07:55 -04:00
Ghazi Triki
184b2a3c9a Uncomment showAllChildren and hideAllChildren methods after reverting back updates to flexlib.swc 2017-05-30 22:57:52 +01:00
Richard Alam
2999e71530 - remove meeting model 2017-05-29 18:59:00 -07:00
Richard Alam
47b0ada045 - track meeting status 2017-05-29 14:41:37 -07:00
Ghazi Triki
6b05222da5 Remove the callLater MDIManagerEvent.WINDOW_ADD listener to avoid the application hangup when loading. 2017-05-29 20:58:23 +01:00
Richard Alam
84bfd93701 - handle register user message 2017-05-29 12:17:25 -07:00
Ghazi Triki
aaf9b336f3 Transform the client to a Flex 4 mx application. 2017-05-29 13:58:18 +01:00
Ghazi Triki
6af4753e42 Updated flexlib.swc library with more fixes. 2017-05-29 13:53:26 +01:00