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
Oleksandr Zhurbenko
7ff3a7c5d2
Adjusting the structure to the current BBB HTML5 convention
2016-05-17 16:43:19 -07: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
gcampes
e49b0399b5
Merge userlist merge conflicts
2016-05-17 11:17:17 -03: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
gcampes
947721250d
Adds the new layout for the user-list
2016-05-17 10:52:27 -03: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
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
perroned
e8229b1851
Some linting
2016-05-19 19:27:49 +00:00
perroned
3934ae3dce
Adds some work for verto calling
2016-05-19 18:33:27 +00:00
perroned
428941f896
Hangs up from sip audio
2016-05-19 16:21:22 +00:00
perroned
8117f91ec9
Fixes some imports
2016-05-19 16:14:12 +00:00
perroned
97c94ecace
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js
bigbluebutton-html5/imports/api/phone/index.js
bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js
2016-05-19 15:47:47 +00:00
perroned
955c27efcc
Beginning to add exiting sip
2016-05-19 15:20:36 +00:00
perroned
a637c29710
Fixes some paths
2016-05-19 15:19:42 +00:00
perroned
d83c96bf5d
Changes Meteor.config to an export
2016-05-18 20:19:50 +00:00
perroned
66a391c191
Updates server function to use new argument
2016-05-18 19:31:20 +00:00
perroned
4be18d2156
Updates client side data gathering for audio call
2016-05-18 19:29:28 +00:00
perroned
206e09f37a
Updates poll to use new server call method
2016-05-18 19:27:47 +00:00
perroned
ef41eee5b2
Fixes server call method arguments
2016-05-18 19:26:51 +00:00
Richard Alam
cfbabf56d8
Merge branch 'ritzalam-upgrade-to-grails-3.1.7'
2016-05-16 23:00:57 -04:00
Richard Alam
43231f36f0
Merge branch 'upgrade-to-grails-3.1.7' of https://github.com/ritzalam/bigbluebutton into ritzalam-upgrade-to-grails-3.1.7
2016-05-16 22:48:24 -04:00
Richard Alam
e9227a8230
Upgrade to latest grails
...
Create new project called bbb-web-api using latest grails.
2016-05-27 21:31:03 +00:00
Richard Alam
f8005a5285
Merge pull request #3147 from ritzalam/merge-bbb-1.1-dev-java8-with-master
...
Merge bbb 1.1 dev java8 with master
2016-05-27 10:08:45 -04:00
Richard Alam
785ee34453
Flex 4 UI
...
- build using gradle
- launch from outside flex builder
2016-05-26 19:07:27 +00:00
Richard Alam
a615ed7583
- rearrange new flex client source to conform with gradlefx convention
2016-05-25 20:14:13 +00:00
Richard Alam
d3547cc454
Merge branch 'new-ui-framework' of github.com:capilkey/bigbluebutton into merge-capilkey-with-master
2016-05-24 20:53:52 +00:00
Chad Pilkey
6b956249d3
Flex 4: Make AltMain just Main
2016-05-24 16:52:55 -04:00
Chad Pilkey
fce4cb2216
Remove unused AIR dependencies from the common-lib
2016-05-24 16:45:21 -04:00
