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

4496 Commits

Author SHA1 Message Date
perroned
a3e2a3a54a Upgrade verto libs 2016-06-08 20:07:07 +00:00
perroned
844210faea Fixes audio permission, render tag 2016-06-01 15:56:12 +00:00
perroned
4977950081 Fixes crash when starting video view 2016-05-30 17:21:30 +00:00
perroned
2145cc0d1e Stops fucntion that broke video viewing on html5 2016-05-26 20:25:27 +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
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
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
babedcc6a7 Merge branch 'add-emojis' of https://github.com/delftswa2016/bigbluebutton into delftswa2016-add-emojis 2016-05-20 15:06:42 +00: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
Richard Alam
c4b044e8a1 Merge branch 'v1.0.x-release' into master 2016-05-19 13:50:23 +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
Richard Alam
b2a4a150c4 - add Occitan locale 2016-05-12 15:19:13 +00:00
Richard Alam
5719ab2973 - fix offending locale that breaks build 2016-05-11 17:55:01 +00:00
Richard Alam
1e203d2617 Merge branch 'v1.0.x-release' of github.com:bigbluebutton/bigbluebutton into v1.0.x-release 2016-05-11 17:35:45 +00:00
Richard Alam
a3838ec143 Update locales 
Update locales as of May 11, 2016.
 2016-05-11 17:35:04 +00:00
Chad Pilkey
ce1adcffc8 fix shortcut key inconsistencies 2016-05-05 16:15:09 -07:00
Chad Pilkey
c9486b6c5e fix issue #3088 2016-05-05 16:14:01 -07:00
Chad Pilkey
dc5bacc578 fix issue #3106 2016-05-03 10:09:30 -07:00
Chad Pilkey
24c6d48dc2 removing files that should not have been committed 2016-05-02 12:45:25 -07:00
Chad Pilkey
bf7d3332b9 add two branding images back to the client 2016-04-27 11:26:12 -07:00
Ghaz Triki
11d86f6aa8 Merge 'branch air-ui' into 'mobile-client' 2016-04-26 09:19:17 +01:00
Ghaz Triki
01335b6e8a Merge branch 'master' into mobile-client 2016-04-25 19:58:13 +01:00
David Feng
67c14f9056 This enable avatar to be display in other participants video window 2016-04-20 14:08:13 +08:00
Chad Pilkey
fe53999164 Third round of 1.0 accessibility bug fixes 2016-04-19 09:17:14 -07:00
perroned
cf5bbdf157 Prevents Java errors when trying WebRTC 2016-04-07 13:48:42 -05:00
Richard Alam
b0d6cf51ef Updating locales 
Update locales as of Apr 6, 2016
 2016-04-06 18:59:41 +00:00
Fred Dixon
b9b23dc87b Merge pull request #3078 from capilkey/1.0-access-bugfix3 
Correction to #3074
 2016-04-05 18:54:11 -04:00
Chad Pilkey
8a5294b6b5 added callback getters to VideoWithWarnings 2016-04-05 14:36:24 -07:00
Richard Alam
6b6f1622dc Merge pull request #3073 from perroned/edge-as-chrome 
Fixes #3068 - Detecting Microsoft Edge as Google Chrome
 2016-04-05 14:04:37 -04:00
Richard Alam
d1c0a22a4a Merge pull request #3074 from capilkey/1.0-access-bugfix2 
Fixed some accessibility bugs in 1.0
 2016-04-05 14:03:37 -04:00
Chad Pilkey
6784c4c36d fixed a couple of accessibility bugs in 1.0 2016-04-04 12:23:51 -07:00
perroned
eb5eb45669 Moves deskshare browser checks into central location 2016-04-02 19:59:58 -05:00
perroned
5ab6e5b960 Checks for Edge browser on deskshare publish window 2016-04-02 19:45:27 -05:00
perroned
088d3eb4cd Linker checks for Edge browser 2016-04-02 19:32:29 -05:00
perroned
6bce9350cb Adds Edge browser warning to en_US locale 2016-04-02 19:31:34 -05:00
perroned
388ff0705c Moves verto credentials to config.xml 2016-04-01 14:47:40 -05:00
perroned
98e9857466 Remove toolbar code from WebRTC manager 2016-04-01 14:01:29 -05:00
perroned
4273c2592f Shows Java errors and prevents multiple windows 2016-04-01 12:37:54 -05:00
perroned
f3d62424b9 Turns off deskshare share button when sharing stops 2016-04-01 10:41:45 -05:00
Ghaz Triki
bb6d62e071 Implemented video chat for web and mobile clients. 2016-04-01 15:34:54 +01:00
perroned
669ddb7b79 Merge remote-tracking branch 'anton/mod-verto-1' into mod-verto-1 2016-03-31 15:55:19 -05:00
perroned
12fd493018 Close viewer window when stream stops 2016-03-31 15:44:27 -05:00
Anton Georgiev
095680cd46 resolve import issues 2016-03-30 17:34:34 -04:00
Anton Georgiev
6537e8a091 make webrtc view event distinct and use it 2016-03-30 17:33:27 -04:00
perroned
caa9778049 Close view/publish window when no longer viewing 2016-03-28 14:15:17 -05:00
Ghaz Triki
618c01a442 Merge branch 'master' into close-popups-at-logout 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
 2016-03-16 08:15:59 +01:00
Richard Alam
3fca40ba36 Merge pull request #3053 from riadvice/fix-shortcuts-locale-switch 
Refresh the shortcuts ArrayCollection.
 2016-03-15 13:31:00 -04:00
Richard Alam
ab8055d11a Merge pull request #3052 from riadvice/client-improve 
Minor client improvements
 2016-03-15 13:29:55 -04:00
Ghaz Triki
d5bc96c668 Reverted back navigate to logout URL. 2016-03-11 23:04:05 +01:00