BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,215 Commits 13 Branches 260 Tags 1.1 GiB
cb2597229b
Commit Graph

94 Commits

Author SHA1 Message Date
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
Richard Alam
d8ae699a36 - update gradle build 2013-09-27 17:43:32 +00:00
Markos Calderon
e84a27c51c added config file for jedispool 2011-12-12 15:18:52 -08:00
Richard Alam
28a8db58a3 - remove FLAT_REPO as we don't need it anymore. 2011-08-17 20:17:57 +00:00
Marco Calderon
625d54e86c getRecordings call... Need to show metadata values 2011-03-08 09:44:31 +00:00
Marco Calderon
d022aafb61 Cleanup bigbluebutton-web and bigbluebutton-apps 2011-06-15 08:30:56 +00:00
Richard Alam
ad9a4895b8 - cleanup jars 2011-05-28 17:57:09 +00:00
Richard Alam
d1e2af2f38 - add eclipse plugin 2011-02-15 11:43:17 -05:00
Richard Alam
7fa4f4bbe8 - rename copyToLib to resolveDeps to be consistent with bbb-apps 2011-02-15 11:00:56 -05:00
Marco Calderon
ea10e4bb7c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 
Conflicts:
	.gitignore
	bigbluebutton-web/application.properties
 2011-01-03 19:15:11 +00:00
Ubuntu
f255ba5e2b Changed bigbluebutton-web/build.gradle to reference Env. Var. for local repo 2011-01-31 18:51:01 +00:00
Richard Alam
272e46e38d - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05:00
Richard Alam
ec256e7cb7 - upgrading versions from 0.64 to 0.7 2010-07-13 09:42:13 -04:00
Richard Alam
fb167bc7b2 - change repo dir to /home/firstuser/dev/repo 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4077 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-31 14:38:59 +00:00
Richard Alam
4807c2f7f5 - modify local repo to /opt/bigbluebutton/repo so it's more generic and match with Hudson 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3782 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 17:16:28 +00:00
Richard Alam
300eafa9d5 - add build.gradle to setup local repo as well as drag in bbb-common-message lib 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3779 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 16:32:52 +00:00