Richard Alam
561c5d88e5
- add instructions on how to convert old message to new message
2017-06-05 07:36:55 -07: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
e56a758c5f
- send create message from bbb-web
2017-05-24 15:19:03 -07:00
Ghazi Triki
a5482b506d
Revert text object conversion threshold to 2000
2017-05-22 10:27:11 +02:00
Richard Alam
82371a41de
- try to start system
2017-05-19 19:27:09 -07:00
Richard Alam
6b14d31853
- wire up bbb-web
2017-05-19 19:13:25 -07:00
Ghazi Triki
f5366fbc88
Update document conversion threshold values with lower values.
2017-05-11 17:03:24 +01:00
Richard Alam
b55beeb8fa
- wire up redis publisher
2017-05-10 14:37:14 -07:00
Richard Alam
76a6d99ca3
- move java classes from bbb-web into bbb-common-web
2017-05-10 13:22:50 -07:00
Pedro Beschorner Marin
66a12c9c7a
Moving the meeting life cycle management from bbb-web to akka-apps
2017-05-03 17:02:16 +00:00
Richard Alam
61d7b18345
- remove reconnect number in userId
2017-04-28 14:21:59 -07:00
Richard Alam
e89c832c8a
Merge branch 'master' into bbb-2x-mconf
2017-04-25 07:40:30 -07:00
Richard Alam
69ba485fcc
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-04-21 08:12:56 -07:00
Ghazi Triki
8142031afe
Faster PDF pages counting by replacing "pdf2swf" command with "pdfinfo".
2017-04-20 18:02:31 +01:00
Ghazi Triki
3ff28e3e9d
Rename GhostscriptPageExtractor to PageExtractorImp.
2017-04-19 19:10:14 +01:00
Ghazi Triki
466c931b92
Remove usage of GhostScript and replace it by pdftocairo and pdfseparate.
2017-04-19 16:30:46 +01:00
Richard Alam
a9590976c2
- allow setting default guest policy for meeting
2017-04-18 19:45:32 +00:00
Richard Alam
b8de0c9231
- add authorized role to registered user
2017-04-17 21:23:17 +00:00
Ghazi Triki
a2644c430c
Improve the document conversion fallback logic by merging the pdf page extraction and image conversion using 'convert' to a single step page to image conversion using 'gs'. Anti-aliasing for text and shapes is also improved.
2017-04-13 18:29:33 +01:00
Pedro Beschorner Marin
f59e42bb02
Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1
2017-04-04 20:42:15 +00:00
Pedro Beschorner Marin
84fd8d4101
Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images!
2017-04-03 17:06:16 +00:00
Pedro Beschorner Marin
49855b4c80
Removed some callback API methods from bigbluebutton web that were missed on merge
2017-03-31 12:18:33 +00:00
Richard Alam
8122f984ea
- convert "success" to upper case to match previous API. Maybe users are matching with uppercase.
2017-03-28 21:04:52 +00:00
Pedro Beschorner Marin
0ab207c997
Merge remote-tracking branch 'mconf/mconf'
2017-03-21 19:47:11 +00:00
Pedro Beschorner Marin
c74cc682c4
Merge remote-tracking branch 'mconf/mconf'
2017-03-20 19:45:59 +00:00
Richard Alam
058a4044d6
- publish/unpublish recording
2017-03-15 14:29:10 +00:00
Richard Alam
72c42f9d70
- build get recordings api response
2017-03-13 21:43:39 +00:00
Felipe Cecagno
21170265e2
implement the ability to add artificial remote ICE candidates to the SDP, so we can better handle servers behind NAT (and other situations); extend the /api/stun call in order to retrieve the list of remote ICE candidates from a XML file
2017-03-12 21:45:08 -03:00
Richard Alam
adffa8d673
- build getMeetings and getMeetingInfo responses using freemarker
2017-03-09 20:32:14 +00:00
Richard Alam
217b70bce2
Merge pull request #3711 from ritzalam/synchronize-create-meeting
...
Synchronize create meeting
2017-03-07 13:41:11 -05:00
Richard Alam
1a2bd4d74d
- add delay to processing of presentation to make sure that meeting has already been
...
created. This makes sure that the meeting is able to handle the presentation
processing events.
2017-03-06 20:05:26 +00:00
Fred Dixon
c28c78a405
Minor updates for release -- bumped the API version
2017-03-06 13:57:54 -06:00
Richard Alam
3ec0167812
- synchronize create meeting to prevent race condition where 2 meetings
...
with different voice bridge gets created.
2017-03-06 19:20:23 +00:00
Richard Alam
19f29e8bec
Merge pull request #3616 from riadvice/detect-heavy-to-convert-pptx
...
Avoid converting some pptx files with certain properties and inform the user.
2017-02-06 13:22:39 -05:00
Ghazi Triki
dfbf8c8c0a
Avoid converting some pptx files with certain properties and inform the user.
2017-01-30 19:50:10 +01:00
Pedro Beschorner Marin
32cab1bcab
Escaping Java's properties file instructions
2017-01-27 12:58:45 +00:00
Ghazi Triki
4c4d768883
Added new "webcamsOnlyForModerator" parameter for create meeting API.
2017-01-02 16:56:32 +01:00
Fred Dixon
21b953bc7c
Removed carriage returns from bigbluebutton.properties
2016-11-28 17:21:36 -06:00
Richard Alam
fa16d266b9
- add more logging to track issues
2016-11-10 22:35:06 +00:00
Ghazi Triki
1c45633028
Lower SWF conversion threshold from 2500 to 2000 for text objects.
2016-10-26 14:36:27 +01:00
Richard Alam
662218a96f
- getmeetinginfo is throwing exception
2016-10-25 20:47:04 +00:00
Ghazi Triki
e187634c2a
Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
2016-10-14 16:33:17 +01:00
Ghazi Triki
5e002d845e
Store breakout room sequence in akka-apps and bbb-web.
2016-10-13 12:53:53 +01:00
Ghazi Triki
054037c6d6
Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
2016-10-13 09:04:41 +01:00
Ghazi Triki
f7be426305
Breakout rooms refactoring: generated uniques external ID and internal ID.
2016-10-11 20:50:51 +01:00
Ghazi Triki
12021467f5
Unify uploaded presentation file naming across bigbluebutton-web.
2016-10-01 19:40:19 +01:00
Fred Dixon
6c2259d8ff
Merge pull request #3399 from riadvice/breakout-rooms-use-current-presentation
...
Breakout rooms use current presentation - part 2
2016-10-01 12:24:08 -04:00
Fred Dixon
ce4ef05c21
Merge pull request #3388 from jfederico/extension_preview_for_thumbnails_on_recordings
...
Extension preview for thumbnails on recordings
2016-09-30 17:17:48 -04:00
Ghazi Triki
a9acf9e3e5
Use apache commongs FilenameUtils.getExtension to extract the extension from the file name.
2016-09-29 18:47:11 +01:00
Ghazi Triki
0e72d7523d
Make breakout rooms use the selected slide of the current presentation as default presentation.
2016-09-28 22:19:48 +01:00
jfederico
039d85fe5c
bbb-web: Added internalMeetingID to xml response from create and getMeetings
2016-09-27 15:27:28 -04:00
Pedro Beschorner Marin
49d5f9c41c
Refactored redis recording events
2016-09-21 16:32:11 +00:00
jfederico
3058564ae1
bbb-web: Fixed issue with registeredUser map not cleaned up
2016-08-29 13:53:50 -04:00
jfederico
aac104c77d
bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties
2016-08-09 15:24:46 -04:00
jfederico
b88328ea4e
bbb-web: Removed debugging log used on development
2016-08-03 17:32:10 -04:00
jfederico
a41646e4c4
bbb-web: Fix for issue #2960
2016-08-03 15:35:20 -04:00
Richard Alam
1081564997
Merge pull request #3249 from riadvice/improve-meeting-retrieval
...
Improve meeting retrieval in MeetingService
2016-08-02 13:28:21 -04:00
Ghazi Triki
962ef49302
Rewritter MeetingService "getMeeting" method to make the difference between normal and breakout rooms.
2016-08-02 17:15:39 +01:00
jfederico
7c0b0a3856
bbb-web: Log error message on invalid
2016-07-28 15:46:44 -04:00
jfederico
3763b0da24
bbb-web: Fix for issue #3148
2016-07-22 16:01:28 -04:00
jfederico
623071005e
bbb-web: Simplified action updateRecordings by removing support for force parameter
2016-07-22 11:34:00 -04:00
jfederico
ac60cad84a
bbb-web: Added parameter to updateRecording "force=[true|false]"
...
when force=false or not included
if meta_parameter exists and passed meta_parameter='' update to blank
if meta_parameter does not exists and passed meta_parameter!='' do nothing
when force=true
if meta_parameter exists and passed meta_parameter='' delete
if meta_parameter does not exists and passed meta_parameter!='' add it
2016-07-11 17:57:27 -04:00
jfederico
34ad74646a
bbb-web: Added code for updating recording metadata
2016-07-11 15:57:11 -04:00
jfederico
a518a3a092
Reverted changes to error rendering response from join
2016-06-30 17:52:10 -04:00
jfederico
da32546095
Restored changes for making maxPartiipants filter and html responses work on join requests
2016-06-27 11:22:10 -04:00
Richard Alam
785ee34453
Flex 4 UI
...
- build using gradle
- launch from outside flex builder
2016-05-26 19:07:27 +00:00
Richard Alam
a615ed7583
- rearrange new flex client source to conform with gradlefx convention
2016-05-25 20:14:13 +00:00
Richard Alam
aafc420d53
Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-24 20:17:47 +00:00
Richard Alam
58c239bc43
Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
akka-bbb-apps/src/main/resources/application.conf
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-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
bigbluebutton-client/build.xml
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/common/Images.as
bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-web/build.gradle
bigbluebutton-web/grails-app/conf/spring/resources.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/MeetingMessageHandler.java
bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
record-and-playback/core/scripts/bigbluebutton.yml
2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204
Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
bbb-common-message/build.sbt
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
bigbluebutton-apps/build.gradle
bigbluebutton-web/grails-app/conf/spring/resources.xml
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-20 20:27:52 +00:00
Richard Alam
433f09f72d
Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB
...
Conflicts:
bbb-common-message/build.sbt
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-05-20 15:40:50 +00:00
jfederico
470971d598
bbb-web: Verified that all error messages from join are displayed in html
2016-05-19 16:12:30 -04:00
jfederico
c65cea3804
bbb-web: Adjustments for the new error management
...
- Removed old error managment from join
- Refactored method respondWitErrors so it may responde with html or xml
- Added validation for ignoring masUsers filter if maxUsers=0
2016-05-19 11:41:46 -04:00
jfederico
4ce332ecce
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (changed the format to error parameter)
...
[{"message":"You did not pass a checksum parameter.","key":"MissingParam"},{"message":"You did not pass a meetingID parameter.","key":"MissingParam"}]
2016-05-18 15:39:34 -04:00
Anton Georgiev
228dfb4061
Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds
...
Conflicts:
akka-bbb-apps/build.sbt
akka-bbb-apps/src/main/resources/application.conf
akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
akka-bbb-fsesl/build.sbt
bbb-common-message/build.sbt
bbb-fsesl-client/build.sbt
bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
bigbluebutton-apps/build.gradle
bigbluebutton-client/build.xml
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
bigbluebutton-html5/app/client/NotificationControl.coffee
bigbluebutton-html5/app/client/globals.coffee
bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
bigbluebutton-html5/app/client/main.coffee
bigbluebutton-html5/app/client/main.html
bigbluebutton-html5/app/client/stylesheets/whiteboard.less
bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
bigbluebutton-html5/app/client/views/modals/settings.coffee
bigbluebutton-html5/app/client/views/modals/settings.html
bigbluebutton-html5/app/client/views/users/user_item.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
bigbluebutton-html5/app/collections/collections.coffee
bigbluebutton-html5/app/config.coffee
bigbluebutton-html5/app/lib/router.coffee
bigbluebutton-html5/app/server/collection_methods/meetings.coffee
bigbluebutton-html5/app/server/collection_methods/users.coffee
bigbluebutton-html5/app/server/publish.coffee
bigbluebutton-html5/app/server/server.coffee
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
record-and-playback/presentation/scripts/process/presentation.rb
record-and-playback/presentation/scripts/publish/presentation.rb
2016-05-18 15:14:04 +00:00
jfederico
f075895792
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (implemented cleaner)
2016-05-17 10:55:37 -04:00
jfederico
9b48a68d7d
bbb-web: Fix for race condition that causes the maxParticipants filter to fail (tracking the joins)
2016-05-12 15:03:38 -04:00
jfederico
54d2c0fcb3
bbb-web: Implemented maxUsers/maxParticipants filter in Join
2016-05-10 15:15:46 -04:00
Ghaz Triki
f1ffbc525f
Making MeetingService able to find a meeting using an exact match of its internal ID, by adding a new signature to the getMeeting method.
2016-05-05 10:04:05 +01:00
jfederico
5d06841432
Fix for issue #3110
2016-05-04 17:31:07 -04:00
Richard Alam
b86f32b8c1
Sync with upstream repository
...
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2016-04-26 20:01:20 -04:00
Richard Alam
0323b7203a
Add logging on why cannot find user session
...
We need to know which part of the code failed to get the user's session.
2016-04-26 14:41:22 -04:00
David Feng
67c14f9056
This enable avatar to be display in other participants video window
2016-04-20 14:08:13 +08:00
Fred Dixon
7dc0871a28
Change from 1.0.0-Beta to 1.0.0-RC
2016-04-13 17:14:40 -04:00
Richard Alam
7d5c9d63e4
Upgrade to Java 8
...
Upgrade to Java 8 and merge screenshare feature.
Conflicts:
bigbluebutton-client/.actionScriptProperties
2016-03-21 20:19:48 +00:00
Richard Alam
7fe44355d4
Merging breakout rooms with the master branch
...
Merge breakout rooms feature with master branch. This
also includes closed captioning feature.
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-web/.classpath
bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-03-21 17:52:23 +00:00
Anton Georgiev
e834637b5a
upgrade grails from 2.3.6 to 2.5.2
2016-03-08 21:43:35 +00:00
Ghaz Triki
45362941ce
Use first sessionToken implementation in API.
2016-03-02 21:16:26 +01:00
Ghaz Triki
871843d4ec
Fix session token redirection merge.
2016-03-02 12:39:57 +01:00
Felipe Cecagno
e4da408c08
Merge branch 'mconf' into bigbluebutton/bigbluebutton@master
...
Conflicts:
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/service/PresentationService.java
bigbluebutton-client/locale/en_US/bbbResources.properties
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/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
bigbluebutton-config/web/index.html
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.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/ParamsProcessorUtil.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingServiceHelper.java
bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
record-and-playback/presentation/playback/presentation/0.9.0/playback.html
record-and-playback/presentation/scripts/publish/presentation.rb
2016-03-02 01:19:09 -03:00
Felipe Cecagno
66392e0a6b
Merge remote-tracking branch 'mconf/mconf-live0.7.4' 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/resources/prod/bbb-deskshare-applet-0.9.0.jar
bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2016-03-02 00:19:30 -03:00
Ghaz Triki
990e786340
Merge branch 'master' into breakout-rooms-porto-algre-2015
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
# bigbluebutton-web/.classpath
# bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
# bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
2016-02-28 21:34:33 +01:00
Anton Georgiev
cdf1ee0729
add a request/reply for stun/turn info
2016-02-17 18:36:17 +00:00
Richard Alam
c31857b9da
Merge pull request #3001 from bigbluebutton/getRecordings-merged-enhancements
...
Get recordings merged enhancements
2016-02-04 17:01:03 -05:00
Richard Alam
1e0be140a2
Change API version to 1.0
2016-02-04 14:43:59 -05:00
Felipe Cecagno
a64a9c5940
remove unnecessary logs; order getRecordings response by recordId, and metadata by meta key
2016-02-03 19:09:16 -02:00
Pedro Beschorner Marin
00d378831e
FreeMarker template in a separated file
2016-02-03 13:51:42 -02:00
Pedro Beschorner Marin
497930b06d
Creating getRecordings XML response with FreeMarker
2016-02-03 13:51:36 -02:00
jfederico
84e4221c47
bigbluebutton-web: Extended filterRecordingsByMetadata in order to support wildcards
2016-02-01 15:08:51 -05:00
jfederico
f23158ccd7
bigbluebutton-web: Fixed issue with recordings not publishing/unpublishing
2016-01-29 13:36:24 -05:00
jfederico
e12d3fa639
Cleaned up ApiController after merge
2016-01-29 10:24:30 -05:00
jfederico
e1e3aa6055
Merge branch 'pedrobmarin-getRecordings' into jfederico-getRecordings
...
# Conflicts:
# bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
# bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
2016-01-28 15:36:19 -05:00
jfederico
2f3bd5b3ce
Reformatted files with conflicts
2016-01-28 13:58:05 -05:00
Jesus Federico
a0702903eb
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2016-01-28 09:06:53 -08:00
jfederico
a0c2e337cd
bigbluebutton-web: Changed approach for filtering states/recordIDs. the query is now based on recordID and state parameters instead of filter
2016-01-28 11:45:12 -05:00
Ghazi Triki
8b503b3676
Fixed variable name in getMeetingInfo API method.
2016-01-27 18:38:40 +01:00
Pedro Beschorner Marin
3cb59b8951
FreeMarker template in a separated file
2016-01-27 14:27:06 +00:00
Ghazi Triki
0385d05001
Merge branch 'master' into breakout-rooms-porto-algre-2015
...
# Conflicts:
# akka-bbb-apps/build.sbt
# akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
# akka-bbb-fsesl/build.sbt
# bbb-common-message/build.sbt
# bigbluebutton-apps/build.gradle
# bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/UserClientMessageSender.java
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
2016-01-27 14:16:05 +01:00
jfederico
7ef3e62940
bigbluebutton-web: The statuses processing and processed can be returned by getRecordings
2016-01-26 17:17:28 -05:00
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
Markos Calderon
ba2da7004c
Merge almost complete. Still red dot not working
2013-01-25 21:50:32 -05:00
Markos Calderon
f93d40adfe
Added property for set max swf file size
2013-01-23 16:01:01 -05:00
Markos Calderon
983f93b0e4
Added license for bigbluebutton-web
2013-01-18 18:24:35 -05:00
Richard Alam
5a95875968
- hash the meeting id with the config xml
2012-12-10 19:05:41 +00:00
Richard Alam
02c6121a6c
- rename set and get configxml api
2012-12-09 20:44:52 +00:00
Richard Alam
a70d56ff56
- tie tokens to a meeting
2012-12-09 20:35:09 +00:00
Richard Alam
a0d4c61082
- add ability to post config xml for meeting
2012-12-09 19:29:48 +00:00
Richard Alam
1f620583a2
- allow passing of configURL in create and join api calls
2012-12-09 00:23:33 +00:00
Richard Alam
7ea06bd512
- add defaultAvatarURL property
2012-12-04 19:09:03 +00:00
Richard Alam
1cd682e1e0
- pass avatar in avatarURL during join API call. Have a default avatarURL
2012-12-02 10:57:58 +00:00
Richard Alam
787e1de310
- pass external meeting id to the client and provide JS api to query it
2012-11-20 19:30:08 +00:00
Richard Alam
e63bbfc449
- pass defaultLayout in join api call
2012-11-12 21:05:23 +00:00
Felipe Cecagno
604d08937c
refactoring some code to revert unwanted changes; extracted strings from GuestWindow; renamed the join parameter from isGuest to guest
2012-10-24 17:32:59 -02:00
Markos Calderon
9e45420a4c
load presentation in both sides html5 and flex
2012-10-20 14:18:39 -05:00
Felipe Cecagno
b0ae2252ea
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties
...
Reverted the default server URL on bbb-web
2012-10-03 15:37:27 -03:00
Hugo Lazzari
f52117cb03
Add new page with forced favicon.
2012-10-03 10:54:56 -03:00
Richard Alam
2c6b067b01
- convert userid from Number to String
2012-10-02 17:23:15 +00:00
Markos Calderon
5dafac2b25
change long to string
2012-10-01 16:41:33 -05:00
Hugo Lazzari
d9aff81560
New Guest - Now guest isn't a role. You can be a moderator and guest at the time.
2012-09-26 13:14:03 -03:00
Markos Calderon
c878ff5d06
added redirect and clientURL parameters to the API
2012-09-21 16:03:53 -05:00
Prav-Hugo
8e29964f6a
Feature #389 Creation of "guest" role on BigBlueButton
2012-09-12 12:35:06 -03:00
Richard Alam
d9e5c80c6c
- try generating userid instead of using red5 connection id as userid
2012-08-23 19:49:31 +00:00
Richard Alam
0be1db0cc9
- fix merge edit problem
2012-08-17 14:42:30 +00:00
Chad Pilkey
cfd3446123
Merge remote branch 'upstream/master'
...
Conflicts:
README
bigbluebutton-client/.gitignore
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2012-08-07 19:56:23 +00:00
Richard Alam
cbe0ee60cc
- merge some new stuff
...
Conflicts:
bigbluebutton-web/.gitignore
2012-07-29 16:06:39 +00:00
Chad Pilkey
17acf9c6df
hooked up presentation text
2012-07-24 20:36:29 +00:00
Markos Calderon
3c7419c5ef
load textfile from the client
2012-07-17 16:39:32 -07:00
Markos Calderon
3d0b3f9307
added extract text from presentations
2012-07-12 15:49:33 -07:00
Markos Calderon
9fed546de9
Initial changes for extract text
2012-07-11 15:37:31 -07:00
Ajay Gopinath
1f759c1466
Backup commit before resetting dev env
2012-06-27 18:28:01 -04:00
Leonardo Crauss Daronco
1f4c32cef3
Added <listenerCount> and <videoCount> to the response of 'getMeetings'.
2012-05-25 14:19:15 -03:00
Leonardo Crauss Daronco
6a5c39d012
Added <participantCount> to the reponse of getMeetings.
2012-04-03 12:04:29 -03:00
Richard Alam
5177a1737a
- allow admin to turn off recording for whole server
2012-03-29 16:26:10 +00:00
Richard Alam
ea087125db
- increase max pages for uploaded presentation
2012-03-08 17:21:35 +00:00
Leonardo Crauss Daronco
f6f744cf5e
Removed the tag <isListener> from getMeetingInfo and added a tag <listenerCount>.
...
This is a simpler solution that doesn't require matching a voice conference user with a "normal" user.
2012-02-16 13:48:26 -02:00
Leonardo Crauss Daronco
1d848b1aaa
Added "isListener" to the response of "getMeetingInfo". Had to change bbb-apps, bbb-web and bbb-client to generate and detect events when the user starts/stops its audio. The method used in bbb-client to send the externalUserId can still be improved.
2012-02-16 14:14:23 +00:00
Leonardo Crauss Daronco
8da1535c28
Adding internalMeetingID, isPresenter, hasVideoStream, and videoStreamName to the response of getMeetingInfo.
2012-02-09 12:33:03 -02:00
Richard Alam
a73287ea29
- store logout url into a session to make sure we get a logour url for a user
2012-02-01 23:04:12 +00:00
Richard Alam
742fd24b2d
- redirect to landing page when user refresh the browser and there is no session
2012-02-01 22:11:36 +00:00
Richard Alam
bc54a34736
- test if storing user info in hashmap will cleanup on tomcat6 restarts...on tomcat6 restarts, sessions
...
aren't destroyed which allows users to join the meeting by just refreshing the browser which screws up
bbb-apps state
2012-02-01 20:51:43 +00:00
Richard Alam
456042f74c
- add logging when trying to join session...investigating why we are allowed to refresh
...
browser and join conference after restart of BBB
2012-02-01 19:05:52 +00:00
Markos Calderon
17097c26f7
Merge pull request #23 from gugat/issue1112
...
In Api upload, strip any extension from the presentation directory
2012-01-26 10:37:12 -08:00
Fred Dixon
f997391899
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2012-01-19 21:22:55 -05:00
Fred Dixon
6bcb73e014
Set
...
removeMeetingWhenEnded=true
as default in bigbluebutton.properties. This will reduce errors with 3rd party integrations when users end a meeting, change a parameter, then try
start the meeting again.
2012-01-19 21:21:19 -05:00
Richard Alam
ecc979e274
- generate internal userid to be able to match users across subsytems
2012-01-18 15:46:29 +00:00
Fred Dixon
20d4587e3e
Changed API welcome messages from 'use a headset to avoide echo' to 'you can mute yourself in the listeners window' (BigBlueButton 0.8 now uses Flash for acoustic echo cancellation)
2012-01-15 12:32:39 -05:00
Fred Dixon
bf254501f5
Changed bbb-web to using a rolling 20 days of logs
2012-01-15 12:31:14 -05:00
Fred Dixon
b66059168d
increased the size of bbb-web.log to 25M and keep six rolling files (instead of three)
2012-01-15 12:05:21 -05:00
gugat
eba253fa04
In Api upload strip any extension from the presentation directory
2012-01-11 14:34:16 -05:00
Richard Alam
9c8aeae213
- if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation
2012-01-10 16:25:46 +00:00
Richard Alam
180d1acc58
- Make defaultLogoutUrl not blank so that bbb-conf --check does not complain
2012-01-09 23:23:44 +00:00
Markos Calderon
ea5331d0c9
now, bbb-web uses the internalUserId
2012-01-09 14:44:14 -08:00
Markos Calderon
e84a27c51c
added config file for jedispool
2011-12-12 15:18:52 -08:00
Markos Calderon
c2b0f1588f
fix urlencode in pre upload
2011-11-11 09:23:30 -08:00
Richard Alam
b52f5ae158
make it return the same response as 0.71a (fix isse 1027 http://code.google.com/p/bigbluebutton/issues/detail?id=1027 )
2011-10-02 23:24:00 -04:00
Marco Calderon
d91607b1d8
changes to the length
2011-09-28 12:37:26 -05:00
Marco Calderon
6b7cdd3528
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-09-26 11:38:01 -05:00
Richard Alam
f60023e7c9
Make meeting name optional to not break Moodle 1.9 integration
2011-09-23 19:15:59 -04:00
Marco Calderon
3425db56e7
added voicebridge to getMeetingInfo
2011-09-23 11:04:14 -05:00
Marco Calderon
261707478b
fixed recording time
2011-09-22 12:50:35 -05:00
Richard Alam
1164bb3e8f
- setup logout url when user enters instead of when user leaves because when the user clicks on the OK button
...
on the logout window after one minute, the meeting is gone from bbb-web memory.
2011-09-13 14:34:36 -04:00
Fred Dixon
9e93cc7b86
Removed depreciated message (we can look at this post 0.8)
2011-09-08 17:25:19 -07:00
Marco Calderon
6a47157b22
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-09-06 12:47:35 -05:00
Marco Calderon
b80e4ea5a1
Added CDATA to getRecordings
2011-09-06 12:46:54 -05:00
Richard Alam
ed44841a4c
- handle only pre-upload on first create API call
2011-09-06 11:48:38 -04:00
Fred Dixon
f4bc50a179
Modified default welcome message to give a bit more help to first time users.
2011-09-04 15:48:51 -07:00
Marco Calderon
6e41cae223
some fixes in the api
2011-08-31 17:22:10 +00:00
Marco Calderon
2db74d4d06
small fix for invalid password
2011-08-24 19:39:57 +00:00
Marco Calderon
deae7b0d15
fix for errors in api
2011-08-24 16:27:37 +00:00
Marco Calderon
dbd04839ec
added backward compatibility for errors
2011-08-23 19:19:25 +00:00
Marco Calderon
5e457b71d1
initial backward compability for 0.71a
2011-08-23 02:46:37 +00:00
Marco Calderon
18fba79c4c
Added metadata to getMeetingInfo
2011-08-04 23:14:08 +00:00
Richard Alam
daeb7fafc2
- bump api version to 0.8
2011-08-04 10:35:49 -04:00
Richard Alam
8ffc8c9bdc
- hook-up expired meeting background proc
2011-07-23 16:53:34 -04:00
Richard Alam
8e983345b8
- add property to set timeout for allowing time between creating a meeting and joining a meeting
...
- change default meeting expiration to 1 minute
- trigger ingest and processing when the meeting is removed form memory instead of when the last
user leaves the meeting
2011-07-23 11:13:29 -04:00
Marco Calderon
d32110d36c
api according to the latest spec
2011-06-30 02:33:12 +00:00
Richard Alam
2c65cc9ac2
- fix possible NPE when getting internal id of non-existing meeting
2011-07-20 15:26:19 -04:00
Richard Alam
b9e5b69a20
- add messageId to redis pub/sub messages to be able to filter and identify easily
2011-07-20 11:44:11 -04:00
Richard Alam
4d2e503214
- add param to remove the meeting right away from memory instead of letting
...
it linger for about an hour (the value of the expire meeting).
2011-07-19 16:03:36 -04:00
Richard Alam
46ea659796
- change default meeting duration to 0 (zero) which means no duration. This maintains
...
compatibility with previous release allwoing the demo meeting to run infinitely (for
example). 3rd-party apps must pass duration if they want to set it, especially if the
meeting is being recorded.
2011-07-19 15:27:18 -04:00
Marco Calderon
dd57d38fc4
fixed preupload
2011-06-24 21:04:10 +00:00
Marco Calderon
b9ee42b30d
finish demo recording
2011-06-24 16:28:32 +00:00
Marco Calderon
e5e061ea99
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into refactor-bbb-api
2011-06-23 07:55:19 +00:00
Fred Dixon
6f6cc70c6b
Change set redisHost to 127.0.0.1 to match other config files
2011-07-10 10:23:01 -07:00
Richard Alam
9c3389e68f
- fix problem for getting viewer password
2011-07-08 17:04:51 -04:00
Richard Alam
15990d2f55
- start hooking the api for recording
2011-06-27 12:52:17 -04:00
Richard Alam
7f4d38b5a6
- process metdata properly and simple playback
2011-06-26 10:56:03 -04:00
Richard Alam
dbfd92bff2
- fix join and create api
2011-06-24 11:09:12 -04:00
Richard Alam
9b3d901e34
- move things around
2011-06-24 10:57:56 -04:00
Richard Alam
c9ad8f15d7
- temporary commit
2011-06-23 17:02:37 -04:00
Richard Alam
f8abc966e9
- fix logout
2011-06-23 14:18:20 -04:00
Richard Alam
8c8e009baa
- unit test passing again
2011-06-23 14:04:00 -04:00
Richard Alam
e9bd55a563
- fix compile problem...get recordings isn't wired yet
2011-06-22 16:40:23 -04:00
Richard Alam
d044221d70
- start implementing get recording api
2011-06-22 15:53:27 -04:00
Richard Alam
0b6e59e8ab
- add duration parameter on creat API. This allows us to set a limit on the meeting length
...
to prevent continuously recording a meeting whe someone forgets to logout
2011-06-21 14:16:37 -04:00
Richard Alam
140c187fd0
- clean-up
2011-06-20 16:36:41 -04:00
Richard Alam
3b67e6b5ef
- group errors and send them all at once to the caller of the api
...
- make errors consistent
- return back createTime on a create API call
- require createTime parameter on a join API call. This way users with stale join link won't be
able to join a running meeting.
2011-06-20 16:18:57 -04:00
Marco Calderon
fd8296c183
finish API 0.8... need to update response messages
2011-06-16 18:37:14 +00:00
Marco Calderon
42f4acd250
added setpublish, pending response xml
2011-06-16 14:43:31 +00:00
Marco Calderon
fc55bb8aee
added to check multiple recordings in the call getRecordings
2011-03-08 21:06:04 +00:00
Marco Calderon
625d54e86c
getRecordings call... Need to show metadata values
2011-03-08 09:44:31 +00:00
Marco Calderon
81627bc616
initial cleanup
2011-03-07 20:18:33 +00:00
Marco Calderon
356c77b41f
removed redisport and redishost properties
2011-03-07 06:15:02 +00:00
Richard Alam
2454e6b9a1
- add timestamp to internal meeting id. So that the external meeting id can be re-used
...
especially if the meeting is recorded.
2011-06-16 16:45:14 -04:00
Richard Alam
8ba1e6484a
Merge branch 'master' into ref-bbb-web-2
...
Conflicts:
bbb-video/.gitignore
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
2011-06-16 14:49:57 -04:00
Richard Alam
a71b30af9c
- cleanup, fix merge issues, connect to redis explicitly when subscribing to a channel
2011-06-16 10:46:59 -04:00
Richard Alam
2765a178ce
- merging changes from Markos
...
Conflicts:
bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
bigbluebutton-web/grails-app/conf/spring/resources.xml
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/OfficeToPdfConversionSuccessFilter.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/SupportedDocumentFilter.java
bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
2011-06-16 09:28:14 -04:00
Richard Alam
120275071e
- now DI works fine...had to delete bin and target dirs remnants from maven build
2011-06-15 17:28:31 -04:00
Richard Alam
58b51c9146
- remove spring integration....having problem with dependency injection
2011-06-15 16:57:06 -04:00
Marco Calderon
d022aafb61
Cleanup bigbluebutton-web and bigbluebutton-apps
2011-06-15 08:30:56 +00:00
Marco Calderon
04dff406e8
Merge branch 'ref-bbb-web-2' of github.com:bigbluebutton/bigbluebutton into ref-bbb-web-2
...
Conflicts:
bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
2011-06-14 01:47:32 +00:00
Marco Calderon
e858828162
added gson and publish updates in bbb-web, missing receiving code in bbb-apps
2011-06-14 01:43:55 +00:00
Richard Alam
769470e232
- remove jms messages
2011-06-10 15:29:11 -04:00
Marco Calderon
2ac6aaa09a
merge remove-bbb-commons, working prototype, need to add status method to listener
2011-06-09 01:35:24 +00:00
Richard Alam
09e7475cd7
- point recorded status dir to the correct one
2011-06-03 11:19:53 -04:00
Richard Alam
134be90359
- handle incoming messages from bbb-apps
2011-06-01 17:58:55 -04:00
Richard Alam
50dac08e11
- cleanup sign out api
2011-06-01 14:16:35 -04:00
Richard Alam
c6626c7a9a
- write test for get meetings api
2011-06-01 12:42:50 -04:00
Richard Alam
ed1bf9d4f6
- implement test for get meeting info
2011-06-01 12:10:33 -04:00
Richard Alam
8d63e0a717
- continue refactoring bbb-web, renamed a few classes, and change get-meetings-info api
2011-06-01 10:51:40 -04:00
Richard Alam
46a769cf2f
- add test for end api
2011-06-01 02:47:01 +00:00
Richard Alam
c114289042
- add test for isMeetingRunning api
2011-05-31 17:51:07 -04:00
Richard Alam
e3ef2e5f6f
- add isMeetingRunning test
2011-05-31 16:59:04 -04:00
Richard Alam
6f9563b190
- put some steps into own methods
2011-05-31 16:10:31 -04:00
Richard Alam
78adae0696
- join and create api have unit tests
2011-05-31 15:23:44 -04:00
Richard Alam
c40976dab5
- generate default voice conf numbers if none has been passed in the param.
2011-05-31 10:05:09 -04:00
Richard Alam
26f98fe879
- write test for create api
2011-05-30 17:39:03 -04:00
Richard Alam
cfe20900f2
- now has setup for testing
2011-05-30 16:26:11 -04:00
Richard Alam
335fd9591d
- start refactoring bbb-web again...without trying to merge remove-bbb-commons branch
2011-05-30 01:42:50 +00:00
Richard Alam
4748352a87
- remove bigbluebutton.properties override
2011-05-27 11:36:10 -04:00
Marco Calderon
5bbb607c5d
Added redis pool, pubsub, and maven3 support to bbb-web
2011-05-17 11:04:40 +00:00
Marco Calderon
245070b366
removed bbb-commons. TODO: update process method and endrequest meeting
2011-05-14 05:56:35 +00:00
Marco Calderon
a9fcd56a88
refactoring bbb-apps
2011-05-11 02:09:10 +00:00
Richard Alam
e56ce0bd36
- have bbb-web write the recroding <meeting-id>.done file
2011-05-05 18:38:22 -04:00
Richard Alam
61ea9015e5
- set redis host and port in properties file
2011-05-04 11:14:35 -04:00
Marco Calderon
40cca71b04
added metadata parameter
2011-03-28 12:07:00 +00:00
Marco Calderon
7c2498597b
Added support pubsub for send updates from bbb-apps to bbb-web
2011-03-28 07:19:22 +00:00
Richard Alam
65d6e61890
- call the ruby scripts from bbb-web
2011-04-15 18:19:51 -04:00
Richard Alam
19694d87e0
Merge branch 'master' into record-and-playback-feature
...
Conflicts:
bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
2011-04-04 11:15:09 -04:00
Richard Alam
a1d983f204
- disable redis pubsub
2011-03-22 10:19:16 -04:00
Marco Calderon
0fdb2d4875
some changes in bbb-web and bbb-apps for pubsub
2011-02-22 17:13:00 +00:00
Richard Alam
19c3971e1f
- store meeting info in redis so we can include in events.xml
2011-02-16 10:34:49 -05:00
Richard Alam
fe44e0bf53
- setup jedis so we can put conference metadata into events.xml
2011-02-15 11:43:53 -05:00
Richard Alam
dda58fe6bb
- put rec and playback required params in properties file
2011-02-15 10:41:15 -05:00
Richard Alam
a8d9a48fb2
- trigger archive, ingest, publish of recording when the last user leaves the meeting
2011-02-14 14:18:21 -05:00
Richard Alam
8d895d7417
- add temp way to trigger ingest and processing
2011-02-11 15:31:34 -05:00
Jeremy Thomerson
7a236a6809
downloading and processing of files works for urls and encoded files
2011-01-25 17:28:57 -06:00
Richard Alam
0f82ae3e26
- add getters and setters
2011-01-19 11:36:48 -05:00
Richard Alam
d0184c8210
- cleaning up bbb-web
2011-01-19 11:09:50 -05:00
Jeremy Thomerson
c8b24e849c
more work on doc pre upload - xml parsing
...
now we are parsing xml that is passed in following example format:
<?xml version="1.0" encoding="UTF-8"?>
<modules>
<module name="foo">
</module>
<module name="presentation">
<document url="http://www.samplepdf.com/sample.pdf " />
</module>
</modules>
2011-01-14 19:16:09 -06:00
Jeremy Thomerson
ef6bd3a5f1
first test of preuploading documents in api create command
...
this commit is for testing only
it simply gets apicontroller working with presentationservice
it uses a test file on the server - rather than accepting files in
the http request (which is the next step)
2011-01-14 18:07:18 -06:00
Marco Calderon
f37093d533
update demo filesfor support recording
2011-01-10 12:08:54 +00:00
Marco Calderon
49d7ea37f4
fix bug recording
2010-11-17 06:34:18 +00:00
Marco Calderon
2d102450b9
added send parameter record from bbb-web to bbb-apps
2010-11-10 22:40:52 +00:00
Richard Alam
d01662da3e
- handle findConference AGI call to check if a conference with a particular number is running
2010-11-02 09:39:56 -04:00
Marco Calderon
70d8e805b1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
2010-10-30 19:54:08 +00:00
Marco Calderon
78794d5952
Fix bigbluebutton-web for recording
2010-10-30 19:51:40 +00:00
Marco Calderon
d186288749
added record conference call to BBB API
2010-10-24 08:59:23 +00:00
Richard Alam
920b21323e
- set session timeout to 3 hours
2010-10-06 10:20:15 -04:00
BigBlueButton
333dd13d6b
- fixed few issues and cleaned up
2010-07-19 20:23:28 +00:00
BigBlueButton
cad05a9ce1
- bbb-scheduling has been removed from bbb-web
2010-07-19 19:27:24 +00:00
BigBlueButton
1e6eff084b
- Removed bbb-web scheduler
...
- Merged the enter and signout function into the api controller
2010-07-19 19:15:01 +00:00
Richard Alam
0e3286667b
- change the api version to 0.7
2010-07-14 16:36:08 -04:00
Sebastian
b9a514199e
fixed a patch in bigbluebutton.properties
2010-07-02 10:00:12 -04:00
Sebastian
3c8333f8c1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2010-06-30 15:21:22 -04:00
Sebastian
a35ac1d846
Updated bigbluebutton.properties
2010-06-30 15:20:02 -04:00
Richard Alam
1b2e7b1dc5
- merge in sebs changes
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2010-06-29 13:37:17 -04:00
Richard Alam
7042903b4b
- remove loggedOutUrl value to easily easily maintain post-install script
2010-06-29 13:31:30 -04:00
Sebastian
552eb9edea
removed the comment from bigbluebutton.properties and removed the link to redirect the server to www.bigbluebutton.org
2010-06-29 13:27:48 -04:00
Richard Alam
f62eb0ae68
- removing bootstrapping of old web interface
2010-06-22 15:46:57 -04:00
Richard Alam
18ff5a0930
- moving the webVoiceConf param into join API
2010-06-22 14:41:28 -04:00
Richard Alam
ab9caa1616
- add webVoiceConf API so third parties can pass in different extension fo voip
2010-06-22 11:24:22 -04:00
BigBlueButton
07f6264e5c
fixes #393 by returning the supplied user ID in the getMeetingInfo call
2010-05-31 17:13:36 +00:00
Richard Alam
ef93c3ec1c
- add meetingID and externUserID to session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4325 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-14 19:25:10 +00:00
Jeremy Thomerson
34c802ef27
update issue 528
...
add a version number to response if you call /bigbluebutton/api with no parameters.
this does not require a checksum since the checksum generation differs between certain versions
we still need to change the build process to update the version in bigbluebutton.properties for each built version
i'll leave this part to Fred. I'd suggest using the following versioning process:
0.7-SNAPSHOT - for builds between releases
0.7-final - for release build versions
Owner: ffdixon
Status: Started
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4322 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-14 17:40:17 +00:00
Jeremy Thomerson
f3fa0f5da2
addition to issue #394 - now adds a response parameter that indicates whether the meeting has been forcibly ended
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4311 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 19:30:01 +00:00
Jeremy Thomerson
6e77a17fdc
fixes issue #394 - now does not allow you to rejoin a conference that was already ended
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4309 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 19:08:07 +00:00
Jeremy Thomerson
b3be60e2df
addition to issue #473 - make meetingID required parameter to create call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4308 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 19:00:00 +00:00
Jeremy Thomerson
08242fb324
fixes issue #473
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4305 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 18:44:22 +00:00
Jeremy Thomerson
24b7dcad60
fixes issue #487
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4304 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 18:19:47 +00:00
Jeremy Thomerson
814df400bb
fixes issue #510
...
assign a random password if none is supplied. this is what the API spec has always said would happen, but for some reason, it wasn't happening
now it does. note that if you have any kind of requirements that your passwords must be numeric, a certain length, etc, you really need to pass them in yourself
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4276 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-08 02:14:47 +00:00
Jeremy Thomerson
be9314d6cf
fixes issue #247
...
automatically cleans out conferences that have either:
1 - been created, but not started in XX minutes
2 - or, started, and were ended at least XX minutes ago
you can set the number of XX minutes in bigbluebutton-web bigbluebutton.properties like:
beans.dynamicConferenceService.minutesElapsedBeforeMeetingExpiration=60
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4275 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-08 01:43:22 +00:00
Richard Alam
34518c19cc
- adding deprecation notice to bbb-web scheduler
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4056 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-29 19:32:01 +00:00
Richard Alam
873a8c125b
- fix so that we are checking logoutURL properly from properties file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4033 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-26 20:06:54 +00:00
Richard Alam
9871f9acfa
- rename loggedOutUrl to logoutURL to be consistent with the API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4032 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-26 15:34:56 +00:00
Chris Liu
a417446d83
Reversed the UTF-16 changes Richard made.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3971 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-23 15:46:15 +00:00
Richard Alam
1613c9bd59
- encode xml response to UTF-16. Fixes issue 421
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3966 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-22 20:24:03 +00:00
Jeremy Thomerson
ceb0f375e3
add getMeetings call that lists all meetings on server
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3932 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-18 19:55:13 +00:00
Jeremy Thomerson
15894cf901
fix stupid typo that i kept forgetting to fix (for oh, like a year)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3876 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-10 20:59:04 +00:00
Jeremy Thomerson
26248d7f2f
end meeting API call - issue #394
...
forgot to check this in yesterday
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3871 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-10 17:36:49 +00:00
Jeremy Thomerson
ac17421e6c
work on end meeting API call (issue #394 )
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3864 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-09 19:29:59 +00:00
Jeremy Thomerson
f01048df78
getMeetingInfo works when meeting hasn't started
...
references issue #393
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3825 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-08 17:56:13 +00:00
Jeremy Thomerson
b7515facaa
require moderator password for getMeetingInfo call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3799 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-05 00:47:39 +00:00
Jeremy Thomerson
cef2d9fc2d
complete getMeetingInfo API call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3797 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-05 00:24:15 +00:00
Jeremy Thomerson
500604eb55
getMeetingInfo API call working
...
now just need to add more information to it
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3796 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 23:59:02 +00:00
Jeremy Thomerson
bdb9832e54
work on getMeetingInfo API call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3795 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 22:41:46 +00:00
Jeremy Thomerson
895ff7d53b
spring integration using full-on objects now
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3793 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 21:51:43 +00:00
Jeremy Thomerson
491109b741
fixes issue 343
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3707 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-11 18:03:53 +00:00
Richard Alam
947b79dc8c
- add a way to configure a test conference room thru the API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3683 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 19:11:05 +00:00
Richard Alam
76e1baa682
- change logoutUrl to logoutURL to be consistent with other param names
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3679 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 16:23:38 +00:00
Richard Alam
1ac73ea743
- ugggh typo
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3601 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-03 19:02:03 +00:00
Richard Alam
3393f2b98a
- setup a way to trigger a conversion process on the server. This way we'll be able to test and monitor
...
if the conversion process works
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3600 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-03 18:58:51 +00:00
Richard Alam
9781c2abd2
- add "logoutUrl" as API create param. This allows you to pass a URL where the participant will be brought when she logs out
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3581 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-31 02:29:51 +00:00
Fred Dixon
900bca4ff9
Minor tweek on welcome message.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3464 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 02:18:26 +00:00
Fred Dixon
6f81c10801
updating welcome messag in bigbluebutton.properties
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3462 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 00:54:41 +00:00
Fred Dixon
04a4428a88
Needed to add back picking up a configuration file from file:${userHome}/.grails/-config.properties so that we could setup the development environment on the VM without overwritting the existing bigbluebutton.properties
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3450 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 01:19:57 +00:00
Richard Alam
2efe8ca25d
- allow keyword substitution on welcome message. Now you can have something like
...
<br>Welcome to %%CONFNAME%%.<br><br>Dial: %%DIALNUM%% Conference: %%CONFNUM%% in your
welcome message.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3435 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 20:59:43 +00:00
Richard Alam
451231e8df
- remove space so easy to parse
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3434 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 19:44:06 +00:00
Richard Alam
0cf30e3dde
- provide a way to enable/disable old scheduling mechanism
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3432 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 19:03:03 +00:00
Richard Alam
99c9822f9f
- test to trigger build
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3364 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-19 22:10:45 +00:00
Richard Alam
8cdf4cd1dd
- remove html tag in welcome message as chat will format it
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3340 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-19 18:10:36 +00:00
Fred Dixon
104ea65352
removing spaces around ' = ' bigbluebutton.properties ... tracking down a bug in the upgrade scripts
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3305 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-14 16:08:06 +00:00
Fred Dixon
c1dd1c4ee1
updates to draft welcome message in chat window
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3247 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-09 06:56:08 +00:00
Richard Alam
80e25349a1
- reformat welcome message
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3243 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-08 15:51:43 +00:00
Richard Alam
1c928d826e
- provide a way to pass a welcome message that gets displayed on the chat when a participant joins the web conference
...
- the message can be set on bigbluebutton.properties but is better to pass it on the create API as "welcome" variable
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3239 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 22:22:58 +00:00
Richard Alam
db5cc1c8f1
- setup fonts directory
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3237 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 19:41:03 +00:00
Richard Alam
25e2104eee
- cleanup
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3232 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 17:41:03 +00:00
Richard Alam
a65559fa96
- fix logging when deployed to tomcat
...
1. use our own log4j.properties file instead of having grails auto-generate one
2. modify web.xml template to use spring's log4config listener instead of grail's one
3. remove duplicate slf4j library
4. leave log4j DSL in Config.groovy to enable logging when developing and running "grails run-war"
5. log is written to /var/log/bigbluebutton/bbb-web.log
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3231 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 17:29:12 +00:00
Richard Alam
f7dd241bbb
- pass conference name or meetingID when a user joins so we can display on the client.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3200 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-04 17:39:00 +00:00
Richard Alam
dcea25fe5d
- fix AGI to query dynamic conference service if conference is not found from database.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3199 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-04 16:22:53 +00:00
Richard Alam
aa565b4d5a
- update doc
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3185 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 22:39:35 +00:00
Richard Alam
1727582cd8
- fix so that securitySalt can be set in the properties file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3184 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 22:38:51 +00:00
Richard Alam
c018114366
- modify how thread get created on doc conversion
...
- make max number of pages allowed to be configurable thru the properties file
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3182 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 18:57:30 +00:00
Richard Alam
cdd1d9a0cf
- can now convert upload image files (JPG and PNG)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3159 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 19:13:50 +00:00
Richard Alam
0369d208db
- can now handle office documents
...
- cleanup
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3155 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 17:17:45 +00:00
Richard Alam
310e330b97
- can now handle PDF
...
- need to figure out why office doc throws SI exception
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3154 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-29 20:29:17 +00:00
Richard Alam
7e2a0b5b2e
- checking in so we don't loose anything if something crashes
...
- refactor uploaded presentation conversion
- write some unit tests
- add headers
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3153 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-28 19:38:08 +00:00
Fred Dixon
fa81684cc0
Have bbb-web log to /var/www/bigbluebutton; add JSON support for reply when calling create() in ApiController.groovy
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3145 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-24 02:21:26 +00:00
Fred Dixon
e73b2ea920
updates bigbluebutton.properties to support securitySalt for API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3144 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-24 02:05:45 +00:00
Richard Alam
eeaeb5bb61
- refactor presentation classes from groovy to java...java has better tool support for eclipse
...
- start extracting out some code from PresentationService into it's own classes
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3132 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-22 21:06:23 +00:00
DJP
5190321157
Fixed indent + better error handling
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3111 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-17 23:06:09 +00:00
DJP
2eb7e81c3d
Added error handling to be compatible with i18n string generation by Flash client
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3105 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 20:42:39 +00:00
DJP
d1b8867019
Handle OpenOffice Files + TXT files
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3095 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-14 19:21:32 +00:00
DJP
f95e878278
Get rid of client command line wrapper (jodconverter-cli) for Office2Pdf. Resolved Issue 257
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3028 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-21 11:59:19 +00:00
Fred Dixon
a08f7b4c9b
removed spaces from bigbluebutton.properties to make upgrading packages easier
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3027 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-21 03:34:43 +00:00
DJP
cca2df1789
Fixed indent + Image file support + First shot for error handling + Refactored presentation file handling to support additionnal filetype (+ future)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3024 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-20 23:49:34 +00:00
Fred Dixon
339d0729b2
enabled openoffice for bigbluebutton.properties in bbb-web. This was to update the bbb-web package for integrating DJP's conversion of office documents into BigBlueButton.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3010 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-15 00:27:43 +00:00
DJP
5de4b3ef3c
Fixed IOError Popup on upload - break up the backend redirection after file upload to save bandwidth for client
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2993 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-11 01:52:09 +00:00
DJP
4b878746e1
Web service update for Additional filetype support
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2990 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-11 00:43:39 +00:00
Fred Dixon
ecd0b438f5
updates to bigbluebutton.properties
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2877 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-07 00:08:32 +00:00
Richard Alam
fa360130da
- redirect to default url when logged out url is not defined
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2870 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-06 22:07:11 +00:00
Fred Dixon
ecba245df4
added support for .grails/bigbluebutton-config.properties in bbb-web when developing locally
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2802 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-03 23:18:34 +00:00
Fred Dixon
6c39a3af70
removed reference to /etc/defaults/bigbluebutton (not used)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2797 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-03 20:27:01 +00:00
Fred Dixon
b4b5c5dd37
removed hardcoded path in bigbluebutton-web/grails-app/conf/Config.groovy
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2768 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-30 19:39:24 +00:00
Richard Alam
3b7bd3676f
- put a logged out url landing page
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2722 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-27 20:57:40 +00:00
Jeremy Thomerson
83c3927b0a
fix cast which for some reason works under 10 but not over
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2682 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-15 04:10:52 +00:00
Jeremy Thomerson
c871480f00
support voice bridge in API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2676 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-09 05:01:08 +00:00
Jeremy Thomerson
98a02ebec2
fix a couple little things in the API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2675 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-09 04:27:42 +00:00
Jeremy Thomerson
e376f2c75e
working conference service - create and join api calls
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2659 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-28 21:56:13 +00:00
Jeremy Thomerson
f0bcd620ad
have prototype of end-to-end JMS messaging for conference events with spring integration
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2657 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-28 21:31:23 +00:00
Richard Alam
2741362a3e
- change voiceBridge to voicebridge so it's compatible with PublicSessionController. THis way we dont' have to change config.xml in the client.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2647 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 19:43:53 +00:00
Richard Alam
a45e0cac52
- remove id from url mapping
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2628 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 18:14:18 +00:00
Richard Alam
1e9dd27215
- add boolean transactional false to DynamicConferenceService
...
- change API again
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2627 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 17:41:30 +00:00
Richard Alam
b7064ec12a
- change Adhoc API from POST to GETs
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2620 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 17:16:18 +00:00
Jeremy Thomerson
c29c09f5c3
add isMeetingRunning api call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2614 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:58:31 +00:00
Jeremy Thomerson
596cac75f2
work on join meeting call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2613 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:47:50 +00:00
Jeremy Thomerson
c84d23244d
more work on dynamic conferencing api
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2612 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:20:00 +00:00
Jeremy Thomerson
c002986fd1
change url mapping for my api so as not to conflict with richard's and fix bug in create method returning duplicate xml
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2611 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 03:33:24 +00:00
Jeremy Thomerson
4b3102e521
merging my branch into trunk
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2608 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 03:00:15 +00:00
Richard Alam
f3c8ee1055
- cleanup, convert println to log
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2601 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:28:56 +00:00
Richard Alam
7ac215b5c5
- modify adhoc controller so it supports xml, form, and json requests
...
- create a demo on how to call it using jquery
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2600 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:20:19 +00:00
Richard Alam
2e57f81df1
- fix logging
...
- put logs in /tmp/logs
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2599 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:13:53 +00:00
Richard Alam
cbeb98c867
- setup demo for creating adhoc conf
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2598 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-23 19:56:44 +00:00
Richard Alam
ac32baf6bf
- checking in adhoc REST api
...
- moving to jsecurity 0.4.1
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2572 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-21 20:45:55 +00:00
Richard Alam
f76afe580d
- upgrade to grails 1.1.1
...
- upgrade to jsecurity 0.4
- merge portal controller from Jeremy
- start implement adhoc conference api
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2570 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-20 19:19:50 +00:00
Richard Alam
3b78af5d4f
- send thumbnails message twice...need to figure out why we are loosing messages
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2422 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-10 17:15:29 +00:00
Richard Alam
4e733c1cba
- when resulting swf file is greater than 500K, use an image snapshot to generate the slide
...
- send out generating thumbnails progess update
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2369 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-04 17:58:34 +00:00
Richard Alam
4cc227cd99
- refactor presentation service
...
- generate blank slide or thumbnail if conversion fails for that page
- if the resulting swf file is greater than 500K, generate a SWF file using a PNG snapshot to make resulting SWF file smaller. This helps to improve performance when rendering the slide on the client
Config Changes:
/etc/nginx/sites-available/bigbluebutton
- set client_max_body_size 20m; // Allow 20Mb file upload
- put blank slide and thumbnail in /var/bigbluebutton/blank (see bigbluebutton.properties)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2356 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-02 19:42:10 +00:00
Fred Dixon
5f8ccedb04
updates to bbb-web
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2209 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-12 16:33:07 +00:00
Richard Alam
c1f4214b3a
- change banner
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2206 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-12 15:50:37 +00:00
Richard Alam
c79ae8b689
- remove number of attendees for now as it's not being used and just confuses users
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2164 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-11 15:14:14 +00:00
Richard Alam
56aeba1abf
- convert print to log
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2107 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-05 17:53:19 +00:00
Richard Alam
91302c1ba1
- rename agi name
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2106 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-05 17:29:06 +00:00
Richard Alam
05ad3510e9
- modify agi script so all it does is query for the conference...the logic is handled in the dialplan
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2105 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-05 15:52:36 +00:00
Fred Dixon
419827e430
added LGPL license
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1831 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-30 18:45:42 +00:00
Tyler Copeland
5be57e60da
Update the wording for default session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1607 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-12 15:31:43 +00:00
Richard Alam
a2a18a9448
- fix problem when creating a new user
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1601 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:38:02 +00:00
Richard Alam
93bc275683
- fix managing users
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1599 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:06:09 +00:00
Richard Alam
da762f5164
- fix problem where the client gets loaded even when user enters the wrong password
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1585 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-10 14:49:24 +00:00
Richard Alam
3fc40d425e
- display more info when joining a conference
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1568 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-05 14:46:34 +00:00
Richard Alam
789a61f38e
- display default username and password
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1566 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-04 21:13:23 +00:00
Richard Alam
4b11be9518
- login directly into the client when a user successfully enters a passsword
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1564 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-04 19:36:30 +00:00
Richard Alam
fca9a1fbcc
- remove new schedule link as it should be only accessible from the conference page
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1561 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 20:00:35 +00:00
Richard Alam
9997466eee
- comment out record, time scheduling, and host password as we don't use it for now
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1559 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 19:42:48 +00:00
Fred Dixon
b692425b3b
small updates to build.sh and streamlined join in preview of new session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1542 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 01:48:29 +00:00
Fred Dixon
e098260a53
remove carriage returns for development on unix
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1534 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-02 22:35:22 +00:00
Richard Alam
0776a4d2b1
- need to use AGI to get conference number when someone joins the voice conference
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1522 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-02 17:33:50 +00:00
Richard Alam
b69abde8f5
- fix some problem with creating default conference
...
- remove Asterisk AMI/AGI beans from resources.xml as we don't need it for now
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1520 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-02 15:54:16 +00:00
Richard Alam
4aa64ce1b1
- fix NPE problem with scheduling
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1513 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-01 19:31:33 +00:00
Richard Alam
9282339540
- flush right away to database when saving domain in bootstrap
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1510 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-01 15:18:03 +00:00
Richard Alam
be91497b09
- remove phil and alice from bootstrap
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1504 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 21:18:49 +00:00
Fred Dixon
d48a25ec4a
modify text of join screen
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1484 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 00:40:35 +00:00
Fred Dixon
9128e11737
modify the shortcut to join a session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1483 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 00:37:51 +00:00
Fred Dixon
3fc60ec0e0
assign default conference to admin user
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1482 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 00:35:41 +00:00
Fred Dixon
93a0215443
add shortcut to join session when scheduling it
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1481 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-28 23:32:18 +00:00
Fred Dixon
d54e1038e8
updated bigbluebutton.properties
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1477 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-28 21:43:47 +00:00
Richard Alam
5983047344
- create a default conference and session (85115)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1465 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-28 15:21:40 +00:00
Richard Alam
75f5fc575d
- fix link when showing conference session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1452 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-21 14:21:37 +00:00
Richard Alam
cfe414e8b3
- Add to to refresh browser
...
- Add "CLICK HERE TO JOIN"
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1425 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 20:20:40 +00:00
Richard Alam
ca2059bcf7
- trigger hudson build
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1418 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 15:13:14 +00:00
Richard Alam
4db5c733ee
- put a check in so that it won't check conflicts if there is none
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1416 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 14:45:45 +00:00
Richard Alam
eb786d9b89
- change audio recording directory
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1414 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 14:21:21 +00:00
Richard Alam
45e1bf2fcb
- remove duration
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1411 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 02:58:52 +00:00
Richard Alam
b7fffff463
- preset conference number
...
- use conference number in joining
- check if there is a conflict when scheduling session
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1410 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 02:32:56 +00:00
Richard Alam
04260c65ab
- add more logging when in agi
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1409 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 13:07:17 +00:00
Richard Alam
b7f3f65079
- log where we are recording the audio file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1408 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 12:52:20 +00:00
Richard Alam
bb3e419e7e
- hardcode /var/spool/asterisk/meetme (recordings dir) for now...can't seem to make it work...
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1407 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 12:34:24 +00:00
Richard Alam
3b250897f8
- conferenceRecordingDir seems not to work...hardcore it for now since it probably won't change anyways
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1405 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-06 19:37:00 +00:00
Richard Alam
e80dfc7214
- set conferenceRecordingDir into AsteriskAgiService bean
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1399 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-06 19:15:16 +00:00
Richard Alam
89da6bf5ab
- display bbb-web version
...
- must do "grails set-version xxx" before build
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1392 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-05 18:46:56 +00:00
Richard Alam
372882c568
- set role as MODERATOR when logging in as host as we don't support HOST for now
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1389 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-05 17:47:33 +00:00
Richard Alam
339a8908c6
- set the default end time an hour after start date time
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1371 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 21:08:18 +00:00
Richard Alam
56d4f6fbe9
- make the directory where we store the meetme recording into the properties file to make it configurable
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1370 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 20:53:27 +00:00
Richard Alam
948e351d3a
- setup recording only when the host asked the session to be recorded
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1369 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 15:20:59 +00:00
Richard Alam
832d959dfe
- rename AsteriskAgi to AsteriskAgiService so the logger gets injected by Spring
...
- enable recording of audio conference
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1368 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 15:08:38 +00:00
Richard Alam
90d1d82098
- enable AgiService to be called from Asterisk in order to have dynamic voice conferencing
...
- need to add this line to /etc/asterisk/extension.conf
exten => 1300,1,Agi(agi://192.168.0.100/meetme.groovy)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1367 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-03 20:06:34 +00:00
Richard Alam
7ab8d3cdb4
- fix issue where process hangsup during waitFor() on getNumberOfPages...()
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1362 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-02 16:18:23 +00:00
Richard Alam
f109871e17
- add logging to see if command is executing
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1358 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 21:02:15 +00:00
Richard Alam
c0389d1c29
- fix typo in var name
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1357 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:55:56 +00:00
Richard Alam
e3f158d50e
- need to wait for the pdf2swf to end before checking exitValue in getPageNumber()
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1356 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:55:10 +00:00
Richard Alam
dc05281d35
- Adding noPdfMarkWorkaround into PresentationService as a workaround for this problem
...
http://groups.google.com/group/comp.lang.postscript/browse_thread/thread/c2e264ca76534ce0?pli=1
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1355 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:27:03 +00:00
Richard Alam
f64008a003
- add more logging to determine why conversion is failing in Ubuntu
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1354 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:10:44 +00:00
Richard Alam
34e533ecbd
- replace invalid chars from presentation name and uploaded filename
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1353 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 17:56:59 +00:00
Richard Alam
575262dd44
- change name of swftools, imagemagick and ghostscript in properties file to make it clear to the user to enter the directory or executable
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1351 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 16:01:04 +00:00
Richard Alam
c8f37afd0d
- modify to show conference session information before joining
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1346 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-30 19:12:28 +00:00
Richard Alam
0f35da8582
- add some debug logs and fix links on displaying session info
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1340 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-29 21:33:15 +00:00
Richard Alam
5a7ca059b3
- put bigbluebutton web server url into properties file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1339 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-29 21:09:37 +00:00
Richard Alam
29c99178eb
- merge in branches/developers/ritzalam/bbb-web-playback
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1336 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-29 19:38:46 +00:00
Richard Alam
8d894ccb24
- put back fix for uploaded files with space on filenames
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1282 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-18 00:44:12 +00:00
minoustudio
5bd1196edf
20090414: multi-presentation
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1239 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-14 15:47:33 +00:00
minoustudio
338e094484
20090414: multi-presentation
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1238 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-14 15:47:16 +00:00
Richard Alam
98dc0bc272
- bringing bigbluebutton-web into trunk
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1190 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-01 16:53:45 +00:00
