BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,038 Commits 13 Branches 260 Tags 1.1 GiB
142f9e447a
Commit Graph

209 Commits

Author SHA1 Message Date
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
Gustavo Salazar
9966c3fc61 fix url 2013-06-17 17:12:36 -05:00
Fred Dixon
37107430b7 Update API example to use setConfigXML, not setConfigXML.xml 2013-06-15 01:47:41 -07:00
Fred Dixon
f03e005d9a Minor cleanup on API examples 2013-06-08 12:39:44 -07:00
Fred Dixon
12f12b2af6 Renamed a parameter for clarity 2013-06-07 14:14:01 -07:00
Fred Dixon
bac46b09ef Slight refactoring of getJoinURLwithDynamicConfigXML() to make consistent with other functions in bbb_api.jsp 2013-05-26 11:09:13 -07: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
Fred Dixon
d98d334e17 Dynamic config.xml demo now uses getDefaultConfigXML ccall 2013-05-12 18:04:53 -07:00
Fred Dixon
d0325f033f Minor updates to API demos 2013-04-20 17:20:09 -07:00
Fred Dixon
b3a902e0bc Simplified the choices for layout in dynamic config.xml example 2013-04-17 18:05:31 -07:00
Fred Dixon
5a4cba9911 Minor updates to dynamic config.xml example (still needs a bit more work) 2013-04-17 16:57:32 -07:00
Gustavo Salazar
b4f5501832 fix values for layouts in demo12 2013-04-17 12:43:30 -05:00
Gustavo Salazar
c5d17a80f8 improve form in demo12 2013-04-16 16:40:25 -05:00
Gustavo Salazar
f3350e18c0 show length of recordings processed with 'presentation' scripts in demo10 2013-04-12 10:15:00 -05:00
Gustavo Salazar
9c590006c8 load jquery before jquery-ui 2013-04-12 10:13:06 -05:00
Jesus Federico
bc8c116077 Updated config.xml and removed hardcoded IP address 2013-04-05 12:07:00 -04:00
Jesus Federico
549600aab2 Adjusted bbb-api.jsp to support POST with different contentTypes 2013-04-05 00:06:50 -04:00
jfederico
079cfa25ee Fixed few errors on demo12.jsp 2013-04-04 11:43:26 -04:00
jfederico
f55abba128 Extended bbb-api.jsp to support dynamic configXML example 2013-04-03 18:32:23 -04:00
jfederico
8075760fae Added demo12.jsp for Dynamic ConfigXML demonstration 2013-04-03 17:41:02 -04:00
Fred Dixon
f59e34ed58 Updates to bbb_api.jsp to pass along redirectClient=true for joinURL to load demo11.html 2013-03-17 21:02:36 -04:00
Fred Dixon
ca78934f21 First pass at adding demo11.jsp and demo11.html which gives examples of using the new BigBlueButton JavaScript API 2013-03-17 20:38:49 -04:00
Markos Calderon
ba40fcca6b Updated license for bigbluebutton-client, bbb-video, and demo 2013-01-21 16:14:55 -05:00
Felipe Cecagno
dd00474a7d making the mconf-live demo page prettier 2013-01-09 17:10:42 -02:00
Felipe Cecagno
723f8113e6 setup properly the demo page icon to the Mconf logo, and changed the page title from MconfLive to Mconf-Live, to be consistent with the other parts of the product 2013-01-09 16:23:43 -02:00
Felipe Cecagno
8ff3cd57d8 creating a simple demo page for Mconf-Live 2013-01-09 16:11:12 -02: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
Hugo Lazzari
26c6030c79 Removed old guest code. 2012-09-26 13:32:28 -03: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
Prav-Hugo
8e29964f6a Feature #389 Creation of "guest" role on BigBlueButton 2012-09-12 12:35:06 -03:00
Markos Calderon
eb44c168c0 Update bbb-api-demo/src/main/webapp/bbb_api.jsp 2012-09-03 16:38:21 -05:00
Fred Dixon
f42a71742b Merge pull request #52 from jfederico/master 
Removed hardcoded url on demo_openid.jsp
 2012-08-01 12:22:02 -07:00
jfederico
55621fc9b3 Removed the hardcoded url on demo_openid.jsp 2012-08-01 13:48:21 -04:00
Fred Dixon
75264f4ca8 Reverted demo1.jsp back to original logic -- all users join as moderators 2012-07-31 14:05:34 -04:00
Richard Alam
405327d38d Merge branch 'modify-wb-toolbar' 2012-07-31 15:02:10 +00:00
Fred Dixon
55e5fd994d Added for openID demo 2c0a2a3104 2012-07-30 13:51:42 -04:00
jfederico
93efd7dafe Added demo_openid.jsp to join using OpenID on Google and Yahoo 
Signed-off-by: jfederico <jesus@123it.ca>
 2012-07-30 11:34:18 -04:00
Richard Alam
cbe0ee60cc - merge some new stuff 
Conflicts:
	bigbluebutton-web/.gitignore
 2012-07-29 16:06:39 +00:00
Fred Dixon
091a6855a8 Updated build.xml for client to copy layout.xml to /conf/layout.xml directory 2012-07-25 14:40:33 -04:00
Fred Dixon
ca500c12d3 Added API demo for login using BrowserID (Mozilla Persona) 2012-07-24 15:46:27 -04:00
Ajay Gopinath
27b2e5ad10 Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -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
782154bba9 Finished adding fill selection tool and transparency option tool. 2012-06-30 18:47:31 -04:00
Fred Dixon
9100074b8b Assigned a default blank password for mobile connection, as suggested by Felipe in http://code.google.com/p/bigbluebutton/issues/detail?id=1183 2012-06-03 21:21:09 -07:00
Markos Calderon
71cc44eac2 fix for issue 1221. However, need to double check which it's the best way to handle special characters 2012-05-17 15:12:42 -07:00
Markos Calderon
323a4f47c1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-03-29 13:30:36 -07:00
Markos Calderon
fb7f2235b3 removing some meeting information in the demos 2012-03-29 13:30:08 -07:00
Fred Dixon
24c00aeb8c Removed depreciated demo5.jsp (replaced with create.jsp) 2012-03-28 14:22:52 -04:00
Markos Calderon
c4d866419c change date format in getRecordings for bigbluebutton 0.8 2012-03-26 13:47:35 -07:00
Felipe Cecagno
0d15f7bf3c improved the response messages with specific error messages; when the mobile security key is empty, all the mobile requests will fail 2012-03-22 09:38:55 -03:00
Fred Dixon
82c61a7381 Moved banner image into API examples so it's visible when running from a development environment 2012-03-03 20:00:10 -05:00
Fred Dixon
2889856d77 Removed code to use default .pdf file for examples as BigBlueButton now has a server-wide default pdf file 2012-02-25 20:35:13 -05: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
80ebe82610 Added sorting of modification date to demo10.jsp 2011-11-21 09:20:31 -08:00
Fred Dixon
af5683857c Fixed incorrect path for demo4.jsp 2011-11-20 11:42:40 -08:00
Fred Dixon
b627af54fe Added demo4/jquery.min.js (older version) for demo4.jsp 2011-11-20 11:15:07 -08:00
Fred Dixon
a4b541bdd3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-11-20 06:35:15 -08:00
Fred Dixon
fc71c3c0eb Added more checks to bbb-record --watch to monitor the processing of a recording 2011-11-20 06:33:55 -08:00
Markos Calderon
67914cf1f4 fixed problem with demo10 2011-11-17 10:32:15 -08:00
Markos Calderon
cb497006f9 fixed demo10 to support paging 2011-11-15 13:01:30 -08:00
Richard Alam
cf7389e6e0 download js and css so that we don't depend on internet connection for demo to work 2011-11-08 14:45:57 -05:00
Fred Dixon
22c90a9ed4 Removed hard-coded URL from playback of slides 2011-10-07 13:27:48 -07:00
Fred Dixon
b81b5bcab1 removed formatter:lengthFormat from demo10.jsp to have length appear 2011-09-27 15:45:02 -07:00
Marco Calderon
bdfd10a86f added column length to demo10 2011-09-27 11:51:03 -05:00
Fred Dixon
a41e498beb added autofocus to demo input fields 2011-09-23 20:23:56 -07:00
Fred Dixon
a153d78198 Simplifed Matterhorn demo and added default slide 2011-09-23 20:23:25 -07:00
Fred Dixon
e0af72fdf4 Fixed path in create.jsp that was preventing the invite URL from working 2011-09-10 11:50:24 -07:00
Fred Dixon
1d9d646e36 Testing bbb-record-core with the latest version of Ruby. SystemTimer is not needed in 1.9.2 2011-09-05 12:37:34 -07:00
Fred Dixon
3ce3820e89 More cleanup for the API demos 2011-09-04 15:27:19 -07:00
Fred Dixon
510a27f0e2 Refactored demo8.jsp. Uploaded new sample presentatios for demo8.jsp 2011-09-04 11:30:53 -07:00
Fred Dixon
fe2deee871 Added a sample.pdf that will display by default in the Demo Meeting (thanks to the new upload extension to create) 2011-09-04 09:37:50 -07:00
Fred Dixon
adc0167fe0 Modified rewriting of BigBlueButtonURL in API demos to be correct 2011-09-04 08:40:19 -07:00
Fred Dixon
870878dc02 Fixed all internal refereces in API examples from /bigbluebutton/demo to /demo 2011-09-04 08:19:37 -07:00
Fred Dixon
94716609e2 Reformatting the headers for API demos 2011-09-04 07:29:26 -07:00
Fred Dixon
e825921c16 Fixed a typo on bbb_api.jsp that was causing isMeetingRunning to fail passing checksum 2011-09-04 07:21:08 -07:00
Fred Dixon
ba6853c9c8 Refactored bbb_api.jsp to be consistent and reduced number of calls (still a bit more work needed to do) 2011-09-03 11:32:32 -07:00
Fred Dixon
197decd0ad Aligned headings of demo10.jsp with navigation 2011-09-01 09:02:04 -07:00
Fred Dixon
fb33eb7dd1 Reworked logic for playbackFormat() in demo10.jsp to work on Chrome 2011-08-29 12:31:04 -07:00
Marco Calderon
39dd105780 demo10 modifications 2011-08-25 17:27:58 +00:00
Richard Alam
d9ca971b3e - add a PPT file into pre-upload demo 2011-08-24 18:13:26 +00:00
Richard Alam
d8fb1feb81 - save the meetingID too as the Title of the meeting for this demo 2011-08-19 15:07:13 -04:00
Fred Dixon
35825c29fe Updated to demo10.jsp (record and playback) to have ten demo rooms 2011-08-18 10:56:31 -07:00
Richard Alam
dda0226585 - include commons-httpclient into demo deps 2011-08-07 20:29:37 +00:00
Marco Calderon
5178b76d9e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-08 16:18:54 +00:00
Marco Calderon
a7e3dedd74 added validation to demo10 2011-08-08 16:18:25 +00:00
Richard Alam
d3403aa6f9 - move the mobile demo files into the demo package 2011-08-05 18:06:32 +00:00
Marco Calderon
d32110d36c api according to the latest spec 2011-06-30 02:33:12 +00:00
Richard Alam
138bc17d1c - load Demo*.pdf from new location 2011-07-15 14:06:56 -04:00
Richard Alam
060bb66f49 - move pre-uploaded demo pdfs into new dir 2011-07-15 14:05:56 -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
af70819578 finish demo recordings 2011-06-23 07:54:23 +00:00
Marco Calderon
f02f1efffe need to add actions publish, unpublish, delete to the demo10 2011-06-22 06:32:08 +00:00
Marco Calderon
9372282019 api demo10 2011-06-17 09:49:16 +00:00
Fred Dixon
12fdbfb7f0 removed bbb_api_conf.jsp as it will be auto generated from install scripts 2011-07-04 10:45:07 -07:00
Fred Dixon
898fa1a930 Add configuration for nginx for breaking out API demos into their own package 2011-07-03 12:17:58 -07:00
gugat
cba6fef830 Remove target folder 
Write steps to run bbb-api-demo in README
 2011-06-17 18:12:31 +00:00
gugat
26b2e2c5d9 Add commons io jar in build.gradle 
Change action in demo7 and demo8 forms, they where demo5 and demo6
 2011-06-17 18:01:37 +00:00
gugat
a74d8d03c5 Change joinUrl method 2011-06-17 07:33:06 +00:00
gugat
0d3d432062 All jsp files inside webapp 
Add version in build.gradle and war parameters
Add links to bbb-api-demo jsp in demo_header.jsp
Choose bbb_api.jsp from bbb-api-demo.
Add README, to post notes
 2011-06-16 00:54:53 +00:00
guga
84c2991b69 Delete README2 2011-06-15 20:30:51 +00:00
guga
edd68bd0f6 Another test 2011-06-15 20:28:09 +00:00
=
a0b8f23e07 Test: Delete README 2011-06-15 20:24:03 +00:00
=
54189c6156 Test:Add README 2011-06-15 20:21:55 +00:00
root
bd7d6a7471 Deleted .jar and .war ... should not be uploaded 2011-06-14 23:10:54 +00:00
root
d8458f968b Maven structure, dependencies in gradle 2011-06-14 22:50:34 +00:00
root
bf4b0d2bf0 Maven structure for bbb-api-demo. Copied jsp files from last bbb-api-demo and 
bigbluebutton-web in different folders. Both has repeated names for jsp.
 2011-05-26 10:17:59 +00:00
BigBlueButton
8b36ffa1ec Add demo6.jsp which uploads URL of three demo pdf files. 2011-05-20 13:35:02 +00:00
ysheng
485e09c068 Creating pre-upload demo 
Other demoes will be here in the future
 2011-05-13 20:03:36 +00:00