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

12660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Richard Alam
24bee6baab Merge branch 'new-ui-framework' of github.com:capilkey/bigbluebutton into merge-capilkey-with-master 2016-05-24 20:38:24 +00:00
Richard Alam
ef52170357 - fix dev instructions 2016-05-24 20:19:25 +00:00
Richard Alam
aafc420d53 Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice/bigbluebutton into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-24 20:17:47 +00:00
Chad Pilkey
803daf0ace Flex 4: Add more conditionals to the user list menu 2016-05-23 15:49:45 -04:00
Chad Pilkey
0de5ee6048 Flex 4: Remove unneeded UserList consts 2016-05-23 15:40:04 -04:00
Chad Pilkey
50cfd19cbb Flex 4: The basic webcam group shows and hides based on content 2016-05-21 14:12:36 -04:00
Chad Pilkey
f83108ed34 Move ShareCameraCommandWeb to better package 2016-05-21 13:23:27 -04:00
Chad Pilkey
bee3b6e24f Clean up unneeded Flex 4 views and other files 2016-05-21 13:21:16 -04:00
Chad Pilkey
75ecbb3058 Changed the Flex 4 chat view to match new models 2016-05-21 13:20:26 -04:00
Chad Pilkey
f10e3d9c33 Added the participants panel to Flex 4 UI 2016-05-21 13:19:01 -04:00
Richard Alam
8e078dfa68 Merge branch 'antobinary-verto-2' 2016-05-16 22:38:07 -04:00
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04: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
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	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/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04: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
Oleksandr Zhurbenko
ecfb86d474 Merged getSlideDimensions' with addSlideToCollection 2016-05-13 16:10:48 -07: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
Oleksandr Zhurbenko
5d6f9a83ec Fixed 'Can't wait without a fiber' error 2016-05-13 12:41:22 -07:00
Oleksandr Zhurbenko
0bfc8ceede Retrieving slide dimensions on the server side 2016-05-13 11:01:29 -07: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