Felipe Cecagno
2a3b95daf7
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-config/bin/bbb-conf
2016-01-26 18:33:31 -02:00
Pedro Beschorner Marin
6307b47ba8
Creating getRecordings XML response with FreeMarker
2016-01-26 18:59:36 +00:00
jfederico
2c214cafac
bigbluebuttonbn-web: Implemented filter for recordIDs [id:eq:xxxx,yyyy,zzzz]
2016-01-22 18:16:47 -05:00
jfederico
6b911820e0
bigbluebutton-web: Added filter parameter to getRecordings for filtering queries based on the state of the recording [published|unpublished|deleted]
2016-01-22 11:38:33 -05:00
jfederico
3265709455
bigbluebutton-web: Extended getRecordings for making direct searches based on recordID(s)
2016-01-21 15:24:22 -05:00
Richard Alam
0b898d0d29
- change how we process upload presentation. Before, an uploaded presentation consumes all of the
...
presentation conversion threads. If the presentation takes a lot of time and cpu to convert,
other uploaded presentations gets queued up and cannot be processed in parallel.
2016-01-21 17:24:13 +00:00
jfederico
334d4e4beb
bigbluebutton-web: Added state to xml responded by getRecordings
2016-01-19 15:16:45 -05:00
jfederico
67a70ccbc3
bigbluebutton-web: Reformatted code in apiController
2016-01-19 15:15:18 -05:00
jfederico
374982254e
bigbluebutton-web: Modified Config.groovy to allow log messages from controllers and services to be shown
2016-01-19 15:02:39 -05:00
Ghazi Triki
73614b4013
Fixed issue by assigning a value to a non existing iSbreakout property to UserSession class.
2016-01-16 18:30:17 +01:00
jfederico
52b171584f
bbb-web: Added WebXmlConfig.groovy in order to remove warning on plugins:webxml:1.4.1
...
https://grails.org/plugin/webxml
2016-01-14 16:33:16 -05:00
jfederico
e47c1895a8
bbb-web: Removed non used plugin (jquery) and updated the other plugins for eliminating WARNING messages
2016-01-14 16:05:25 -05:00
Ghazi Triki
b24ae090b0
Returning isBreakout conference state in join and enter API calls.
2016-01-14 17:15:36 +01:00
Ghazi Triki
827b74fe78
Fixed isBreakout parameter name when joining a breakout room.
2016-01-12 21:52:41 +01:00
Ghazi Triki
c0055c848f
The API returns "isBreakout" value for "getMeetings" and "getMeetingInfo" methods.
2016-01-12 16:53:37 +01:00
Richard Alam
16499b3da1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
akka-bbb-fsesl/build.sbt
bigbluebutton-web/build.gradle
2016-01-07 22:58:04 +00:00
Felipe Cecagno
019cfa6cfb
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as
2016-01-04 15:14:27 -02:00
Felipe Cecagno
8f08e13dcc
Merge remote-tracking branch 'bigbluebutton/master' into mconf
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
2015-12-30 18:35:13 -02:00
Ghazi Triki
b51dbd94b5
Updated faulty PDF file conversion mechanism. Now, we go through the following process:
...
- Extract the PDF page to a single PDF file.
- Convert the PDF file to a PNG image.
- Conert the PNG image to a SWF file.
2015-12-17 20:47:05 +01:00
Felipe Cecagno
ad7e3999e7
include size for the download formats on the getRecordings api call
2015-12-17 13:37:02 -02:00
Ghazi Triki
febc7ca9ea
- Implemented a new logic for detecting heavy converted swf files from PDF, using obejct placements, text and bitmap count.
...
- pdf2swf conversion fallback to 'bitmap' instead of 'poly2bitmap' to garantee that file can be opened fast with flash player.
2015-12-10 19:58:21 +01:00
Felipe Cecagno
555e037d79
fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0
2015-11-30 01:06:38 -02:00
Ghazi Triki
1da0bfe503
Inject maxSwfShapes to SwfAnalyser class.
2015-11-26 21:35:51 +01:00
Ghazi Triki
9d6f04ed16
Added SwfAnalyser to check the converted swf result.
2015-11-25 21:29:05 +01:00
Pedro Beschorner Marin
36bbcc06d6
Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf-live0.7.3-merge
...
Conflicts:
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/ConversionUpdatesProcessor.java
akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/MeetingMessageReceiver.java
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-video/.classpath
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bbb-video/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationMessageListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationApplication.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersEventRedisPublisher.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/SharedNotesModule.mxml
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/core/managers/ReconnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
bigbluebutton-client/src/org/bigbluebutton/core/services/BandwidthMonitor.as
bigbluebutton-client/src/org/bigbluebutton/core/services/StreamMonitor.as
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/NetworkStatsData.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeMyRole.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ChangeRoleEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/LowerHandEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/StreamStoppedEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LanguageSelector.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MuteMeButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/NetworkStatsWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.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/layout/model/LayoutDefinition.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/AddButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/ToolbarComponent.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/UploadedPresentationRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/Client.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/HTTPServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/XMLServerConnection.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/GraphicsWrapper.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoDock.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/util/i18n/ResourceUtil.as
bigbluebutton-config/bigbluebutton-release
bigbluebutton-config/bin/bbb-conf
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisStorageService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
2015-11-25 15:58:36 +00:00
Richard Alam
cecbc46d1d
- create breakout room in bbb-web
2015-10-22 17:13:53 +00:00
Richard Alam
c47272fd2c
- refactor how default presentation is downloaded
2015-10-21 20:51:58 +00:00
Richard Alam
9c527be4f0
- fix json response
2015-10-21 18:30:25 +00:00
Richard Alam
a80a0562c5
- return json on create api call
2015-10-21 18:25:00 +00:00
Richard Alam
c9b4f7e9a0
Merge branch 'support-multiple-logins' into add-http-to-akka-apps
...
Conflicts:
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy
2015-10-21 17:44:44 +00:00
Richard Alam
10f7f3f852
- play around with akka http
2015-10-20 15:43:41 +00:00
Richard Alam
14aabf9da6
- allow joining breakout room
2015-10-19 19:00:21 +00:00
Richard Alam
d89a34209d
- make presentation api use session
2015-10-07 21:44:01 +00:00
Richard Alam
c5b5b11725
- check if user has sessionToken
2015-10-07 20:34:37 +00:00
Richard Alam
c182f85403
- use sessionToekn on signOut API call
2015-10-07 16:09:31 +00:00
Ghazi Triki
96aa42e5c2
Presentation upload returns a 200 HTTP status.
2015-10-07 14:17:04 +01:00
Richard Alam
bcfe18d0d9
- use sessionToken to get configxml
2015-10-06 22:18:56 +00:00
Richard Alam
7968273501
- pass sessionToken to get configXML from bbb-web
2015-10-06 21:08:01 +00:00
Richard Alam
e2533f1f0c
- load config.xml first before doing anything else
2015-10-05 20:06:35 +00:00
Richard Alam
3918dd3238
- try to figure out when configXml gets loaded
2015-10-05 15:22:39 +00:00
Richard Alam
a1a82f96d0
- remove printlns to cleanup logs
2015-09-23 20:11:06 +00:00
Felipe Cecagno
ed366e6b21
Merge branch '090-recordings-size' into mconf-live0.7.3
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
2015-09-08 17:43:20 -03:00
Richard Alam
46ba98f737
- add ping/pong message between different components to verfiy that we have working path
2015-08-20 20:44:40 +00:00
Richard Alam
9570a9e765
- fix formatting
2015-08-11 19:24:27 +00:00
Richard Alam
f47344b134
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1966
2015-08-11 18:57:40 +00:00
Richard Alam
3357529104
- update properties file
2015-08-07 19:48:27 +00:00
Richard Alam
839e7ebf58
Merge branch 'svg-conversion' of https://github.com/gthacoder/bigbluebutton into gthacoder-svg-conversion
2015-08-07 18:28:16 +00:00
Richard Alam
839473395a
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-leonardo-api-changes
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
2015-08-07 15:06:40 +00:00
Richard Alam
00c5cac9c9
Merge pull request #632 from daronco/api-merges
...
API merges
2015-08-06 17:58:34 -04:00
Maxim Khlobystov
5c0cb9c3d8
Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
2015-08-06 16:21:31 -04:00
Richard Alam
d140ca0b40
- add an api to let us query the user sessions in bbb-web. We use this to see what sessions are hanging around
...
that may be causing OOM exception on tomcat7
2015-08-04 17:58:27 +00:00
Maxim Khlobystov
5f491bf43b
Cleaning up.
2015-07-15 16:58:15 -04:00
Maxim Khlobystov
ceb3a3911c
Made sure the image served for HTML5 client is in SVG format.
2015-07-07 12:19:05 -04:00
Maxim Khlobystov
cf1c6390be
Made SVG images accessible by HTML5 client.
2015-07-06 14:26:13 -04:00
Maxim Khlobystov
16314d5edd
Started generating SVG images for HTML5 client instead of PNG.
2015-07-03 12:20:37 -04:00
Jesus Federico
9e51241b08
Added support for POST requests to getRecordings and getMeetings
2015-06-29 18:18:39 -04:00
Pedro Beschorner Marin
6ef2bf6b27
Getting playback and full meeting published sizes
2015-06-09 14:39:35 +00:00
Pedro Beschorner Marin
4225a87abd
Refactoring and cleanup
2015-06-04 16:03:20 +00:00
Pedro Beschorner Marin
a1a7096c3e
Getting the raw size of the meeting data
2015-06-03 15:19:41 +00:00
Pedro Beschorner Marin
cc55e6f6a4
Adding new attributes to bbb-web
2015-06-02 18:58:11 +00:00
Calvin Walton
9deb87d0b0
web: check that meeting is running before allowing presentation upload
2015-05-27 15:08:04 -04:00
Felipe Cecagno
da8b6efa0e
Merge branch 'enter-metadata' into mconf-live0.6.3
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
2015-05-18 12:39:05 -03:00
Felipe Cecagno
4dbf08f08e
removed the calls from bbb-web related to the webhooks
2015-05-18 12:38:00 -03:00
Felipe Cecagno
2ffcf01ef5
included the meeting metadata in the enter api call
2015-05-18 12:38:00 -03:00
Felipe Cecagno
2a5f4ebedb
cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code
2015-05-17 23:08:41 -03:00
Felipe Cecagno
7cb12f8b49
Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release
...
Conflicts:
bbb-api-demo/src/main/webapp/demo10_helper.jsp
bbb-video/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/locale/bg_BG/bbbResources.properties
bigbluebutton-client/locale/cs_CZ/bbbResources.properties
bigbluebutton-client/locale/cy_GB/bbbResources.properties
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_419/bbbResources.properties
bigbluebutton-client/locale/es_ES/bbbResources.properties
bigbluebutton-client/locale/et_EE/bbbResources.properties
bigbluebutton-client/locale/fa_IR/bbbResources.properties
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/locale/fr_FR/bbbResources.properties
bigbluebutton-client/locale/hu_HU/bbbResources.properties
bigbluebutton-client/locale/hy_AM/bbbResources.properties
bigbluebutton-client/locale/it_IT/bbbResources.properties
bigbluebutton-client/locale/ms_MY/bbbResources.properties
bigbluebutton-client/locale/no_NO/bbbResources.properties
bigbluebutton-client/locale/pl_PL/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/locale/sk_SK/bbbResources.properties
bigbluebutton-client/locale/tr_TR/bbbResources.properties
bigbluebutton-client/locale/uk_UA/bbbResources.properties
bigbluebutton-client/locale/zh_CN/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
bigbluebutton-client/resources/prod/lib/deployJava.js
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2015-05-17 19:25:26 -03:00
Leonardo Crauss Daronco
0e77a9c71b
Replace "videoStreams" by "videoCount" on getMeetingInfo
...
Return only the total number of videos and whether a user has video or not
instead of returning the ID of each video stream available. Is now more
consistent with the response of getMeetings.
2015-05-07 10:00:07 -04:00
Leonardo Crauss Daronco
c93d936a44
Merge remote-tracking branch 'mconf/090-get-recordings-metadata-filter' into api-merges
2015-05-05 12:39:06 -04:00
Leonardo Crauss Daronco
6cf4dc4b1d
Merge remote-tracking branch 'mconf/090-audio-video-on-api' into api-merges
2015-05-05 12:38:47 -04:00
Felipe Cecagno
12cab928de
Merge branch '090-guest-role-refactoring' into mconf-live0.6.3
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java
2015-04-23 14:37:17 -03:00
Felipe Cecagno
63e6da47de
reduced the number of messages exchanged between server and client regarding the guest access; fixed the problem of bbb-web answering the meeting is not running when there's a guest connected
2015-04-20 21:25:37 -03:00
Richard Alam
337f5f0934
- fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1917
2015-04-06 15:20:01 +00:00
Oleksandr Zhurbenko
98bd277324
Cleaninig
2015-03-25 14:34:01 -07:00
Oleksandr Zhurbenko
f8a41a78d8
Cleaning and formatting
2015-03-25 14:12:38 -07:00
Oleksandr Zhurbenko
67ef6129c0
Trimming leading and trailing whitespace for the meetingId and fullname for both cases
2015-03-25 13:02:03 -07:00
Oleksandr Zhurbenko
5a167f362c
Fixed issue 1889, added checking for an empty username and removing trailing and leading whitespaces
2015-03-19 16:51:56 -07:00
Calvin Walton
1af70d8e4e
Use configured stun/turn servers when making webrtc call
2015-02-17 12:00:04 -05:00
Richard Alam
96e8fde865
- change format of logs to add timezone
2015-02-09 18:40:31 +00:00
Richard Alam
24b9c5c525
- store stun and turn servers in client
2015-02-06 21:05:12 +00:00
Richard Alam
cdc6daced8
- add support for configuring stun and turn servers
...
- add new /stuns api to be called by the Flash client
2015-02-06 19:46:56 +00:00
Richard Alam
05ea33b261
- append connection number to userid. This allows us to track the connection for a user and clean
...
up properly the users list when the user gets disconnected. Also, it allows us to track how many
times a user gets disconnected in the meeting.
2015-01-26 15:31:12 +00:00
Felipe Cecagno
f6d6e4e40c
Merge branch '090-guest-role' into HEAD
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2015-01-25 18:36:30 -02:00
Felipe Cecagno
1289e8a41e
Merge branch '090-get-recordings-metadata-filter' into mconf-live0.6.2
2015-01-25 00:44:52 -02:00
Felipe Cecagno
f7225848c9
Merge branch '090-get-recordings-metadata-filter' into HEAD
2015-01-25 00:44:14 -02:00
Richard Alam
71a2ca9443
- add connection number to userid so we are able to match the user with connection attempts
2015-01-23 20:02:40 +00:00
Felipe Cecagno
f2d1e24580
Merge branch '090-audio-video-on-api' into mconf-live0.6.2
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
2015-01-23 15:36:52 -02:00
Felipe Cecagno
1ea57596d0
Merge branch '090-audio-video-on-api' into HEAD
2015-01-23 15:05:18 -02:00
Felipe Cecagno
2761c31e52
Merge branch '090-encrypted-recording' into mconf-live0.6.2
...
Conflicts:
bbb-video/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2015-01-21 18:11:56 -02:00
Felipe Cecagno
8e12c909c5
Merge branch '090-encrypted-recording' into HEAD
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/core/Gemfile
record-and-playback/deploy.sh
2015-01-21 15:51:29 -02:00
Anton Georgiev
b0ccef5af0
Added config pngImagesRequired. If true, the slides will be converted to png for HTML5 client. False by default.
2015-01-09 16:14:05 +00:00
Anton Georgiev
7e3c2f6eb0
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-ui-less
2014-12-15 20:11:49 +00:00
Richard Alam
1b4c4f5f5e
- change logging for bbb-web to rollover at midnight and add date to the filename
2014-12-11 22:07:22 +00:00
Felipe Cecagno
12f7aacf4b
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
2014-12-09 16:52:43 -02:00
Richard Alam
234a95902d
- change api version to 0.9 from 0.81
2014-12-01 11:52:40 -08:00
Richard Alam
ce07751d79
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837
2014-11-28 14:24:28 -08:00
Felipe Cecagno
e9122a9637
Merge branch '090-download-presentation' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/pt_BR/bbbResources.properties
2014-11-23 23:02:22 -02:00
Felipe Cecagno
a3acb00893
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bbb-video/build.gradle
bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
bigbluebutton-config/web/default.pdf
2014-11-22 20:28:39 -02:00
Anton Georgiev
0bf242900d
authToken is now different than userid
2014-11-20 19:09:41 +00:00
Lucas Zawacki
7d401dab53
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
2014-11-14 15:33:17 -02:00
Mateus Dalepiane
ef043602c6
Merge branch '090-guest-role' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/Constants.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2014-11-07 14:49:28 -02:00
Felipe Cecagno
b954a42aa8
fix a runtime error that happens when the user uploads a presentation
2014-11-05 18:05:30 -02:00
Mateus Dalepiane
339acc9166
Send UserJoined only after guests are accepted
...
This means that the guest will be displayed on participants list
only after they accepted
2014-11-03 17:54:39 -02:00
Pedro Beschorner Marin
e3b850764a
More cleanup
2014-11-03 16:09:18 -02:00
Pedro Beschorner Marin
2d3a941f70
Some cleanup
2014-11-03 15:45:39 -02:00
Pedro Beschorner Marin
2c5ff4f7cd
Merging with mconf old branch
2014-11-03 14:12:47 -02:00
Richard Alam
5a83eab737
- return api version when url is http://<host>/bigbluebutton
2014-10-27 19:01:01 +00:00
Felipe Cecagno
0af623e9e7
Merge branch '090-listen-only-by-default' into mconf-live0.6.1
2014-10-24 23:38:09 -02:00
Richard Alam
9effb009d0
- follow redirects when downloading presentation
2014-10-22 02:43:03 -07:00
Richard Alam
5af452c39f
- start implementing auto start recording
2014-10-20 03:39:44 -07:00
Richard Alam
9c0280c129
- fix txt uri for accessibility
2014-10-20 01:18:13 -07:00
Mateus Dalepiane
36af1da3df
Port of guest role to bbb-090
...
**WARNING**: Not tested yet.
bbb-client and bbb-web compile.
bbb-apps does not compile yet.
@bbb-apps: Missing scala implementation.
@bbb-client: Missing message receiver implementation.
Conflicts:
bbb-api-demo/src/main/webapp/bbb_api.jsp
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-web/grails-app/conf/BigBlueButtonFilters.groovy
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/UserSession.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
2014-10-16 16:58:10 -03:00
Felipe Cecagno
3db4ead6e4
Merge branch '090-listen-only-by-default' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-10-15 00:22:27 -03:00
Felipe Cecagno
03b53eba21
cleanup
2014-10-14 22:08:40 -03:00
Pedro Beschorner Marin
831f890cd2
Merge remote-tracking branch 'bigbluebutton/master'
2014-10-13 12:06:38 -03:00
Richard Alam
0fb0e603ef
- increase log file size and number of backups kept
2014-10-12 05:43:18 -07:00
Felipe Cecagno
59debc5d1e
Merge branch '090-mconf-branding' into mconf-live0.6.1
2014-10-05 23:32:43 -03:00
Felipe Cecagno
5f2f2662af
Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
2014-10-05 22:00:28 -03:00
Felipe Cecagno
015d708d7c
Merge branch 'mconf-branding-0.81' into 090-mconf-branding
...
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"
Conflicts:
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/src/BigBlueButton.mxml
record-and-playback/presentation/playback/presentation/playback.html
2014-10-05 19:36:43 -03:00
Felipe Cecagno
31f225b856
Merge branch 'get-recordings-metadata-filter-0.81' into 090-get-recordings-metadata-filter
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
2014-09-18 17:43:39 -03:00
Felipe Cecagno
356fbcccad
Merge branch 'audio-video-on-api-v0.81' into 090-audio-video-on-api
...
Most of the work had to be done again because of the way BigBlueButton exchanges messages today.
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessageListener.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingConstants.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
2014-09-18 17:09:00 -03:00
Pedro Beschorner Marin
8b1c735429
Merge remote-tracking branch 'bigbluebutton/master'
2014-09-15 16:16:31 -03:00
Richard Alam
50352c0204
- make sure to cancel the thread after presentation conversion
2014-09-15 09:05:03 -07:00
Richard Alam
38f77259f1
- return false when filter is applied
2014-09-14 09:06:11 -07:00
Richard Alam
e1234fcee4
- make sure the threads are not daemon...need to rework this
2014-09-12 15:10:13 -07:00
Felipe Cecagno
56f20fa5d3
Merge branch '090-encrypted-recording' into HEAD
...
Conflicts:
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2014-09-10 17:27:47 -03:00
Pedro Beschorner Marin
54f9f2c12e
Web config
2014-09-09 19:09:10 -03:00
Pedro Beschorner Marin
86ac2ad0ff
Merge remote-tracking branch 'origin/master'
2014-09-05 11:07:29 -03:00
Felipe Cecagno
c2eed678d9
cleanup
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2014-09-04 15:02:16 -03:00
Anton Georgiev
4f25f2ced1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master
2014-09-02 21:08:03 +00:00
Anton Georgiev
cf125781db
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
2014-09-02 17:54:14 +00:00
Richard Alam
372b571b7b
- add pretty create date, duration, and user has joined info on getMeeting api response
2014-09-02 10:22:24 -07:00
Pedro Beschorner Marin
ad5566b9a5
My web properties
2014-09-02 13:06:10 -03:00
Fred Dixon
93f6dcafab
Upping version from 0.9.0-dev to 0.9.0-beta
2014-09-01 17:05:33 -04:00
Felipe Cecagno
dd97b8f80c
Merge branch 'encrypted-recording' into 090-encrypted-recording
...
Conflicts:
bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2014-09-01 16:46:03 -03:00
Richard Alam
9075068f8e
- allow a way to change log level externally from bigbluebutton.properties
2014-08-23 13:04:06 -07:00
Anton Georgiev
e9113f3d9f
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
2014-08-20 18:59:50 +00:00
Anton Georgiev
c9ad7035b1
Merge branch 'merging-html5-with-master' of https://github.com/antobinary/bigbluebutton
2014-08-20 18:57:55 +00:00
Richard Alam
11b8fa711e
- provide a way to support pre-built config.xml
2014-08-20 11:42:31 -07:00
Anton Georgiev
adf20cca7d
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
2014-08-20 15:24:25 +00:00
Richard Alam
9f63ddd1f7
- add new param (moderatorOnlyMessage) on CREATE API
2014-08-20 07:37:31 -07:00
Fred Dixon
6f727b6acc
Updated footer message in bigbluebutton.properties
2014-08-17 22:26:51 -04:00
Richard Alam
c56fde0c42
Merge pull request #348 from speakserve/unify-version-number
...
Unify version number
2014-08-13 14:17:45 -04:00
Ghazi Triki
bb09eb6d75
After checking we bumped projects version and Flex locales to 0.9.0 with some fixes
2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a
Bumped projects version and Flex locales to 0.9
2014-08-13 10:28:08 +01:00
Anton Georgiev
04494aa8a4
cleaning up
2014-08-11 18:46:10 +00:00
Anton Georgiev
404ff72914
use high qulity png conversion for the slide, not just the thumbnail
2014-08-07 20:12:55 +00:00
Richard Alam
109f973cbd
- check on create api call if meeting has been forcibly ended
2014-08-07 09:32:18 -07:00
Ghazi Triki
57d7a15b89
Reverted back API version to 0.81 with updates in outdate files
2014-07-31 18:53:24 +01:00
Ghazi Triki
ac7af7dfea
Manually bumped all application version to the correct actual version 0.9.0-dev
2014-07-31 17:42:38 +01:00
Richard Alam
9eef8e994b
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1709
2014-07-28 13:56:49 -07:00
Richard Alam
c10bc2a42c
- return authToken when redirect=false on JOIN API call
2014-05-10 08:59:03 -07:00
Richard Alam
283a3fa3eb
- modify messages
2014-05-09 17:49:01 -07:00
Richard Alam
8dfe46bfba
- changing message format between bbb-web and bbb-apps
2014-05-09 21:21:21 +00:00
Richard Alam
ca089d6af0
- minor cleanup
2014-05-05 18:35:01 +00:00
Richard Alam
1fd2933bfd
- fix processing of png image
2014-05-01 20:56:34 +00:00
Richard Alam
ba08100b35
Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5
2014-05-01 15:38:14 +00:00
Richard Alam
51e489a143
- modify how we send and receive messages to/from redis
2014-04-30 21:45:53 +00:00
Richard Alam
75d908625c
- setup messaging classes
2014-04-30 15:53:27 +00:00
Richard Alam
ef6ffa20df
- make keep alive run on it's own thread
2014-04-28 22:00:48 +00:00
Calvin Walton
7d78e46cad
Support passing through XML extensions in getRecordings
...
Recording processing scripts can now add arbitrary XML elements in
the extensions section of the metadata.xml file, and those
element will be copied to the getRecordings XML response.
2014-04-24 16:34:59 -04:00
Richard Alam
c44f4c90a3
- wire up png converter
2014-04-19 09:23:06 -07:00
Richard Alam
bee1320463
Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5
...
Conflicts:
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
2014-04-08 19:07:37 +00:00
Anton Georgiev
2d89a73c0c
Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
bigbluebutton-web/grails-app/conf/UrlMappings.groovy
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
bigbluebutton-web/ivy.xml
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
2014-04-08 15:55:04 +00:00
Fred Dixon
11b0d0eca7
Bumped footer message in chat to say 0.9.0-dev
2014-04-02 21:35:40 +00:00
Richard Alam
7e0af3e042
- check if meeting has been forciblyEnded and don't let the user join if it is
2014-04-02 20:01:29 +00:00
Richard Alam
3742ebc1c2
- prevent the user from rejoining meeting when meeting has ended
2014-04-02 19:45:58 +00:00
Richard Alam
090cb4115b
- fix issue where getMeetings and getRecordings calls just loops back resulting in StakOverflow
2014-04-02 16:17:24 +00:00
Fred Dixon
ff87e59e5c
removed carriage returns from bigbluebutton.properties as it was causing errors with bbb-conf
2014-03-12 01:18:19 +00:00
Richard Alam
4c5739a43c
- change path to pdf2swf
2014-03-10 15:14:34 +00:00
Richard Alam
db3686bd40
- fix compile error
...
- fix url for slides
2014-03-07 14:58:51 +00:00
Richard Alam
d15e8c3a5b
- continue cleaning up presentation
2014-02-27 21:41:25 +00:00
Richard Alam
9f00d960d1
- modify to generate presentation ids instead of using filename as id
2014-02-26 21:45:25 +00:00
Richard Alam
17cbcb2676
- remove datasource config
...
- add bbb-web.log config
2014-02-25 20:06:00 +00:00
Richard Alam
6cf30e9f07
- upgrade bigbluebutton-web to grails 2.3.6
2014-02-25 15:46:06 +00:00
Felipe Cecagno
417b518c2b
Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2014-02-24 12:37:35 -03:00
Richard Alam
5559a2b8cc
Merge branch 'master' into merge-polling-with-master
...
- there are compile issues we need to fix
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
2014-01-23 20:49:04 +00:00
Richard Alam
4b07e6d3ab
Merge branch 'master' into html5-bridge-new-events
2014-01-06 13:20:35 -08:00
alexandrekreis
b6e3137596
refs #930
2013-11-28 11:16:52 -02:00
mohamed-ahmed
d35d00fd55
'all_slides' and move cursor events now working in new msg format
2013-11-18 19:36:27 +00:00
Fred Dixon
b12188fbed
Changing lables for 0.81
2013-11-07 20:08:36 -05:00
Fred Dixon
149ea185f2
Updating version to 0.81-RC5
2013-10-30 14:47:16 -07:00
tylercopeland
a4a806d254
lastest css updates
2013-10-29 19:38:52 -04:00
tylercopeland
499aba5f03
css style updates
2013-10-29 19:01:52 -04:00
mohamed-ahmed
1c012aec32
merged html5-bridge with master
2013-10-29 18:33:25 +00:00
Richard Alam
a141928824
- Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1671
...
Remove the beginning . (dot) from uploaded presentation.
2013-10-23 16:21:49 +00:00
Fred Dixon
ca56259457
Updating label to RC4
2013-10-20 15:47:12 -04:00
Felipe Cecagno
0cf35712cf
added <voiceBridge> and <dialNumber> on create and getMeetings call
2013-10-14 11:48:39 -03:00
Felipe Cecagno
8e2ac7335b
Merging tag v0.81RC3 into audio-video-on-api
2013-10-14 10:58:57 -03:00
Fred Dixon
381ddbf3a9
Updated labels for 0.81-RC3
2013-10-09 14:05:55 -04:00
Richard Alam
5bb5f2000d
Merge branch 'master' into new-polling-feature
2013-10-07 15:16:25 +00:00
mohamed-ahmed
9c0e4ca9dd
Merge branch 'master' into throwaway-merge
2013-10-03 16:07:28 +00:00
Felipe Cecagno
9a2c605866
Merge branch 'master' into multicamera-0.81
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
2013-09-29 21:19:29 -03:00
Fred Dixon
6b7438e9f8
Updated wording of welcomeMessageFooter
2013-09-27 19:01:59 -04:00
mohamed-ahmed
ad86f142d4
merged Gary's newUI and fixed conflicts
2013-09-27 16:07:38 +00:00
Fred Dixon
a84c6ca8e8
Configuration updates for moving to 0.81-RC2
2013-09-26 16:42:27 -04:00
Gary Deng
fb8af3bdf7
implement html5 new interface
2013-09-24 06:13:09 -07:00
mohamed-ahmed
7a50b35873
added 'move_and_zoom' event to pubsub
2013-09-10 20:54:49 +00:00
Richard Alam
d402f7b333
Merge branch 'master'
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
2013-09-09 18:42:21 +00:00
Nadia Noori
c2c344ed79
Changing lable to RC1
2013-09-04 14:24:19 -04:00
Felipe Cecagno
f8e63fd6f4
Merge branch 'master' into mconf-branding
...
Conflicts:
bigbluebutton-client/build.xml
bigbluebutton-client/locale/ar_SY/bbbResources.properties
bigbluebutton-client/locale/az_AZ/bbbResources.properties
bigbluebutton-client/locale/bg_BG/bbbResources.properties
bigbluebutton-client/locale/ca_ES/bbbResources.properties
bigbluebutton-client/locale/cs_CZ/bbbResources.properties
bigbluebutton-client/locale/da_DK/bbbResources.properties
bigbluebutton-client/locale/de_DE/bbbResources.properties
bigbluebutton-client/locale/el_GR/bbbResources.properties
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/es_ES/bbbResources.properties
bigbluebutton-client/locale/es_LA/bbbResources.properties
bigbluebutton-client/locale/et_EE/bbbResources.properties
bigbluebutton-client/locale/eu_EU/bbbResources.properties
bigbluebutton-client/locale/fa_IR/bbbResources.properties
bigbluebutton-client/locale/fi_FI/bbbResources.properties
bigbluebutton-client/locale/fr_CA/bbbResources.properties
bigbluebutton-client/locale/fr_FR/bbbResources.properties
bigbluebutton-client/locale/he_IL/bbbResources.properties
bigbluebutton-client/locale/hr_HR/bbbResources.properties
bigbluebutton-client/locale/hu_HU/bbbResources.properties
bigbluebutton-client/locale/id_ID/bbbResources.properties
bigbluebutton-client/locale/it_IT/bbbResources.properties
bigbluebutton-client/locale/ja_JP/bbbResources.properties
bigbluebutton-client/locale/kk_KZ/bbbResources.properties
bigbluebutton-client/locale/km_KH/bbbResources.properties
bigbluebutton-client/locale/ko_KR/bbbResources.properties
bigbluebutton-client/locale/lt_LT/bbbResources.properties
bigbluebutton-client/locale/lv_LV/bbbResources.properties
bigbluebutton-client/locale/mn_MN/bbbResources.properties
bigbluebutton-client/locale/ne_NE/bbbResources.properties
bigbluebutton-client/locale/nl_NL/bbbResources.properties
bigbluebutton-client/locale/no_NO/bbbResources.properties
bigbluebutton-client/locale/pl_PL/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/locale/pt_PT/bbbResources.properties
bigbluebutton-client/locale/ro_RO/bbbResources.properties
bigbluebutton-client/locale/ru_RU/bbbResources.properties
bigbluebutton-client/locale/si_LK/bbbResources.properties
bigbluebutton-client/locale/sk_SK/bbbResources.properties
bigbluebutton-client/locale/sr_RS/bbbResources.properties
bigbluebutton-client/locale/sv_SE/bbbResources.properties
bigbluebutton-client/locale/th_TH/bbbResources.properties
bigbluebutton-client/locale/tr_TR/bbbResources.properties
bigbluebutton-client/locale/uk_UA/bbbResources.properties
bigbluebutton-client/locale/vi_VN/bbbResources.properties
bigbluebutton-client/locale/zh_CN/bbbResources.properties
bigbluebutton-client/locale/zh_TW/bbbResources.properties
bigbluebutton-client/resources/prod/MconfLive.html
bigbluebutton-client/resources/prod/lib/bbb_blinker.js
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
record-and-playback/presentation/playback/presentation/playback.html
2013-08-26 21:26:44 -03:00
Felipe Cecagno
65163c49ef
Merge branch 'master' into guest-role-0.81
...
Conflicts:
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/main/events/LogoutEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2013-08-26 15:13:38 -03:00
Jorge Nunez
5b1d62f5d2
Merge remote branch 'upstream/master' into html5-bridge
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2013-07-31 17:27:33 -07:00
Hugo Lazzari
c358fe33d8
Merge branch 'master' into get-recordings-metadata-filter-0.81
2013-07-31 09:20:40 -03:00
Hugo Lazzari
1d99f3ed30
Bugfix: Missed method included, still need to fix bug on client that crash.
2013-07-25 11:48:20 -03:00
Hugo Lazzari
a91a2df678
Merge branch 'master' into guest-role-0.81
...
Conflicts:
bbb-api-demo/src/main/webapp/demo3.jsp
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/locale/pt_BR/bbbResources.properties
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-web/application.properties
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2013-07-24 11:25:36 -03:00
Richard Alam
34a9875766
- enable webhooks
2013-07-11 19:20:11 +00:00
Richard Alam
14d3b615bc
- handle prescreated polls and display them in client
2013-07-10 20:56:32 +00:00
Richard Alam
7d3e5afb5f
- remove re-encoding of posted XML data as grails 1.3.9 doesn't unencode automatically the data
2013-07-10 19:14:25 +00:00
Markos Calderon
5a09b5a6d2
adding a response when server is down
2013-06-25 18:26:49 -05:00
Markos Calderon
78074528c8
BBB filter
2013-06-25 13:29:28 -05:00
Markos Calderon
f520bef467
mark bbb-apss down if server doesn't respond back
2013-06-24 17:33:39 -05:00
Fred Dixon
1c7d220edc
Updated welcome message footer to 0.81-beta-2
2013-06-18 05:17:24 -07:00
Richard Alam
4fc7a40faf
Merge remote branch 'origin/polling-module' into make-users-user-conn-invoke
2013-06-17 19:12:23 +00:00
Richard Alam
0536939bc7
synching up with master
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml
2013-06-17 18:32:09 +00:00
Fred Dixon
70f26a27f2
Minor updates to welcome message
2013-06-16 07:19:32 -07:00
Markos Calderon
dfbfae9c8d
change reject value when the meeting doesn't exist
2013-07-10 16:12:08 -05:00
Markos Calderon
ff893f36fe
Fix: disallow client to reconnect by refreshing the browser, when a meeting ends
2013-07-10 16:01:54 -05:00
Markos Calderon
d730300c8a
fix sending full meetingID
2013-06-12 18:59:32 -05:00
Markos Calderon
2597d47bba
listen to events in bbb-callbacks
2013-06-12 18:49:32 -05:00
Markos Calderon
f20f243b05
Correction to subscription API calls
2013-06-11 18:38:28 -05:00
Markos Calderon
51279ec549
API calls for subscribing to events
2013-06-10 18:38:35 -05:00
Markos Calderon
8ca16a3953
updating bbb-apps to handle polls
2013-06-06 18:53:57 -05:00
Richard Alam
e1879795e9
try to upgrade to grails 1.3.9 - Not starting properly though
2013-06-06 12:17:52 -07:00
Markos Calderon
7f748fd809
reading polls from create API call
2013-06-05 17:56:03 -05:00
Calvin Walton
085294af6d
Fix typo 'defaulLayout' in join parameters
2013-05-30 17:47:26 -04:00
Richard Alam
af0c56c131
updating api version to 0.81
2013-05-25 16:31:33 -03:00
Richard Alam
b28cb66f32
- change how we create the base string and calculate checksum for setConfigXML API
2013-05-24 15:11:36 +00:00
Mohamed Ahmed
bf441450b0
modified ip and salt to that of my system
2013-05-23 11:54:23 -04:00
Richard Alam
be8befb243
Merge branch 'master' into html5-bridge
...
Conflicts:
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
2013-05-09 17:25:25 +00:00
Richard Alam
4d3e6de0e9
- return the default config xml without wrapping in a response xml. THis way, the config xml isn;t encoded.
2013-04-28 21:52:14 +00:00
Richard Alam
5cdf1b18f6
- sign the query string for get default config xml
2013-04-17 21:59:51 +00:00
Richard Alam
18bacaa632
- fix NPE when sending incorrect checksum to getDefaultConfigXML call
2013-04-17 18:43:10 +00:00
Fred Dixon
abc074aaa1
Hide the network monitor and editing buttons for layouts module by defult
2013-04-16 19:23:20 -07:00
Markos Calderon
fca07405e0
fixing some configurations
2013-04-10 14:53:45 -05:00
Dale Karp
0813595c61
fixed merges
2013-04-10 17:23:40 +00:00
Jesus Federico
36ed2f6537
Made error messages consistent on setConfigXML
2013-04-05 00:07:41 -04:00
Richard Alam
e35071a050
- add API to allow querying for default config.xml
2013-03-27 18:21:54 +00:00
Richard Alam
27af71f208
- handle passing of config xml
2013-03-27 16:06:03 +00:00
Richard Alam
8c157a3914
- handle setConfigXML
2013-03-21 17:14:13 +00:00
Richard Alam
0e386adab2
Merge branch 'master' into merge-master-into-dynamic-config
2013-03-15 21:03:13 +00:00
jfederico
f56c4474e6
bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server.
2013-03-13 15:01:14 -04:00
Dale Karp
7f03043f78
updated local props file
2013-03-07 17:59:36 +00:00
Felipe Cecagno
f8180d3cee
very first implementation of the getRecordings call filtering by metadata; the idea is the same as on create, the user will specify some parameters as meta_*, and the call will return just the recordings that match all the metadata specified; it continues working with the meetingID filter, and both can be used together
2013-02-22 17:44:24 -03:00
Markos Calderon
3003280227
Added voicebridge and dialnumber to ExternalApiCalls
2013-02-22 15:37:59 -05:00
Dale Karp
b1a14c98c6
commiting changes made to run env
2013-02-21 17:11:23 +00:00
Markos Calderon
cc1e40d61c
Added user customdata to the client
2013-02-19 12:18:12 -05:00
Markos Calderon
1929526a4d
added custom data parameter when a user joins to a meeting
2013-02-14 15:59:52 -05:00
Richard Alam
e6fe97db36
Merge branch 'master' into merge-master-into-dynamic-config
2013-02-07 18:53:01 +00:00
Gilson Souza
891e12b815
including the field key into API getRecordings
2013-02-04 13:34:07 -02:00
Gilson Souza
7fc5db4b21
changing API to add the new object download into the getrecordings XML reply
2013-02-04 13:34:05 -02:00
