Commits · 73ca0da7088207020d9ada1b8d66407d90effc5c · hosting / chat / fairblue

Jul 24, 2017
- Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton ... · 73ca0da7
  Richard Alam authored 7 years ago
  
  Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
  73ca0da7
- Minor updates to icons. · a6d8cbdd
  Ghazi Triki authored 7 years ago
  
  a6d8cbdd
- Fix borderThickness property name. · cd478ecb
  Ghazi Triki authored 7 years ago
  
  cd478ecb
- Update top toolbar buttons with new colour styles with the correct states. · fed90fdf
  Ghazi Triki authored 7 years ago
  
  fed90fdf
Jul 22, 2017
- Merge pull request #4128 from ritzalam/recording-status-change · e35f2fd1
  Richard Alam authored 7 years ago
  
  - receive recording status messages from server
  e35f2fd1
- - receive recording status messages from server · 544943b1
  Richard Alam authored 7 years ago
  
  544943b1
- Merge pull request #4120 from Klauswk/html5-2x-fix-public-messages · de272d31
  Anton Georgiev authored 7 years ago
  
  [HTML5 2.0] Fix Welcome Messages
  de272d31
- Merge pull request #4127 from ritzalam/record-messages-2x · 9861b9b2
  Richard Alam authored 7 years ago
  
  record message
  9861b9b2
- - provide a way to filter messages we want to record · 10c4846b
  Richard Alam authored 7 years ago
  
  10c4846b
Jul 21, 2017
- Merge pull request #4125 from capilkey/cleanup-old-1.1-apps · 3eeb8e24
  Chad Pilkey authored 7 years ago
  
  Cleanup old 1.1 user messages
  3eeb8e24
- fix the resize and move data storage · d68229f1
  Chad Pilkey authored 7 years ago
  
  d68229f1
- Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps · c8f38eba
  Chad Pilkey authored 7 years ago
  
  c8f38eba
- Merge remote-tracking branch 'upstream/bbb-2x-mconf' into cleanup-old-1.1-apps · 043c55e0
  Chad Pilkey authored 7 years ago
  
  043c55e0
- Updated style with new colours and fixed some icons. · b82e04fb
  Ghazi Triki authored 7 years ago
  
  b82e04fb
- Fix glow filter for MuteMeButton. · ef4da9e2
  Ghazi Triki authored 7 years ago
  
  ef4da9e2
- Merge branch 'ritzalam-work-on-meeting-lifcycle-2' into bbb-2x-mconf · d1cc6927
  Richard Alam authored 7 years ago
  
  d1cc6927
- Merge branch 'work-on-meeting-lifcycle-2' of... · ba2e99ed
  Richard Alam authored 7 years ago
  
  Merge branch 'work-on-meeting-lifcycle-2' of https://github.com/ritzalam/bigbluebutton into ritzalam-work-on-meeting-lifcycle-2
  ba2e99ed
- Merge branch 'antobinary-late-joiner-webrtc-screenshare' into bbb-2x-mconf · 80c903f0
  Richard Alam authored 7 years ago
  
  80c903f0
- Merge branch 'late-joiner-webrtc-screenshare' of... · f1b4f877
  Richard Alam authored 7 years ago
  
  Merge branch 'late-joiner-webrtc-screenshare' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare
  f1b4f877
- - clean up · 905f1a8e
  Richard Alam authored 7 years ago
  
  905f1a8e
Jul 20, 2017
- change Polls.scala to use better ArrayBuffer to Array conversion · c5e9f440
  Chad Pilkey authored 7 years ago
  
  c5e9f440
- cleaned up pre-2.0 user messages · 3a824e13
  Chad Pilkey authored 7 years ago
  
  3a824e13
- - try to get webcams working · ad9b122f
  Richard Alam authored 7 years ago
  
  ad9b122f
- Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle-2 · 3afc9261
  Richard Alam authored 7 years ago
  
  3afc9261
- Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf · 37c744b0
  Richard Alam authored 7 years ago
  
  37c744b0
- Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf · 15b847e8
  Richard Alam authored 7 years ago
  
  15b847e8
- - try to fix webcam list · 6be6e919
  Richard Alam authored 7 years ago
  
  6be6e919
- Restore DEFAULT_TOOLBAR_HEIGHT in MainApplicationShell.mxml · 41ea10d1
  Ghazi Triki authored 7 years ago
  
  41ea10d1
- Fix application not loading at startup. · cfdce6e5
  Ghazi Triki authored 7 years ago
  
  cfdce6e5
- Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into... · 5431f29a
  Richard Alam authored 7 years ago
  
  Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into work-on-meeting-lifcycle-2
  5431f29a
- - continue implement guest policy · d7e1a230
  Richard Alam authored 7 years ago
  
  d7e1a230
Jul 19, 2017
- - implement guest policy · d488ff74
  Richard Alam authored 7 years ago
  
  d488ff74
- Merge pull request #4118 from prlanzarin/2x-transcode-screenshare-messages · 8faf1192
  Chad Pilkey authored 7 years ago
  
  Move kurento screenshare messages to 2.0 and removed duplicated adapter import
  8faf1192
- - move handlers to a different package · 56ae9ca9
  Richard Alam authored 7 years ago
  
  56ae9ca9
- Fix show public messages · b2556695
  Klaus authored 7 years ago
  
  b2556695
- Removed duplicated adapter.js import in BigBlueButton.html · 5ebc45da
  prlanzarin authored 7 years ago
  
  5ebc45da
- Changed kurento screenshare app RTMP broadcast messages to new format · 8c69de35
  prlanzarin authored 7 years ago
  
  8c69de35
Jul 18, 2017

- track meeting inactivity and expiry in akka-apps · a61030a9
Richard Alam authored 7 years ago

a61030a9
request screenshare status on screenshare module init · 2995e10c
Anton Georgiev authored 7 years ago

2995e10c

Merge branch 'master-v2' into 2x-client-theme · 186417fb

Ghazi Triki authored 7 years ago

# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatControlBar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml

186417fb