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

672 Commits

Author SHA1 Message Date
Richard Alam
d61129927e Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-14 13:55:18 -08:00
Anton Georgiev
8f1dfe55f5 switch version to 2.0-beta 2017-11-01 16:02:14 -04:00
Anton Georgiev
05a31d53c1 add portal with html5 AND Flash entry point 2017-11-01 15:50:33 -04:00
Richard Alam
72a1745c65 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-10-31 14:58:36 -07:00
Fred Dixon
1f43daeab0 Remove old reference to libreoffice.service 2017-10-28 09:48:20 -04:00
Richard Alam
5628ee9004 Merge pull request #4448 from ritzalam/implement-multi-chat 
Development for the next release
 2017-10-03 13:41:02 -04:00
Fred Dixon
798520daa9 Update bigbluebutton-release 2017-10-02 13:45:26 -04:00
Fred Dixon
67aec4e814 Testing builds after the switch to v2.0.x-release 2017-09-29 13:10:05 -04:00
Fred Dixon
ead8f766e7 Fixed spelling mistake 2017-09-25 22:25:19 -04:00
Fred Dixon
4a9b6ec8fd Merge pull request #4379 from ritzalam/fix-xss 
fix passive xss
 2017-09-12 13:01:09 -04:00
Fred Dixon
daf67c2f00 Update bigbluebutton-release 2017-09-11 21:03:19 -04:00
Richard Alam
9e906bd671 - fix passive xss 2017-09-11 14:38:09 -07:00
Fred Dixon
97148ac99b Added home.html to redirect to bigbluebutton.org when user clicks lower left text 2017-08-21 12:58:58 -05:00
Fred Dixon
85ced4b153 Minor updates for CentOS (nc does not have -z option on CentOS 7.3) 2017-08-17 10:55:05 -05:00
Fred Dixon
1af38493e4 Minor updates for detecting CentOS installation 2017-08-15 17:57:40 -05:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Matthew Marangoni
4b8704ad08 Merge remote-tracking branch 'upstream/master' into call-manager 2017-07-25 08:44:45 -07:00
Fred Dixon
ff365120cc Update index.html 
Bump version to 2.0-dev
 2017-07-25 07:23:26 -06:00
Srikar Kashyap Pulipaka
09b16f2e61 grammatical error 2017-07-23 11:41:49 +05:30
Richard Alam
810a027907 Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge 2017-07-17 18:49:58 -07:00
Fred Dixon
b106302aa3 Updated screenshareRtmpServer in screenshareRtmpServer 2017-07-14 09:45:21 -05:00
Fred Dixon
11f6945905 Updated screenshareRtmpServer in screenshareRtmpServer 2017-07-14 09:43:34 -05:00
Fred Dixon
9104d440f7 Update screenshareConfSuffix when doing bbb-conf --setip 2017-07-14 09:33:30 -05:00
Fred Dixon
17212d93ff Update bigbluebutton-release 2017-07-14 10:14:06 -04:00
Pedro Beschorner Marin
2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.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/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-07-11 20:41:38 +00:00
Klaus
0c596c304d Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis 2017-06-20 14:16:16 -03:00
Pedro Beschorner Marin
15c6420e97 Merge tag 'v1.1.0' into 1.1-transcode 
tagging v1.1.0 release

 Conflicts:
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bbb-web-api/src/main/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-06-13 17:44:12 +00:00
Pedro Beschorner Marin
555c7e351f Merge remote-tracking branch 'mconf-akka-transcoding' into merging-into-bbb-1.1 
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/H263Converter.java
	bigbluebutton-config/bin/bbb-conf
 2017-06-07 18:18:54 -03:00
Fred Dixon
66aa72e1e7 Improved the detection if IP addresses in bbb-conf 2017-05-23 10:29:16 -05: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
Fred Dixon
eabfd7e862 Bump version number to 1.1.0 2017-05-22 10:23:55 -05:00
Mario Gasparoni
89e6aaba35 Add bbb-transcode-akka to bigbluebutton-config 2017-05-18 14:19:24 +00:00
Richard Alam
69cc522473 Merge branch 'bbb-2.x-dev-mconf' into bbb-2x-mconf 2017-05-04 15:57:42 -07: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
f0728393ac Update bbb-conf 2017-05-04 17:34:12 -04:00
Fred Dixon
b061996e44 Update bbb-conf 
test-commit
 2017-05-04 17:31:58 -04:00
Fred Dixon
401f46c5c6 Update bbb-conf 2017-05-04 16:41:35 -04:00
Fred Dixon
ef8fdccd4f Updated comment in crontab job 2017-05-04 05:04:25 -04:00
Fred Dixon
b26ac2b6bc Remove refs to ghostscript 2017-05-04 03:57:43 -05:00
Pedro Beschorner Marin
66a12c9c7a Moving the meeting life cycle management from bbb-web to akka-apps 2017-05-03 17:02:16 +00:00
Richard Alam
c733f4eafc Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-2.x-dev-mconf 2017-04-27 14:52:47 -07:00
Fred Dixon
6daedbfc7b Update version to 1.1-RC 2017-04-27 10:45:49 -05:00
Fred Dixon
766b78df74 Improved detection for IP address on new ethernet card names 2017-04-26 17:17:30 -05:00
Richard Alam
262c7250c8 Merge branch 'master' with bbb-mconf 2017-04-17 15:57:31 +00:00
Fred Dixon
52a74d0063 Fixed output of free memory + minor code cleanup 2017-04-08 17:41:20 -05:00
Richard Alam
c73739636a Merge branch 'merging-into-bbb-1.1' of https://github.com/mconf/bigbluebutton into merge-mconf 2017-04-06 17:01:58 +00: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
Fred Dixon
c22d44530a Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777 2017-04-04 09:05:19 -05:00
Pedro Beschorner Marin
84fd8d4101 Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images! 2017-04-03 17:06:16 +00:00
Pedro Beschorner Marin
aa8e5045f7 Removed old FreeSWITCH paths that we added in the beggining of version 1.6 testing 2017-03-31 13:57:22 +00:00