Commit Graph

214 Commits

Author SHA1 Message Date
Anton Georgiev
bd89c1c081 build: recover building bbb-demo 2022-03-18 20:41:27 +00:00
Anton Georgiev
9e6c078703 build: use tomcat9 not tomcat10 2022-03-14 20:38:31 +00:00
Anton Georgiev
4c7b780d25 build: tomcat8->10 for bbb-demo 2022-03-10 02:09:38 +00:00
Anton Georgiev
16ddf3d5e3 fix: bbb-demo, ship empty bbb_api_conf.jsp, populate in --setip 2022-03-04 17:21:38 +00:00
Anton Georgiev
d58b86cbe5 build and config: drop references to tomcat6 or 7 2022-02-27 02:56:27 +00:00
Maxim Khlobystov
b7cf670aec Remove the support for iframe postMessage API (recording and self-muting) 2021-11-29 22:53:12 +00:00
Chad Pilkey
7ff310f41f
Update restart command for tomcat7 2019-05-02 16:23:49 -04:00
Chad Pilkey
d3d967f607
Update the API demo README 2019-05-02 16:22:28 -04:00
Gustavo Trott
1f6eb3ada7 Add page to test open-in-native-app functionality 2019-02-01 14:28:40 -02:00
Anton Georgiev
452a12287b improve signal for audio join/leave when in iframe 2018-11-28 21:42:24 +00:00
Anton Georgiev
a216703cec avoid race condition when detecting user join from outside iframe 2018-11-21 13:46:13 +00:00
Anton Georgiev
d15305e352 comment out MYDOMAIN config lines and add description 2018-11-13 18:07:44 +00:00
Anton Georgiev
23e3034b70 add missing functions for toggling 2018-11-13 17:23:31 +00:00
Anton Georgiev
a0fc60ca93 remove unused css 2018-11-13 17:16:47 +00:00
Anton Georgiev
fea8c267cc improve on listeners for state outside iframe 2018-11-13 17:14:30 +00:00
Anton Georgiev
e3729a7bf3 better updates 2018-11-12 22:09:04 +00:00
Anton Georgiev
615fca3a48 add demo_iframe.jsp for #6215 2018-11-01 17:52:03 +00:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Anton Georgiev
c9371ccb85 adjusted html5 video chat to be recordable 2018-05-09 20:29:43 +00:00
Anton Georgiev
5f269ec6df work on making the html5 demos recordable 2018-05-09 14:35:14 +00:00
Anton Georgiev
e930372a74 add client type as parameter in bbb api 2018-04-24 22:53:49 +00:00
Anton Georgiev
2f35cb6f0c add jsp page for html5 login with meta -- init 2018-04-24 17:11:46 +00:00
Richard Alam
45478c81b5 - change mobile scheme is using https 2018-04-02 14:13:22 -07:00
Fred Dixon
098c7b8a20 Make moderator role default for HTML5 demo 2018-02-11 12:16:28 -06:00
Richard Alam
45a831fa4e - switch demo checksum to use sha256Hex 2017-12-11 11:09:09 -08:00
perroned
f094e6b283 Fixes typo on api demo page 2017-09-26 14:02:49 -04:00
Richard Alam
b7529f63ce - revert changes 2017-09-05 07:58:26 -07:00
Richard Alam
a1e4dae612 - fix format of recording xml 2017-09-05 07:53:52 -07:00
Anton Georgiev
108716e878 use mod and attendee passwords in createMeeting call 2017-07-26 09:36:14 -04:00
Anton Georgiev
a50d3d7895 demohtml5 create meeting unless existing 2017-06-19 14:01:43 -04:00
Anton Georgiev
8e16114c3f html5client login now redirect=true to url+sessionToken 2017-06-19 14:01:24 -04:00
Anton Georgiev
9bae75375b pass sessionToken to html5 client 2017-06-19 13:59:48 -04:00
Ghazi Triki
7d283cd154 Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x
# Conflicts:
#	bigbluebutton-client/resources/config.xml.template
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
#	record-and-playback/core/scripts/rap-process-worker.rb
2017-05-22 17:35:24 +01:00
Anton Georgiev
2f56719ec6 handle the case of loging in only passing username 2017-05-11 16:29:23 -04:00
Richard Alam
69cc522473 Merge branch 'bbb-2.x-dev-mconf' into bbb-2x-mconf 2017-05-04 15:57:42 -07:00
Fred Dixon
ac1eb0d3e7 Update demo1.jsp
testing package updates
2017-05-04 17:44:12 -04:00
Richard Alam
23e6dea35b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-05-04 14:39:02 -07:00
Fred Dixon
36f2f238cd Update demo1.jsp
testing build server
2017-05-04 17:35:53 -04:00
Chad Pilkey
e6f316f247 Fix a missing bracket in mobile demo 2017-05-02 16:27:37 -04:00
Chad Pilkey
b4ed366913 update mobile demo to support https 2017-05-02 16:14:15 -04: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
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Anton Georgiev
b216c15db9 in activity monitor show meetingName even for breakout rooms 2017-02-09 16:11:56 -05:00
Anton Georgiev
e33d8bd0f1 make meetingname field required 2017-01-16 14:56:49 -05:00
Anton Georgiev
b34532c2f2 add parameter to join as moderator 2017-01-16 14:30:53 -05:00
Anton Georgiev
b0a4647407 addition to pr 3564 2017-01-16 12:08:02 -05:00
Anton Georgiev
1911c4a62c add a pre-filled meetingname field in html5 demo page 2017-01-13 16:56:33 -05:00
Fred Dixon
d480e187ae Monior formatting update to demoHTML5.jsp 2017-01-10 16:38:01 -06:00
Fred Dixon
ac3437d3d6 Updating API demos for 1.1-beta -- removing older demos no longer used 2017-01-05 18:00:50 -06:00
jfederico
a43ae327d0 bbb-demo: Fix for issue on demo12 (configXML). Join doesnt work when using http 2016-07-24 12:27:14 -04:00