Commit Graph

519 Commits

Author SHA1 Message Date
Markos Calderon
3003280227 Added voicebridge and dialnumber to ExternalApiCalls 2013-02-22 15:37:59 -05: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
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
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
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
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
Markos Calderon
c878ff5d06 added redirect and clientURL parameters to the API 2012-09-21 16:03:53 -05: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
Richard Alam
a8e80c3a9c - make it compile 2012-07-16 19:03:12 +00:00
Ajay Gopinath
27b2e5ad10 Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04: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
715cb602c3 Finished text tool 'options'. 2012-07-09 16:43:03 -04:00
Ajay Gopinath
8715327475 Modified record event to include fill color. Need to finish text tool and presentation GUI. 2012-07-08 14:30:46 -04:00
Ajay Gopinath
a9fabf0028 Fixed duplication of GraphicObjects glitch when zooming and changing view modes. Added sprite transformation libraries but need to integrate with program. 2012-07-06 15:40:35 -04:00
Ajay Gopinath
b2e86495c6 Added selection tool and basic recognition of individual objects. Need to fix text tool and allow modification of individual objects. 2012-07-05 16:03:17 -04:00
Ajay Gopinath
938103972d Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches. 2012-07-04 12:28:29 -04:00
Ajay Gopinath
1f759c1466 Backup commit before resetting dev env 2012-06-27 18:28:01 -04: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
ea087125db - increase max pages for uploaded presentation 2012-03-08 17:21:35 +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
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