Commit Graph

34 Commits

Author SHA1 Message Date
Anton Georgiev
7b8b45daa8 refactor: further cleanup of bbb-demo 2022-07-14 14:55:10 +00:00
Anton Georgiev
86ab8269af chore: drop bbb-lti* from .gitignore 2022-02-28 20:36:11 +00:00
Anton Georgiev
0b87b13f86 build: add +x to scripts pulling external dependencies
Make is less noisy for local building of dependencies like freeswitch
by storing the executable flag for the scripts
and not listing the resulting packages in artifacts/
2022-02-27 17:12:03 +00:00
Ghazi Triki
a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
#	bigbluebutton-client/branding/default/style/css/V2Theme.css
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
#	bigbluebutton-html5/private/config/development/server/log.yaml
2018-01-23 12:27:42 +01:00
prlanzarin
b3566755ef Removed *sw* entry from .gitignore 2018-01-04 20:26:10 +00:00
prlanzarin
02a46387e0 Filter out html5 cameras from flash client 2017-12-22 19:25:25 +00:00
Anton Georgiev
d6a7e04715 avoid null items in presenter pod dropdown 2017-11-01 11:18:57 -04:00
Anton Georgiev
e8e9e3aad0 ignore IntelliJ (IDEA,etc) config files 2017-02-09 17:39:01 -05:00
Richard Alam
d0ec3b7a05 Merge pull request #3063 from riadvice/gradlefx
Gradlefx for the Flex 4 client
2016-03-24 15:44:38 -04:00
Ghaz Triki
4905b188be Updated .gitignore by adding the Flex 4 client generated GradleFx directories. 2016-03-24 20:00:52 +01: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
jfederico
c40f499b94 bigbluebutton-web: Closed DirectoryStream after the directory is processed 2016-02-08 16:48:40 -05:00
jfederico
9941668094 Updated .gitignore and removed config files specific for eclipse from bigbluebutton-web 2016-01-28 12:05:13 -05:00
Ghazi Triki
d5c203dab6 Added akka application packaging cache to the ignored files. 2016-01-27 12:28:10 +01:00
Ghazi Triki
1ac5a308b5 Improve .gitignore files with better patterns. 2015-07-09 16:13:09 +01:00
Anton Georgiev
678e9955bd ignore logs 2015-06-16 16:03:49 +00:00
Anton Georgiev
26176c9830 ignore logs 2015-06-16 15:59:31 +00:00
Richard Alam
e3cb7f3368 - remove .gitignore from ignored files as it ignores .gitignore files in children dirs 2013-09-20 19:47:49 +00:00
jtrobinson
872a9c3b14 Volume slider always visible, part of tab order, does not trigger resizing bug 2013-08-02 11:53:11 -07:00
Richard Alam
37cd29249b add back Flex project files 2013-01-05 13:29:03 -08:00
Jesus Federico
549600aab2 Adjusted bbb-api.jsp to support POST with different contentTypes 2013-04-05 00:06:50 -04:00
jfederico
a0df920587 bbb-lti(v0.1.1): Added new vie for extended interface 2013-01-24 15:52:06 -05:00
Markos Calderon
983f93b0e4 Added license for bigbluebutton-web 2013-01-18 18:24:35 -05:00
Markos Calderon
b88fda975e deleting wrong files 2012-08-06 11:36:15 -05:00
Ajay Gopinath
27b2e5ad10 Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04:00
Ajay Gopinath
16a4c2ded3 Fixed issue of zooming without TextToolbar. Fixed flicker with TextToolbar when changing values. 2012-07-15 03:37:46 -04:00
Localization Server
74cfd9153f Updating locale 2011-05-25 14:37:34 +00: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
@deniszgonjanin
941882409e Added optional warning suppresion for locale version check 2011-01-29 01:33:59 -05:00
deniszgonjanin
aafb098700 Minor changes to the playback client to show the BBB logo at the start 2011-01-25 02:55:29 +00:00
deniszgonjanin
5f74073965 Playback for slides and audio, for xml events. 2011-01-20 08:22:46 +00:00
@deniszgonjanin
79563801b3 Decoupled sending from recording of chat messages 2010-12-15 18:18:37 +00:00
Marco Calderon
828d1766d6 Support for record directly in files 2010-10-04 23:23:26 +00:00
Richard Alam
599f535c01 adding .gitignore on the main folder 2010-06-04 16:56:53 -04:00