BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,404 Commits 13 Branches 260 Tags 1.1 GiB
c7c39989a3
Commit Graph

16404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ghazi Triki
f61308af64 Remove flex 3 compatibility mode from client build. 2017-05-29 13:53:07 +01:00
Richard Alam
bd83dc012e - fix test 2017-05-28 18:12:52 -07:00
Richard Alam
240176ca32 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-27 18:30:50 -07:00
Richard Alam
272df3c23d - send message to client 2017-05-26 20:00:33 -07:00
Chad Pilkey
3fe1103ea2 set a max text length of 1024 for text annotations 2017-05-26 18:52:46 -04:00
Chad Pilkey
3683bac311 allow shapes to draw again in the whiteboard 2017-05-26 18:51:59 -04:00
Richard Alam
73ec6bb25d - implement validate auth token 2017-05-26 10:04:38 -07:00
Richard Alam
7a60aec83c Merge pull request #3954 from riadvice/faster-options-reading 
Improve client options reading
 2017-05-26 09:45:39 -04:00
Richard Alam
7f0e187aef Merge pull request #3967 from capilkey/multi-user-cursor 
First pass at multi-user cursors in the whiteboard
 2017-05-26 09:44:41 -04:00
Chad Pilkey
302040b86d fix whiteboard shapes to again send proper statuses 2017-05-25 23:46:52 -04:00
Chad Pilkey
b7fb0588bb update WhiteboardTextToolbar to save colour and font between uses 2017-05-25 23:46:24 -04:00
Chad Pilkey
09ec1e6151 first pass at multi whiteboard cursors 2017-05-25 23:45:27 -04:00
Richard Alam
18cce3a818 - send and handle meeting created event 2017-05-25 14:34:46 -07:00
Richard Alam
72f7272eb7 - handle create meeting request message 2017-05-25 13:02:26 -07:00
Ghazi Triki
30a60b0e2b More improvements to the configuration parsing. 2017-05-25 11:57:51 +01:00
Richard Alam
e56a758c5f - send create message from bbb-web 2017-05-24 15:19:03 -07:00
Ghazi Triki
fd2535236a Read configuration options for version 2 using the new Options class. 2017-05-24 12:19:25 +01:00
Richard Alam
467598ffd2 - turn off keep alive message 2017-05-23 17:36:05 -07:00
Richard Alam
4aedea9f5a - try new messages 2017-05-23 17:02:40 -07:00
Richard Alam
064128dbbc - wire bbb-apps 2017-05-23 15:34:08 -07:00
Ghazi Triki
ef306c748f Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into faster-options-reading 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/LayoutOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2017-05-23 22:59:09 +01:00
Richard Alam
b6176ac736 Merge pull request #3957 from capilkey/multi-user-2.0-take5 
Whiteboard updates for 2.0
 2017-05-23 14:55:18 -04:00
Richard Alam
4dda35a3e3 Merge pull request #3961 from riadvice/2x-ui-improve 
Fix checking branding options
 2017-05-23 13:56:11 -04:00
Richard Alam
afa320dcbc Merge pull request #3959 from riadvice/merge-master-into-2x 
Merge master into 2x branch
 2017-05-23 13:54:46 -04:00