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

404 Commits

Author SHA1 Message Date
Anton Georgiev
7e3c2f6eb0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-ui-less 2014-12-15 20:11:49 +00:00
Richard Alam
1b4c4f5f5e - change logging for bbb-web to rollover at midnight and add date to the filename 2014-12-11 22:07:22 +00:00
Felipe Cecagno
12f7aacf4b Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
 2014-12-09 16:52:43 -02:00
Richard Alam
234a95902d - change api version to 0.9 from 0.81 2014-12-01 11:52:40 -08:00
Richard Alam
ce07751d79 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837 2014-11-28 14:24:28 -08:00
Felipe Cecagno
e9122a9637 Merge branch '090-download-presentation' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2014-11-23 23:02:22 -02:00
Felipe Cecagno
a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-config/web/default.pdf
 2014-11-22 20:28:39 -02:00
Lucas Zawacki
7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2014-11-14 15:33:17 -02:00
Pedro Beschorner Marin
2d3a941f70 Some cleanup 2014-11-03 15:45:39 -02:00
Pedro Beschorner Marin
2c5ff4f7cd Merging with mconf old branch 2014-11-03 14:12:47 -02:00
Richard Alam
5a83eab737 - return api version when url is http://<host>/bigbluebutton 2014-10-27 19:01:01 +00:00
Felipe Cecagno
0af623e9e7 Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-24 23:38:09 -02:00
Richard Alam
9effb009d0 - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
Richard Alam
5af452c39f - start implementing auto start recording 2014-10-20 03:39:44 -07:00
Richard Alam
9c0280c129 - fix txt uri for accessibility 2014-10-20 01:18:13 -07:00
Felipe Cecagno
3db4ead6e4 Merge branch '090-listen-only-by-default' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-15 00:22:27 -03:00
Felipe Cecagno
03b53eba21 cleanup 2014-10-14 22:08:40 -03:00
Pedro Beschorner Marin
831f890cd2 Merge remote-tracking branch 'bigbluebutton/master' 2014-10-13 12:06:38 -03:00
Richard Alam
0fb0e603ef - increase log file size and number of backups kept 2014-10-12 05:43:18 -07:00
Felipe Cecagno
59debc5d1e Merge branch '090-mconf-branding' into mconf-live0.6.1 2014-10-05 23:32:43 -03:00
Felipe Cecagno
5f2f2662af Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
 2014-10-05 22:00:28 -03:00
Felipe Cecagno
015d708d7c Merge branch 'mconf-branding-0.81' into 090-mconf-branding 
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"

Conflicts:
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/playback.html
 2014-10-05 19:36:43 -03:00
Pedro Beschorner Marin
8b1c735429 Merge remote-tracking branch 'bigbluebutton/master' 2014-09-15 16:16:31 -03:00
Richard Alam
38f77259f1 - return false when filter is applied 2014-09-14 09:06:11 -07:00
Pedro Beschorner Marin
54f9f2c12e Web config 2014-09-09 19:09:10 -03:00
Pedro Beschorner Marin
86ac2ad0ff Merge remote-tracking branch 'origin/master' 2014-09-05 11:07:29 -03:00
Felipe Cecagno
c2eed678d9 cleanup 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2014-09-04 15:02:16 -03:00
Anton Georgiev
cf125781db Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-09-02 17:54:14 +00:00
Pedro Beschorner Marin
ad5566b9a5 My web properties 2014-09-02 13:06:10 -03:00
Fred Dixon
93f6dcafab Upping version from 0.9.0-dev to 0.9.0-beta 2014-09-01 17:05:33 -04:00
Richard Alam
9075068f8e - allow a way to change log level externally from bigbluebutton.properties 2014-08-23 13:04:06 -07:00
Anton Georgiev
e9113f3d9f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2014-08-20 18:59:50 +00:00
Richard Alam
11b8fa711e - provide a way to support pre-built config.xml 2014-08-20 11:42:31 -07:00
Anton Georgiev
adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-08-20 15:24:25 +00:00
Fred Dixon
6f727b6acc Updated footer message in bigbluebutton.properties 2014-08-17 22:26:51 -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
Anton Georgiev
404ff72914 use high qulity png conversion for the slide, not just the thumbnail 2014-08-07 20:12:55 +00:00
Ghazi Triki
57d7a15b89 Reverted back API version to 0.81 with updates in outdate files 2014-07-31 18:53:24 +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
Richard Alam
283a3fa3eb - modify messages 2014-05-09 17:49:01 -07:00
Richard Alam
ca089d6af0 - minor cleanup 2014-05-05 18:35:01 +00:00
Richard Alam
1fd2933bfd - fix processing of png image 2014-05-01 20:56:34 +00:00
Richard Alam
51e489a143 - modify how we send and receive messages to/from redis 2014-04-30 21:45:53 +00:00
Richard Alam
75d908625c - setup messaging classes 2014-04-30 15:53:27 +00:00
Richard Alam
ef6ffa20df - make keep alive run on it's own thread 2014-04-28 22:00:48 +00:00
Richard Alam
c44f4c90a3 - wire up png converter 2014-04-19 09:23:06 -07:00
Richard Alam
bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2014-04-08 19:07:37 +00:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Fred Dixon
11b0d0eca7 Bumped footer message in chat to say 0.9.0-dev 2014-04-02 21:35:40 +00:00
Richard Alam
090cb4115b - fix issue where getMeetings and getRecordings calls just loops back resulting in StakOverflow 2014-04-02 16:17:24 +00:00
Fred Dixon
ff87e59e5c removed carriage returns from bigbluebutton.properties as it was causing errors with bbb-conf 2014-03-12 01:18:19 +00:00
Richard Alam
4c5739a43c - change path to pdf2swf 2014-03-10 15:14:34 +00:00
Richard Alam
db3686bd40 - fix compile error 
- fix url for slides
 2014-03-07 14:58:51 +00:00
Richard Alam
d15e8c3a5b - continue cleaning up presentation 2014-02-27 21:41:25 +00:00
Richard Alam
17cbcb2676 - remove datasource config 
- add bbb-web.log config
 2014-02-25 20:06:00 +00:00
Richard Alam
6cf30e9f07 - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
Richard Alam
5559a2b8cc Merge branch 'master' into merge-polling-with-master 
- there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-23 20:49:04 +00:00
Richard Alam
4b07e6d3ab Merge branch 'master' into html5-bridge-new-events 2014-01-06 13:20:35 -08:00
alexandrekreis
b6e3137596 refs #930 2013-11-28 11:16:52 -02:00
mohamed-ahmed
d35d00fd55 'all_slides' and move cursor events now working in new msg format 2013-11-18 19:36:27 +00:00
Fred Dixon
b12188fbed Changing lables for 0.81 2013-11-07 20:08:36 -05:00
Fred Dixon
149ea185f2 Updating version to 0.81-RC5 2013-10-30 14:47:16 -07:00
tylercopeland
499aba5f03 css style updates 2013-10-29 19:01:52 -04:00
Fred Dixon
ca56259457 Updating label to RC4 2013-10-20 15:47:12 -04:00
Fred Dixon
381ddbf3a9 Updated labels for 0.81-RC3 2013-10-09 14:05:55 -04:00
Richard Alam
5bb5f2000d Merge branch 'master' into new-polling-feature 2013-10-07 15:16:25 +00:00
Fred Dixon
6b7438e9f8 Updated wording of welcomeMessageFooter 2013-09-27 19:01:59 -04:00
mohamed-ahmed
ad86f142d4 merged Gary's newUI and fixed conflicts 2013-09-27 16:07:38 +00:00
Fred Dixon
a84c6ca8e8 Configuration updates for moving to 0.81-RC2 2013-09-26 16:42:27 -04:00
Gary Deng
fb8af3bdf7 implement html5 new interface 2013-09-24 06:13:09 -07:00
mohamed-ahmed
7a50b35873 added 'move_and_zoom' event to pubsub 2013-09-10 20:54:49 +00:00
Richard Alam
d402f7b333 Merge branch 'master' 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2013-09-09 18:42:21 +00:00
Nadia Noori
c2c344ed79 Changing lable to RC1 2013-09-04 14:24:19 -04:00
Felipe Cecagno
f8e63fd6f4 Merge branch 'master' into mconf-branding 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/ar_SY/bbbResources.properties
	bigbluebutton-client/locale/az_AZ/bbbResources.properties
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/ca_ES/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/da_DK/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/el_GR/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/eu_EU/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fi_FI/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/he_IL/bbbResources.properties
	bigbluebutton-client/locale/hr_HR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/id_ID/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ja_JP/bbbResources.properties
	bigbluebutton-client/locale/kk_KZ/bbbResources.properties
	bigbluebutton-client/locale/km_KH/bbbResources.properties
	bigbluebutton-client/locale/ko_KR/bbbResources.properties
	bigbluebutton-client/locale/lt_LT/bbbResources.properties
	bigbluebutton-client/locale/lv_LV/bbbResources.properties
	bigbluebutton-client/locale/mn_MN/bbbResources.properties
	bigbluebutton-client/locale/ne_NE/bbbResources.properties
	bigbluebutton-client/locale/nl_NL/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/pt_PT/bbbResources.properties
	bigbluebutton-client/locale/ro_RO/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/si_LK/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/sr_RS/bbbResources.properties
	bigbluebutton-client/locale/sv_SE/bbbResources.properties
	bigbluebutton-client/locale/th_TH/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/vi_VN/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/locale/zh_TW/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/lib/bbb_blinker.js
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	record-and-playback/presentation/playback/presentation/playback.html
 2013-08-26 21:26:44 -03:00
Jorge Nunez
5b1d62f5d2 Merge remote branch 'upstream/master' into html5-bridge 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2013-07-31 17:27:33 -07:00
Richard Alam
7d3e5afb5f - remove re-encoding of posted XML data as grails 1.3.9 doesn't unencode automatically the data 2013-07-10 19:14:25 +00:00
Markos Calderon
5a09b5a6d2 adding a response when server is down 2013-06-25 18:26:49 -05:00
Markos Calderon
78074528c8 BBB filter 2013-06-25 13:29:28 -05:00
Markos Calderon
f520bef467 mark bbb-apss down if server doesn't respond back 2013-06-24 17:33:39 -05:00
Fred Dixon
1c7d220edc Updated welcome message footer to 0.81-beta-2 2013-06-18 05:17:24 -07:00
Fred Dixon
70f26a27f2 Minor updates to welcome message 2013-06-16 07:19:32 -07:00
Richard Alam
e1879795e9 try to upgrade to grails 1.3.9 - Not starting properly though 2013-06-06 12:17:52 -07:00
Richard Alam
af0c56c131 updating api version to 0.81 2013-05-25 16:31:33 -03:00
Mohamed Ahmed
bf441450b0 modified ip and salt to that of my system 2013-05-23 11:54:23 -04:00
Richard Alam
be8befb243 Merge branch 'master' into html5-bridge 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
 2013-05-09 17:25:25 +00:00
Fred Dixon
abc074aaa1 Hide the network monitor and editing buttons for layouts module by defult 2013-04-16 19:23:20 -07:00
Markos Calderon
fca07405e0 fixing some configurations 2013-04-10 14:53:45 -05:00
Dale Karp
0813595c61 fixed merges 2013-04-10 17:23:40 +00:00
Richard Alam
8c157a3914 - handle setConfigXML 2013-03-21 17:14:13 +00:00
Richard Alam
0e386adab2 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-15 21:03:13 +00:00
jfederico
f56c4474e6 bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server. 2013-03-13 15:01:14 -04:00
Dale Karp
7f03043f78 updated local props file 2013-03-07 17:59:36 +00:00
Dale Karp
b1a14c98c6 commiting changes made to run env 2013-02-21 17:11:23 +00:00
Richard Alam
e6fe97db36 Merge branch 'master' into merge-master-into-dynamic-config 2013-02-07 18:53:01 +00:00
Markos Calderon
ba2da7004c Merge almost complete. Still red dot not working 2013-01-25 21:50:32 -05:00
Markos Calderon
f93d40adfe Added property for set max swf file size 2013-01-23 16:01:01 -05:00
Markos Calderon
983f93b0e4 Added license for bigbluebutton-web 2013-01-18 18:24:35 -05:00
Richard Alam
1f620583a2 - allow passing of configURL in create and join api calls 2012-12-09 00:23:33 +00:00
Richard Alam
7ea06bd512 - add defaultAvatarURL property 2012-12-04 19:09:03 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Markos Calderon
9e45420a4c load presentation in both sides html5 and flex 2012-10-20 14:18:39 -05:00
Felipe Cecagno
b0ae2252ea Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 
Reverted the default server URL on bbb-web
 2012-10-03 15:37:27 -03:00
Hugo Lazzari
f52117cb03 Add new page with forced favicon. 2012-10-03 10:54:56 -03:00
Richard Alam
0be1db0cc9 - fix merge edit problem 2012-08-17 14:42:30 +00:00
Chad Pilkey
cfd3446123 Merge remote branch 'upstream/master' 
Conflicts:
	README
	bigbluebutton-client/.gitignore
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2012-08-07 19:56:23 +00:00
Richard Alam
cbe0ee60cc - merge some new stuff 
Conflicts:
	bigbluebutton-web/.gitignore
 2012-07-29 16:06:39 +00:00
Chad Pilkey
17acf9c6df hooked up presentation text 2012-07-24 20:36:29 +00:00
Markos Calderon
3c7419c5ef load textfile from the client 2012-07-17 16:39:32 -07:00
Markos Calderon
3d0b3f9307 added extract text from presentations 2012-07-12 15:49:33 -07:00
Markos Calderon
9fed546de9 Initial changes for extract text 2012-07-11 15:37:31 -07:00
Ajay Gopinath
1f759c1466 Backup commit before resetting dev env 2012-06-27 18:28:01 -04:00
Richard Alam
5177a1737a - allow admin to turn off recording for whole server 2012-03-29 16:26:10 +00:00
Richard Alam
ea087125db - increase max pages for uploaded presentation 2012-03-08 17:21:35 +00:00
Fred Dixon
6bcb73e014 Set 
removeMeetingWhenEnded=true

as default in bigbluebutton.properties.  This will reduce errors with 3rd party integrations when users end a meeting, change a parameter, then try
start the meeting again.
 2012-01-19 21:21:19 -05:00
Fred Dixon
20d4587e3e Changed API welcome messages from 'use a headset to avoide echo' to 'you can mute yourself in the listeners window' (BigBlueButton 0.8 now uses Flash for acoustic echo cancellation) 2012-01-15 12:32:39 -05:00
Fred Dixon
bf254501f5 Changed bbb-web to using a rolling 20 days of logs 2012-01-15 12:31:14 -05:00
Fred Dixon
b66059168d increased the size of bbb-web.log to 25M and keep six rolling files (instead of three) 2012-01-15 12:05:21 -05:00
Richard Alam
9c8aeae213 - if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation 2012-01-10 16:25:46 +00:00
Richard Alam
180d1acc58 - Make defaultLogoutUrl not blank so that bbb-conf --check does not complain 2012-01-09 23:23:44 +00:00
Markos Calderon
e84a27c51c added config file for jedispool 2011-12-12 15:18:52 -08:00
Fred Dixon
f4bc50a179 Modified default welcome message to give a bit more help to first time users. 2011-09-04 15:48:51 -07:00
Richard Alam
daeb7fafc2 - bump api version to 0.8 2011-08-04 10:35:49 -04:00
Richard Alam
8ffc8c9bdc - hook-up expired meeting background proc 2011-07-23 16:53:34 -04:00
Richard Alam
8e983345b8 - add property to set timeout for allowing time between creating a meeting and joining a meeting 
- change default meeting expiration to 1 minute
 - trigger ingest and processing when the meeting is removed form memory instead of when the last
   user leaves the meeting
 2011-07-23 11:13:29 -04:00
Richard Alam
4d2e503214 - add param to remove the meeting right away from memory instead of letting 
it linger for about an hour (the value of the expire meeting).
 2011-07-19 16:03:36 -04:00
Richard Alam
46ea659796 - change default meeting duration to 0 (zero) which means no duration. This maintains 
compatibility with previous release allwoing the demo meeting to run infinitely (for
   example). 3rd-party apps must pass duration if they want to set it, especially if the
   meeting is being recorded.
 2011-07-19 15:27:18 -04:00
Fred Dixon
6f6cc70c6b Change set redisHost to 127.0.0.1 to match other config files 2011-07-10 10:23:01 -07:00
Richard Alam
8c8e009baa - unit test passing again 2011-06-23 14:04:00 -04:00
Richard Alam
0b6e59e8ab - add duration parameter on creat API. This allows us to set a limit on the meeting length 
to prevent continuously recording a meeting whe someone forgets to logout
 2011-06-21 14:16:37 -04:00
Marco Calderon
356c77b41f removed redisport and redishost properties 2011-03-07 06:15:02 +00:00
Richard Alam
8ba1e6484a Merge branch 'master' into ref-bbb-web-2 
Conflicts:
	bbb-video/.gitignore
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
 2011-06-16 14:49:57 -04:00
Richard Alam
a71b30af9c - cleanup, fix merge issues, connect to redis explicitly when subscribing to a channel 2011-06-16 10:46:59 -04:00
Richard Alam
2765a178ce - merging changes from Markos 
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/OfficeToPdfConversionSuccessFilter.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/SupportedDocumentFilter.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2011-06-16 09:28:14 -04:00
Richard Alam
120275071e - now DI works fine...had to delete bin and target dirs remnants from maven build 2011-06-15 17:28:31 -04:00
Richard Alam
58b51c9146 - remove spring integration....having problem with dependency injection 2011-06-15 16:57:06 -04:00
Marco Calderon
d022aafb61 Cleanup bigbluebutton-web and bigbluebutton-apps 2011-06-15 08:30:56 +00:00
Marco Calderon
04dff406e8 Merge branch 'ref-bbb-web-2' of github.com:bigbluebutton/bigbluebutton into ref-bbb-web-2 
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
 2011-06-14 01:47:32 +00:00
Marco Calderon
e858828162 added gson and publish updates in bbb-web, missing receiving code in bbb-apps 2011-06-14 01:43:55 +00:00
Richard Alam
769470e232 - remove jms messages 2011-06-10 15:29:11 -04:00
Marco Calderon
2ac6aaa09a merge remove-bbb-commons, working prototype, need to add status method to listener 2011-06-09 01:35:24 +00:00
Richard Alam
09e7475cd7 - point recorded status dir to the correct one 2011-06-03 11:19:53 -04:00
Richard Alam
134be90359 - handle incoming messages from bbb-apps 2011-06-01 17:58:55 -04:00
Richard Alam
78adae0696 - join and create api have unit tests 2011-05-31 15:23:44 -04:00
Richard Alam
c40976dab5 - generate default voice conf numbers if none has been passed in the param. 2011-05-31 10:05:09 -04:00
Richard Alam
26f98fe879 - write test for create api 2011-05-30 17:39:03 -04:00
Richard Alam
cfe20900f2 - now has setup for testing 2011-05-30 16:26:11 -04:00
Richard Alam
335fd9591d - start refactoring bbb-web again...without trying to merge remove-bbb-commons branch 2011-05-30 01:42:50 +00:00
Richard Alam
4748352a87 - remove bigbluebutton.properties override 2011-05-27 11:36:10 -04:00
Marco Calderon
5bbb607c5d Added redis pool, pubsub, and maven3 support to bbb-web 2011-05-17 11:04:40 +00:00
Marco Calderon
245070b366 removed bbb-commons. TODO: update process method and endrequest meeting 2011-05-14 05:56:35 +00:00
Marco Calderon
a9fcd56a88 refactoring bbb-apps 2011-05-11 02:09:10 +00:00
Richard Alam
e56ce0bd36 - have bbb-web write the recroding <meeting-id>.done file 2011-05-05 18:38:22 -04:00
Richard Alam
61ea9015e5 - set redis host and port in properties file 2011-05-04 11:14:35 -04:00
Marco Calderon
7c2498597b Added support pubsub for send updates from bbb-apps to bbb-web 2011-03-28 07:19:22 +00:00
Richard Alam
65d6e61890 - call the ruby scripts from bbb-web 2011-04-15 18:19:51 -04:00
Richard Alam
a1d983f204 - disable redis pubsub 2011-03-22 10:19:16 -04:00
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
Richard Alam
dda58fe6bb - put rec and playback required params in properties file 2011-02-15 10:41:15 -05:00
Richard Alam
d0184c8210 - cleaning up bbb-web 2011-01-19 11:09:50 -05:00
Marco Calderon
f37093d533 update demo filesfor support recording 2011-01-10 12:08:54 +00:00
Marco Calderon
78794d5952 Fix bigbluebutton-web for recording 2010-10-30 19:51:40 +00:00
Marco Calderon
d186288749 added record conference call to BBB API 2010-10-24 08:59:23 +00:00
BigBlueButton
333dd13d6b - fixed few issues and cleaned up 2010-07-19 20:23:28 +00:00
BigBlueButton
cad05a9ce1 - bbb-scheduling has been removed from bbb-web 2010-07-19 19:27:24 +00:00
BigBlueButton
1e6eff084b - Removed bbb-web scheduler 
- Merged the enter and signout function into the api controller
 2010-07-19 19:15:01 +00:00
Richard Alam
0e3286667b - change the api version to 0.7 2010-07-14 16:36:08 -04:00
Sebastian
b9a514199e fixed a patch in bigbluebutton.properties 2010-07-02 10:00:12 -04:00
Sebastian
3c8333f8c1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2010-06-30 15:21:22 -04:00
Sebastian
a35ac1d846 Updated bigbluebutton.properties 2010-06-30 15:20:02 -04:00
Richard Alam
1b2e7b1dc5 - merge in sebs changes 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2010-06-29 13:37:17 -04:00
Richard Alam
7042903b4b - remove loggedOutUrl value to easily easily maintain post-install script 2010-06-29 13:31:30 -04:00
Sebastian
552eb9edea removed the comment from bigbluebutton.properties and removed the link to redirect the server to www.bigbluebutton.org 2010-06-29 13:27:48 -04:00
Richard Alam
f62eb0ae68 - removing bootstrapping of old web interface 2010-06-22 15:46:57 -04:00
Jeremy Thomerson
34c802ef27 update issue 528 
add a version number to response if you call /bigbluebutton/api with no parameters.
this does not require a checksum since the checksum generation differs between certain versions

we still need to change the build process to update the version in bigbluebutton.properties for each built version
i'll leave this part to Fred.  I'd suggest using the following versioning process:
0.7-SNAPSHOT - for builds between releases
0.7-final - for release build versions

Owner: ffdixon
Status: Started



git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4322 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-14 17:40:17 +00:00
Jeremy Thomerson
be9314d6cf fixes issue #247 
automatically cleans out conferences that have either:
1 - been created, but not started in XX minutes
2 - or, started, and were ended at least XX minutes ago

you can set the number of XX minutes in bigbluebutton-web bigbluebutton.properties like: 
beans.dynamicConferenceService.minutesElapsedBeforeMeetingExpiration=60



git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4275 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-05-08 01:43:22 +00:00
Richard Alam
873a8c125b - fix so that we are checking logoutURL properly from properties file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4033 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-26 20:06:54 +00:00
Richard Alam
9871f9acfa - rename loggedOutUrl to logoutURL to be consistent with the API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4032 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-26 15:34:56 +00:00
Jeremy Thomerson
ac17421e6c work on end meeting API call (issue #394) 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3864 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-09 19:29:59 +00:00
Jeremy Thomerson
500604eb55 getMeetingInfo API call working 
now just need to add more information to it


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3796 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-03-04 23:59:02 +00:00
Richard Alam
947b79dc8c - add a way to configure a test conference room thru the API 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3683 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-08 19:11:05 +00:00
Richard Alam
3393f2b98a - setup a way to trigger a conversion process on the server. This way we'll be able to test and monitor 
if the conversion process works


git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3600 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-02-03 18:58:51 +00:00
Fred Dixon
900bca4ff9 Minor tweek on welcome message. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3464 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-24 02:18:26 +00:00
Fred Dixon
6f81c10801 updating welcome messag in bigbluebutton.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3462 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-24 00:54:41 +00:00
Fred Dixon
04a4428a88 Needed to add back picking up a configuration file from file:${userHome}/.grails/-config.properties so that we could setup the development environment on the VM without overwritting the existing bigbluebutton.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3450 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-23 01:19:57 +00:00
Richard Alam
451231e8df - remove space so easy to parse 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3434 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-22 19:44:06 +00:00
Richard Alam
0cf30e3dde - provide a way to enable/disable old scheduling mechanism 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3432 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-22 19:03:03 +00:00
Richard Alam
99c9822f9f - test to trigger build 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3364 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-19 22:10:45 +00:00
Richard Alam
8cdf4cd1dd - remove html tag in welcome message as chat will format it 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3340 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-19 18:10:36 +00:00
Fred Dixon
104ea65352 removing spaces around ' = ' bigbluebutton.properties ... tracking down a bug in the upgrade scripts 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3305 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-14 16:08:06 +00:00
Fred Dixon
c1dd1c4ee1 updates to draft welcome message in chat window 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3247 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-09 06:56:08 +00:00
Richard Alam
80e25349a1 - reformat welcome message 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3243 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-08 15:51:43 +00:00
Richard Alam
1c928d826e - provide a way to pass a welcome message that gets displayed on the chat when a participant joins the web conference 
- the message can be set on bigbluebutton.properties but is better to pass it on the create API as "welcome" variable

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3239 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 22:22:58 +00:00
Richard Alam
db5cc1c8f1 - setup fonts directory 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3237 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 19:41:03 +00:00
Richard Alam
25e2104eee - cleanup 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3232 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 17:41:03 +00:00
Richard Alam
a65559fa96 - fix logging when deployed to tomcat 
1. use our own log4j.properties file instead of having grails auto-generate one
 2. modify web.xml template to use spring's log4config listener instead of grail's one
 3. remove duplicate slf4j library
 4. leave log4j DSL in Config.groovy to enable logging when developing and running "grails run-war"
 5. log is written to /var/log/bigbluebutton/bbb-web.log

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3231 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-07 17:29:12 +00:00
Richard Alam
dcea25fe5d - fix AGI to query dynamic conference service if conference is not found from database. 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3199 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-04 16:22:53 +00:00
Richard Alam
aa565b4d5a - update doc 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3185 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-02 22:39:35 +00:00
Richard Alam
1727582cd8 - fix so that securitySalt can be set in the properties file 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3184 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-02 22:38:51 +00:00
Richard Alam
c018114366 - modify how thread get created on doc conversion 
- make max number of pages allowed to be configurable thru the properties file

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3182 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-02 18:57:30 +00:00