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

12579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
bb330487e5 - updatting ffmpeg jars to javacv 1.2 release 2016-06-02 20:56:52 +00:00
Fred Dixon
6bf6e89b76 Merge pull request #3155 from bigbluebutton/ffdixon-remove-deskshare-config-xml 
Remove XML block for older deskshare module
 2016-05-29 21:58:08 -04:00
Fred Dixon
cd1779afbe Remove XML block for older deskshare module 2016-05-29 21:58:00 -04:00
Fred Dixon
84d9c5a5b5 Merge pull request #3154 from ffdixon/comment-deskshare 
Commented out Deskshare in config.xml.template
 2016-05-28 16:04:00 -04:00
Fred Dixon
098cb8e560 Commented out Deskshare in config.xml.template 2016-05-28 16:03:37 -04:00
Fred Dixon
d119be85de Merge pull request #3153 from ffdixon/bump-1-1 
Updated releaes environment variable to 1.1.0-dev
 2016-05-28 15:59:24 -04:00
Fred Dixon
3500aa2303 Updated releaes environment variable to 1.1.0-dev 2016-05-28 15:50:57 -04:00
Fred Dixon
9d8d0fcff1 Merge pull request #3152 from bigbluebutton/ffdixon-bump-1.1-dev 
Bump version on index.html page to 1.1-dev
 2016-05-28 13:03:34 -04:00
Fred Dixon
bd9124d286 Bump version on index.html page to 1.1-dev 2016-05-28 13:03:26 -04:00
Richard Alam
2b771ba218 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2016-05-16 23:01:25 -04:00
Richard Alam
6233105f69 Merge pull request #3150 from perroned/join-components-with-skeleton 
Adds deskshare video to html5 client
 2016-05-27 21:45:53 -04:00
perroned
c8fdf66099 Lints 2016-05-27 16:34:03 +00:00
perroned
393b49fdbe Cleans up duplicate code 2016-05-27 16:17:16 +00:00
perroned
8fc4c98090 Fixes race condition while loading verto libs 2016-05-26 20:46:11 +00:00
perroned
2f9afaa8d6 Uses same name for voiceBridge where possible 2016-05-26 20:25:55 +00:00
perroned
2145cc0d1e Stops fucntion that broke video viewing on html5 2016-05-26 20:25:27 +00:00
perroned
ac60620ac9 Makes WebRTC call when data changes 2016-05-26 20:03:45 +00:00
perroned
b8ae3a5304 Fixes some imports 2016-05-26 20:01:49 +00:00
perroned
53fdb67652 Loads jquery json lib 2016-05-26 19:58:30 +00:00
perroned
c1adc40315 Fix library loading callback 2016-05-26 19:57:44 +00:00
perroned
d57fc2ed44 Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 2016-05-24 14:02:25 +00:00
Anton Georgiev
b24c5b4631 Merge pull request #3145 from oswaldoacauan/feature-actionsbar 
HTML5 - New Button component, basic styles and file structure
 2016-05-20 17:29:44 -04:00
Richard Alam
7125f4534d Merge branch 'antobinary-merge-webrtc-ds' 2016-05-20 20:28:43 +00: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
Oswaldo Acauan
99e2dee4d1 Merge branch 'master' into feature-actionsbar 
* master: (44 commits)
  - publish bbb commons messages to local by default
  bbb-web: Verified that all error messages from join are displayed in html
  bbb-web: Adjustments for the new error management - Removed old error managment from join - Refactored method respondWitErrors so it may responde with html or xml - Added validation for ignoring masUsers filter if maxUsers=0
  bbb-web: Fix for race condition that causes the maxParticipants filter to fail (registeredUser now tracks the timestamp instead of Date)
  bbb-config: index.html is now able to handle error messages when used as the default logoutURL
  bbb-web: Fix for race condition that causes the maxParticipants filter to fail (changed the format to error parameter)
  bbb-web: Fix for race condition that causes the maxParticipants filter to fail (implemented cleaner)
  Added blank pages to defaut.pdf for whiteboard
  Move from 1.0-RC to 1.0
  bbb-web: Fix for race condition that causes the maxParticipants filter to fail (tracking the joins)
  - add Occitan locale
  - fix offending locale that breaks build
  Update locales
  bbb-web: Implemented maxUsers/maxParticipants filter in Join
  fix shortcut key inconsistencies
  fix issue #3088
  Fix for issue #3110
  fix issue #3106
  Fix clicks on the thumbnails in the playback page
  Improve playback buttons and update colors in the playback page
  ...
 2016-05-20 13:42:53 -03:00
Oswaldo Acauan
216bfd2ac2 Fix nav-bar userlist toggle icon 2016-05-20 13:39:58 -03:00
Oswaldo Acauan
37b86d9176 Improve some basic styles 2016-05-20 13:35:15 -03:00
Oswaldo Acauan
29c09afee9 Add basic nav-bar styles 2016-05-20 13:29:55 -03:00
Oswaldo Acauan
2612fef112 Improve Button styles 2016-05-20 13:17:39 -03:00
Oswaldo Acauan
0e9b8f7eff Add basic styles for actions-bar 2016-05-20 13:17:21 -03:00
Richard Alam
f3bfa91b01 Merge branch 'dfeng99-dfengBBB' 2016-05-20 15:41:04 +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
Richard Alam
d810256ca1 Merge branch 'jfederico-bbb-web_fix-maxParticipants-by-tracking-joins' 2016-05-20 15:28:34 +00:00
Richard Alam
41a258dd59 Merge branch 'bbb-web_fix-maxParticipants-by-tracking-joins' of https://github.com/jfederico/bigbluebutton into jfederico-bbb-web_fix-maxParticipants-by-tracking-joins 
Conflicts:
	bigbluebutton-config/web/index.html
 2016-05-20 15:28:19 +00:00
Richard Alam
61015cb21a Merge branch 'ritzalam-merge-v1.0.0-to-master' 2016-05-20 15:22:42 +00:00
Richard Alam
b0646794ff Merge branch 'merge-v1.0.0-to-master' of https://github.com/ritzalam/bigbluebutton into ritzalam-merge-v1.0.0-to-master 2016-05-20 15:15:39 +00:00
Richard Alam
1ddf9d633a Merge branch 'daronco-responsive-playback' 2016-05-20 15:14:47 +00:00
Richard Alam
ca0c3f60ed Merge branch 'responsive-playback' of https://github.com/daronco/bigbluebutton into daronco-responsive-playback 2016-05-20 15:14:30 +00:00
Richard Alam
468c463d80 Merge branch 'delftswa2016-add-emojis' 2016-05-20 15:13:20 +00:00
Richard Alam
babedcc6a7 Merge branch 'add-emojis' of https://github.com/delftswa2016/bigbluebutton into delftswa2016-add-emojis 2016-05-20 15:06:42 +00:00
Oswaldo Acauan
0e6c6f1f99 Improve some styles on the media 2016-05-20 12:02:57 -03:00
Oswaldo Acauan
a69d7faab9 Add iconRight option to Button component 2016-05-20 11:49:28 -03:00
Oswaldo Acauan
dc7cdb337f Add examples to Button component 2016-05-20 11:13:06 -03:00
Oswaldo Acauan
99c2e94c80 Remove unnecessary extension on imports 2016-05-20 10:46:30 -03:00
Oswaldo Acauan
d3d997d211 Rename navbar, media, whiteboard and videodock to the new structure 2016-05-20 10:44:27 -03:00
Oswaldo Acauan
7aac407e35 Remove unnecessary component background colors 2016-05-20 10:41:15 -03:00
Oswaldo Acauan
d81cb28f35 Add new component button and some basic styles 2016-05-20 10:37:19 -03:00
perroned
ef56169ebb Access sip function through window 2016-05-19 20:18:20 +00:00
perroned
2d0ea2a15d Load verto libs 2016-05-19 20:18:05 +00:00
Richard Alam
ebbc259b46 Merge pull request #3144 from ritzalam/publish-commons-jar-to-local 
- publish bbb commons messages to local by default
 2016-05-19 16:17:55 -04:00