Ghaz Triki
3f89ff28d9
Merge branch 'master' into breakout-rooms-porto-algre-2015
2016-03-02 11:23:38 +01: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
Fred Dixon
39c397b05a
Update API demos to work with https
2016-02-28 13:59:45 -05:00
Pedro Beschorner Marin
ca5f974bde
Added missing div to fix WebRTC audio for JavaScript API demo
2016-02-26 18:27:42 +00:00
Ghazi Triki
3d94afdd19
bbb demo joins the conference as no breakout room
2016-02-02 08:46:50 +01:00
Fred Dixon
941caa06d5
Update demo_footer.jsp
2016-01-25 07:45:18 -05:00
Fred Dixon
aece25f2e8
Update create.jsp
...
Removed test code in create API example.
2015-12-10 20:03:06 -05:00
Fred Dixon
eaa0de2e10
Escaped username string displayed to prevent JavaScript injection. Fixes #2913
2015-12-10 15:54:36 -05:00
Richard Alam
9260705ab9
- add js lib that parses chat messages and converts urls (fixes issue 2692)
2015-10-06 18:58:54 +00:00
maxdoumit
d9c3f50f47
fix demo12.jsp when camera is disabled
...
The following code was returning a null pointer
Element videodockModule = getElementWithAttribute(firstChild, "name", "VideodockModule");
Removing the lines solves the issue and does not load the videodockModule. This issue could have been introduced with a change to the xml client file.
This closes #2713
2015-10-05 00:52:42 -04:00
Anton Georgiev
79c419a790
url is adjusted to the new format for passing the params
2015-03-02 23:36:19 +00:00
Anton Georgiev
e4aa3fe6bd
bbb demo redirects to /html5client instead of to :3000
2015-03-02 21:13:40 +00:00
Fred Dixon
e455c0e063
Update demo10_helper.jsp
...
Fixed typo for English 106.
2015-02-21 15:46:50 -07:00
Anton Georgiev
c66aaba03e
added link to html5client demo. Rm meetingName box
2015-02-19 19:03:53 +00:00
Anton Georgiev
d5c5fc6272
added a BBB demo for accessing the HTML5 client. It should substitute the demos app
2015-02-19 17:29:57 +00:00
Richard Alam
68291cfa47
- wrong key name
2015-01-08 19:31:51 +00:00
Richard Alam
e4793933e5
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1849
2015-01-08 19:29:27 +00:00
Chad Pilkey
a7c4e6fd43
updated the mobile demo to work with the upcoming BBB AIR Mobile app
2014-11-11 11:32:19 -08:00
Richard Alam
cb981c14f7
- fix https://code.google.com/p/bigbluebutton/issues/detail?id=1804
2014-10-24 21:30:43 +00:00
Fred Dixon
9e87ffa02a
Added libraries to make audio work with demo11.jsp (javascript API demo)
2014-09-21 19:01:58 -04:00
Fred Dixon
4cb03c708d
Added example of moderator-only welcome message
2014-08-21 20:48:41 -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
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
firstuser
e36170f2a0
- update build to gradle 1.10
2014-03-29 13:39:03 -07:00
Francois Marier
dbb5a81c11
Fix Persona URLs
...
The old browserid.org URLs are deprecated and will stop working at some point.
2013-11-11 19:40:57 -08:00
Fred Dixon
a84c6ca8e8
Configuration updates for moving to 0.81-RC2
2013-09-26 16:42:27 -04:00
firstuser
e48874637e
Change the GetRecording for demo 10
2013-08-30 16:41:45 -07: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
