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

12214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Richard Alam
9d6f0ff0bb - publish bbb commons messages to local by default 2016-05-19 20:16:26 +00:00
jfederico
470971d598 bbb-web: Verified that all error messages from join are displayed in html 2016-05-19 16:12:30 -04:00
Anton Georgiev
0861e192b9 disable webrtc deskshare for now 2016-05-19 17:59:58 +00:00
Anton Georgiev
4981344062 Merge branch 'mod-verto-1' of github.com:perroned/bigbluebutton into merge-webrtc-ds 
Conflicts:
	bigbluebutton-html5/app/client/globals_audio.coffee
	bigbluebutton-html5/app/client/verto.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/server.coffee
 2016-05-19 15:48:40 +00:00
jfederico
c65cea3804 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
 2016-05-19 11:41:46 -04:00
jfederico
875ad47aaf bbb-web: Fix for race condition that causes the maxParticipants filter to fail (registeredUser now tracks the timestamp instead of Date) 2016-05-19 10:31:59 -04:00
Richard Alam
c4b044e8a1 Merge branch 'v1.0.x-release' into master 2016-05-19 13:50:23 +00:00
Ubuntu
81aef001a0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into bbb-web_fix-maxParticipants-by-tracking-joins 
Updated feature branch with lates code in master
 2016-05-18 20:45:21 +00:00
Leonardo Crauss Daronco
da07d4513f Merge remote-tracking branch 'upstream/master' into responsive-playback 2016-05-18 17:19:44 -03:00
jfederico
0ce17ca9c2 bbb-config: index.html is now able to handle error messages when used as the default logoutURL 2016-05-18 16:07:13 -04:00
jfederico
4ce332ecce bbb-web: Fix for race condition that causes the maxParticipants filter to fail (changed the format to error parameter) 
[{"message":"You did not pass a checksum parameter.","key":"MissingParam"},{"message":"You did not pass a meetingID parameter.","key":"MissingParam"}]
 2016-05-18 15:39:34 -04:00
Anton Georgiev
c2e6fb9a72 undo some of the webrtc ds record changes 2016-05-18 17:34:30 +00:00
Anton Georgiev
92d6351c55 undo some of the webrtc ds record changes 2016-05-18 17:21:15 +00:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
jfederico
f075895792 bbb-web: Fix for race condition that causes the maxParticipants filter to fail (implemented cleaner) 2016-05-17 10:55:37 -04:00
Anton Georgiev
aacb97a173 Merge branch 'master' of github.com:antobinary/bigbluebutton 
Conflicts:
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/presentations.coffee
 2016-05-17 14:09:24 +00:00
Anton Georgiev
e1b3f6468f Merge pull request #3140 from antobinary/router-merging 
html5client: collections and structure changes; smarter imports
 2016-05-16 17:33:34 -04:00
Anton Georgiev
eea6bc0829 adjust path of collections 2016-05-16 20:26:24 +00:00
Anton Georgiev
8d52dc1b40 Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
	bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
	bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
	bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
	bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
	bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
	bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-16 19:54:51 +00:00
Anton Georgiev
cbef1c4abd split emitter.on; move to api 2016-05-16 19:12:49 +00:00
perroned
5be138fd31 Fixes cursor structure 2016-05-16 13:13:03 -05:00
perroned
4adad8bb32 Changes credential passing to 1 object 2016-05-16 13:12:27 -05:00
perroned
98aae7aade Changes collection imports 2016-05-16 13:05:44 -05:00
Anton Georgiev
a263c1388b lint mostly 2016-05-16 14:35:59 +00:00
perroned
109a8da350 Fixes whitespace 2016-05-16 09:14:28 -05:00
perroned
d9dbb51023 Moves to api/collection/index 2016-05-16 09:14:02 -05:00
Fred Dixon
ad746beb5d Merge pull request #3137 from ffdixon/v1.0.x-release 
Added blank pages to defaut.pdf for whiteboard
 2016-05-14 09:50:55 -04:00
Fred Dixon
6964f69acd Added blank pages to defaut.pdf for whiteboard 2016-05-14 09:49:50 -04:00
Fred Dixon
fdafa590fa Merge pull request #3136 from ffdixon/v1.0.x-release 
Move from 1.0-RC to 1.0
 2016-05-14 09:47:37 -04:00
Fred Dixon
2a5469f269 Move from 1.0-RC to 1.0 2016-05-14 09:45:26 -04:00
perroned
642a4e45c5 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
 2016-05-13 14:54:19 -05:00
perroned
6adaff0c44 Cleans lint 2016-05-13 11:31:06 -05:00
perroned
6a9ccb355f Updates callServer arguments and passes credential object 2016-05-13 11:17:00 -05:00
Anton Georgiev
57352f193c rework users publish 2016-05-13 16:11:44 +00:00
perroned
544220f7c0 Updating import paths for new structure 2016-05-13 09:47:24 -05:00
perroned
d12c31e324 Moving components to structure 2016-05-13 09:39:10 -05:00
Anton Georgiev
8a6fc308da avoid race cond when subscribing for data 2016-05-13 14:34:29 +00:00
perroned
d966aee2d7 Fixing paths for structure 2016-05-12 14:50:02 -05:00