BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,313 Commits 13 Branches 260 Tags 1.1 GiB
47eb51fdb7
Commit Graph

65 Commits

Author SHA1 Message Date
Bohdan Zhemelinskyi
d9dc567da3 tomcat embedded version in one place 2022-04-04 20:25:57 +00:00
Bohdan Zhemelinskyi
fbf33ba298 upgrade embedded tomcat 2022-04-04 18:44:42 +00:00
Anton Georgiev
2cc29ebacb fix: bbb-web exclude micronaut-aop-3.0.3.jar 2022-03-17 09:10:45 +00:00
Bohdan Zhemelinskyi
cb716b005b modified common-message for java 11 2022-03-16 17:45:11 +00:00
Anton Georgiev
4e268dffa3 WIP target JVM8 -> JVM11 2022-02-25 04:39:48 +00:00
root
de232a3f34 upgrading bigbluebutton-web 2021-12-17 12:39:03 +00:00
paultrudel
1cdfbbd08a updated validation for bbb-web api create/join 2021-06-23 11:17:35 -04:00
Richard Alam
eb09e75fe5 Add new maven repos 
Running build.sh was failing because it cannot resolve some dependencies off of https://repo.grails.org/grails/core repo.
 Added other repos to use as location of dependencies.
 2021-06-08 15:52:37 +00:00
Gustavo Trott
a69baba177 Removes jodconverter from project dependencies 2021-03-24 15:00:05 -03:00
Mitsutaka Sato
e5349d9b27 Fix XML(Formula) Injection 2020-05-19 08:56:00 +12:00
Ghazi Triki
64d08d69c7 Updated java projects dependencies versions. 2020-02-28 10:44:28 +01:00
Richard Alam
c92bfbb591 - deploy recording scripts in proper location 
- log upload captions params
 2019-06-04 14:07:10 -04:00
Ghazi Triki
a11ce7732e Implemented unit tests for create API. 2019-01-21 21:58:16 +01:00
Ghazi Triki
8a985e8785 Implemented the first unit test for API version. 2019-01-17 18:29:44 +01:00
Ghazi Triki
4a4edd0ca6 Update bigbluebutton-web to gradle 5.1 (Work In Progress) 2019-01-09 21:06:09 +01:00
Ghazi Triki
fbd1d631d6 Move redis communication classes from red5 applications to bbb-apps-common project. 2018-11-21 10:55:06 -02:00
Ghazi Triki
21cb59487c Move RedisStorageService from bigbluebutton-web to bbb-common-message and replace jedis with lettuce-core. 2018-11-06 18:54:27 +01:00
Ghazi Triki
2820178b83 Updated JVM projects dependencies and configuration. 2018-08-05 22:37:11 +01:00
Anton Georgiev
f8087e0af3 store, check, exprire upload authz tokens in bbb-web 2017-09-13 10:39:28 -04:00
Richard Alam
9a628da93d - remove bbb-commons-message dependency 2017-05-10 17:21:55 -07:00
Richard Alam
76a6d99ca3 - move java classes from bbb-web into bbb-common-web 2017-05-10 13:22:50 -07:00
Richard Alam
e89c832c8a Merge branch 'master' into bbb-2x-mconf 2017-04-25 07:40:30 -07:00
Ghazi Triki
106dbb3275 Clean dependencies for bigbluebutton-web. 2017-04-18 17:16:57 +01:00
Richard Alam
b8de0c9231 - add authorized role to registered user 2017-04-17 21:23:17 +00:00
Richard Alam
b3787c411e - remove control chars from meeting name param on create api request 
- return an error if external meeting id contains comma (,) on create api request
 2017-03-16 20:34:44 +00:00
Richard Alam
adffa8d673 - build getMeetings and getMeetingInfo responses using freemarker 2017-03-09 20:32:14 +00:00
Ghazi Triki
dfbf8c8c0a Avoid converting some pptx files with certain properties and inform the user. 2017-01-30 19:50:10 +01:00
Ghazi Triki
b10237ebad Upgrade commons-codec dependency version to 1.10 2016-10-05 17:29:37 +01:00
Ghazi Triki
87b4b8ca07 Update nuprocess version to 1.1.0 2016-09-28 17:40:10 +01:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
Richard Alam
433f09f72d Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB 
Conflicts:
	bbb-common-message/build.sbt
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 15:40:50 +00:00
maxdoumit
e00ca4f184 Update build.gradle 
Change the build.gradle to make is work with gradle 2.12
 2016-04-28 14:38:06 -05:00
David Feng
67c14f9056 This enable avatar to be display in other participants video window 2016-04-20 14:08:13 +08:00
Richard Alam
7d5c9d63e4 Upgrade to Java 8 
Upgrade to Java 8 and merge screenshare feature.

Conflicts:
	bigbluebutton-client/.actionScriptProperties
 2016-03-21 20:19:48 +00:00
Richard Alam
7fe44355d4 Merging breakout rooms with the master branch 
Merge breakout rooms feature with master branch. This
 also includes closed captioning feature.

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-03-21 17:52:23 +00:00
Ghazi Triki
62a721b310 Update gson library version to 2.5 for all server projects. 2016-01-27 16:44:22 +01:00
Pedro Beschorner Marin
6307b47ba8 Creating getRecordings XML response with FreeMarker 2016-01-26 18:59:36 +00:00
Richard Alam
16499b3da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-fsesl/build.sbt
	bigbluebutton-web/build.gradle
 2016-01-07 22:58:04 +00:00
Ghazi Triki
ce31bdd369 Pdf2SwfPageConverter is now using NuProcess library instead of the native Java Process. 2015-11-24 16:47:24 +01:00
Ghazi Triki
3c6586749f Updated gson library dependency to version 2.4 2015-11-18 14:35:32 -02:00
Richard Alam
9d04103225 - start implementing create breakout room 2015-10-21 15:47:49 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Richard Alam
9effb009d0 - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
Richard Alam
adce0d1f63 - changing dependecies seems to have broken the build 2014-07-30 13:19:03 -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
8d0ad3ce19 - see if builds get triggered 2014-05-11 13:08:05 -07:00
Richard Alam
90d5c2ac79 - remote log jars to fix compile issue 2014-05-11 12:31:29 -07:00
Richard Alam
283a3fa3eb - modify messages 2014-05-09 17:49:01 -07:00
Richard Alam
6cf30e9f07 - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00