Richard Alam
8bdf8e28e9
kick off recording processing when meeting is ended
2014-09-01 15:21:01 -04:00
Richard Alam
6c857c04fa
- change log level for user join and leave so we can track them if the log level is above debug
2014-08-23 14:53:08 -07:00
Richard Alam
c30c709ac3
- add comment on why we lowercase meta param
2014-08-21 10:11:56 -07:00
Richard Alam
4dbf327567
- maintain backward compatibility with 0.8.1 where it converts meta params keys to lowercase
2014-08-21 08:13:50 -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
Richard Alam
9b299a9f91
- add better logging for meeting create and doc conversion
2014-08-13 06:10:15 -07: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
Richard Alam
49687d2f8a
- fix setconfigxml exception
2014-08-05 11:14:35 -07:00
Richard Alam
1323492180
- cleanup
2014-08-05 11:13:40 -07:00
Richard Alam
80666c001e
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1442
2014-07-30 12:36:19 -07:00
Richard Alam
fee5a208c8
- minimize the number of threads required for doc conversion
2014-07-22 14:42:30 -07:00
Richard Alam
89af96714f
- don't create threads unnecessarily when processing uploaded presentations
2014-07-22 14:26:18 -07:00
Richard Alam
bc655811c6
- don't clear newer pending ping messages when red5 recovers
2014-07-05 03:38:12 -07:00
Richard Alam
fb269a3c6b
- remove user sessions from hashmap when user leaves and when meeting is destroyed to
...
prevent memory leaks
2014-05-26 08:32:56 -07:00
Richard Alam
4a4241ee78
- make sure create, register user and validate are in correct sequence
2014-05-21 13:56:37 -07:00
Richard Alam
53a86bafba
- add check to handle whne user has joined the meeting
2014-05-20 15:35:03 +00:00
Richard Alam
dffd727674
Merge pull request #327 from gugat/tobitmaps
...
convert graphics to bitmap
2014-05-14 17:00:39 -04:00
Gustavo Salazar
748f3728ec
convert graphics to bitmap if pdf-swf conversion fails
2014-05-13 18:34:56 -05: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
04f49c29e6
- fix user an dmeeting messages
2014-05-08 19:52:35 +00:00
Richard Alam
e915c72331
- start formatting json messages for users and meeting
2014-05-07 21:42:32 +00:00
Richard Alam
79ce612a19
- fix compile issue
2014-05-07 14:06:58 +00:00
Richard Alam
9e401d6a13
- truen create meeting into a message instead of using a direct method call
2014-05-05 18:34:19 +00:00
Richard Alam
f30dd78f5e
- put apps into their own channel
2014-05-05 18:33:39 +00:00
Richard Alam
0f4cb19133
- the executor should continue processing messages instead of just once
2014-05-02 20:55:12 +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
a3b65bcabf
- fix race condition on create and join api call
2014-05-01 15:37:39 +00:00
Richard Alam
2dc729cecb
- try running the meeting service into it's own thread
2014-05-01 15:24:11 +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
db01b1727f
- set bbb-apps as available when it starts replying to the keep alive messages again
2014-04-29 15:33:53 +00:00
Richard Alam
ef6ffa20df
- make keep alive run on it's own thread
2014-04-28 22:00:48 +00:00
Richard Alam
55f80252b7
- remove PNG generation step in doc conversion as it takes a long time
2014-04-28 20:19:27 +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
6ab5feb117
- fix compile issues
2014-04-08 18:49:29 +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
Richard Alam
e5eb48a90f
- fix recording
2014-03-12 18:37:11 +00:00
Richard Alam
31926bd26d
- implement end and destroy meeting
2014-03-10 21:38:03 +00:00
Richard Alam
86abffc79b
- add timer to check meeting duration
2014-03-09 14:41:24 -04:00
Richard Alam
6ec6553534
- send end meeting message from bbb-web
2014-03-09 00:05:43 -05:00
Richard Alam
db3686bd40
- fix compile error
...
- fix url for slides
2014-03-07 14:58:51 +00:00
Richard Alam
89e2f6363a
- display presentation page
2014-03-03 18:39:04 +00:00
Richard Alam
d15e8c3a5b
- continue cleaning up presentation
2014-02-27 21:41:25 +00:00
Richard Alam
feb49951a5
- add presentation ids to presentation conversion
2014-02-27 17:23:44 +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
6cf30e9f07
- upgrade bigbluebutton-web to grails 2.3.6
2014-02-25 15:46:06 +00:00
Richard Alam
ff333b9232
- handle get presentation info message
2014-02-08 14:20:05 -05:00
Richard Alam
1c5c3cbdf3
- try to fix presentation messages
2014-02-07 17:23:11 -05: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
Felipe Cecagno
3440ed0fe3
Merge branch 'v0.81' into record-button
...
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
2014-01-14 14:05:41 -02:00
Richard Alam
4b07e6d3ab
Merge branch 'master' into html5-bridge-new-events
2014-01-06 13:20:35 -08:00
Guilherme Augusto Dias
1d421f2d4a
Retrieve duration
...
BBB Web retrieves playback length from metadata.xml when it is available, otherwise playback length is calculated with start/stop meeting timestamps.
2013-11-06 18:13:43 +00:00
Richard Alam
a58120f322
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1680
2013-11-05 18:28:12 +00: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
Felipe Cecagno
8e2ac7335b
Merging tag v0.81RC3 into audio-video-on-api
2013-10-14 10:58:57 -03:00
mohamed-ahmed
2951a3bbd8
slide size hotfix
2013-08-26 14:32:19 +00: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
Markos Calderon
1df0a4c4ba
fix for precreated poll
2013-07-17 18:46:32 -05: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
Richard Alam
c6611f6f4e
- have bbb-web send create/destroy meeting to red5
2013-07-09 20:52:57 +00:00
Markos Calderon
5a09b5a6d2
adding a response when server is down
2013-06-25 18:26:49 -05:00
Markos Calderon
f520bef467
mark bbb-apss down if server doesn't respond back
2013-06-24 17:33:39 -05:00
Markos Calderon
b327e16e56
sending and handling keepalive messages
2013-06-21 20:38:14 -05:00
Markos Calderon
2597d47bba
listen to events in bbb-callbacks
2013-06-12 18:49:32 -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
Markos Calderon
7f748fd809
reading polls from create API call
2013-06-05 17:56:03 -05:00
Markos Calderon
47eadc0fe5
Adding poll models
2013-06-04 19:13:54 -05:00
Richard Alam
11f41b8d70
Revert " - allow removing of close button for avatar and publish window through config.xml"
...
This reverts commit 961626f46a
.
2013-05-28 16:24:54 +00:00
Richard Alam
961626f46a
- allow removing of close button for avatar and publish window through config.xml
2013-05-28 16:18:48 +00: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
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
27af71f208
- handle passing of config xml
2013-03-27 16:06:03 +00:00
Richard Alam
d9bbc14d80
- remove decoding of config xml to utf-8...I still think we need to encode
...
the config xml to utf-8 and decode it
2013-03-22 15:32:44 +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
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
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
Markos Calderon
ba2da7004c
Merge almost complete. Still red dot not working
2013-01-25 21:50:32 -05:00
Markos Calderon
740123942d
a fix when the name param is not passed in the API
2013-01-23 16:43:06 -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
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
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
jfederico
93b1bbda72
bbb-lti 0.1: Added functionality for passing IMS Global Certification test
...
Signed-off-by: jfederico <jesus@123it.ca>
2012-10-24 16:04:40 -04:00
Markos Calderon
4d76c61417
added a better quality for converting images
2012-10-24 14:37:25 -05:00
Markos Calderon
faeac6a6e1
move and back slides
2012-10-23 13:32:59 -05:00
Markos Calderon
9e45420a4c
load presentation in both sides html5 and flex
2012-10-20 14:18:39 -05:00
Markos Calderon
ce9d7c1706
API stores meeting in redis, apps stores users in redis
2012-09-14 16:48:05 -07: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
Leonardo Crauss Daronco
1f4c32cef3
Added <listenerCount> and <videoCount> to the response of 'getMeetings'.
2012-05-25 14:19:15 -03:00
Markos Calderon
0b63acb6bc
Update bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
2012-04-19 14:08:52 -05:00
Markos Calderon
6183dab2c5
a better way to support old date format
2012-04-14 13:47:31 -07:00
Markos Calderon
1720b4bdda
Adding support for old date format
2012-04-14 11:20:01 -07:00
Richard Alam
5177a1737a
- allow admin to turn off recording for whole server
2012-03-29 16:26:10 +00:00
Markos Calderon
c4d866419c
change date format in getRecordings for bigbluebutton 0.8
2012-03-26 13:47:35 -07:00
Richard Alam
d8274e0920
- send the number of slide completed instead of page number
2012-03-09 22:17:43 +00:00
Richard Alam
8527f3fe1b
- remove cancelling of task as we have put timouts already in the external proc calls
2012-03-08 17:22:01 +00:00
Richard Alam
bab14dc466
- add a timeout when executing external process to prevent doc convertion from hanging in case
...
external command goes wrong
2012-03-08 16:52:17 +00:00
Richard Alam
c331f9aaaf
log received message from redis pubsub
2012-03-08 16:46:37 +00:00
Richard Alam
dafc3deb96
- create blank thumbnails for pages that failed to generate one
2012-03-07 17:28:18 +00:00
Richard Alam
6e73b5ee16
- improve logging for doc conversion
2012-03-07 16:24:44 +00:00
Richard Alam
197e07e289
- remove logging as it's too much
2012-03-07 16:23:06 +00:00
Markos Calderon
64b27f2ebe
fix end meeting
2012-03-05 15:26:13 -08:00
Markos Calderon
cd584ba6ef
fix for end meeting
2012-02-23 16:18:40 -08:00
Markos Calderon
59071bcb52
fix for end meeting request
2012-02-16 12:51:57 -08: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
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
Markos Calderon
01a90feab5
improvement for generate thumbnails
2012-01-27 12:21:48 -08:00
Markos Calderon
f82633fc75
adding logs to pubsub updates
2012-01-11 13:31:45 -08:00
Markos Calderon
e4ed4b868a
fix end time when someone rejoins to a meeting
2012-01-11 13:17:09 -08: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
2ad5c4365b
fix to handle exceptions the updates of the API
2012-01-09 10:20:57 -08:00
gugat
1beac318f9
Meeting stays created infinitely when defaultMeetingCreateJoinDuration=0
...
Solves issue 1097
2011-12-18 11:46:09 -05:00
Markos Calderon
e84a27c51c
added config file for jedispool
2011-12-12 15:18:52 -08:00
Richard Alam
c5043a9f1d
- fix the name properly as there are 60000 millis in a minute
2011-10-24 22:07:18 +00: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
Marco Calderon
a5a2fd67e0
a try-catch for compability with the old recordings
2011-09-26 11:36:46 -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
261707478b
fixed recording time
2011-09-22 12:50:35 -05:00
Marco Calderon
c36951dca6
updated messaging module in bbb-apps
2011-09-08 12:11:34 -05:00
Marco Calderon
b80e4ea5a1
Added CDATA to getRecordings
2011-09-06 12:46:54 -05:00
Richard Alam
b9de9180eb
- remove interface dec to fix bbb-web build breakage
2011-09-02 09:56:45 -04:00
Marco Calderon
ff575071d9
fix metadata values
2011-09-01 19:46:29 -05:00
Marco Calderon
6e41cae223
some fixes in the api
2011-08-31 17:22:10 +00:00
Marco Calderon
5e457b71d1
initial backward compability for 0.71a
2011-08-23 02:46:37 +00:00