-
- Downloads
Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call
Conflicts: bigbluebutton-html5/app/client/main.html bigbluebutton-html5/app/client/stylesheets/style.less bigbluebutton-html5/app/client/views/chat/chat_bar.html
Showing
- README.md 6 additions, 27 deletionsREADME.md
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala 12 additions, 0 deletions...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
- bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersModel.scala 1 addition, 1 deletion.../scala/org/bigbluebutton/core/apps/users/UsersModel.scala
- bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml 6 additions, 4 deletions...dules/deskshare/view/components/DesktopPublishWindow.mxml
- bigbluebutton-config/bigbluebutton-release 1 addition, 1 deletionbigbluebutton-config/bigbluebutton-release
- bigbluebutton-config/bin/bbb-conf 3 additions, 3 deletionsbigbluebutton-config/bin/bbb-conf
- bigbluebutton-config/web/index.html 1 addition, 1 deletionbigbluebutton-config/web/index.html
- bigbluebutton-html5/app/client/globals.coffee 3 additions, 3 deletionsbigbluebutton-html5/app/client/globals.coffee
- bigbluebutton-html5/app/client/main.html 5 additions, 5 deletionsbigbluebutton-html5/app/client/main.html
- bigbluebutton-html5/app/client/stylesheets/chat.less 15 additions, 3 deletionsbigbluebutton-html5/app/client/stylesheets/chat.less
- bigbluebutton-html5/app/client/stylesheets/style.less 6 additions, 14 deletionsbigbluebutton-html5/app/client/stylesheets/style.less
- bigbluebutton-html5/app/client/stylesheets/users.less 3 additions, 0 deletionsbigbluebutton-html5/app/client/stylesheets/users.less
- bigbluebutton-html5/app/client/views/chat/chat_bar.html 6 additions, 2 deletionsbigbluebutton-html5/app/client/views/chat/chat_bar.html
- bigbluebutton-html5/app/client/views/users/user_list.coffee 5 additions, 2 deletionsbigbluebutton-html5/app/client/views/users/user_list.coffee
- bigbluebutton-html5/app/client/views/users/users_list.html 1 addition, 1 deletionbigbluebutton-html5/app/client/views/users/users_list.html
- bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html 1 addition, 1 deletion...ebutton-html5/app/client/views/whiteboard/whiteboard.html
- bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.ttf 0 additions, 0 deletions...ton-html5/app/public/packages/ionicons/fonts/ionicons.ttf
- bigbluebutton-html5/app/public/packages/ionicons/fonts/ionicons.woff 0 additions, 0 deletions...on-html5/app/public/packages/ionicons/fonts/ionicons.woff
Loading
Please register or sign in to comment