Commits · 2bbeba686d4a0f407e7b6ad5a6075f8ddfbd4ed8 · hosting / chat / fairblue

Jun 01, 2017
- Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton ... · 2bbeba68
  Richard Alam authored 7 years ago
  
  Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web
  2bbeba68
- Merge branch 'move-java-classes-from-bbb-web-to-bbb-common-web' of... · 4574a9cb
  Richard Alam authored 7 years ago
  
  Merge branch 'move-java-classes-from-bbb-web-to-bbb-common-web' of github.com:ritzalam/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web
  4574a9cb
- - redo how we deserialize messages · 1a58703f
  Richard Alam authored 7 years ago
  
  1a58703f
- Merge pull request #3968 from capilkey/multi-user-cursor · 2bce70c0
  Richard Alam authored 7 years ago
  
  Fix shape drawing and set max text length for text annotations
  2bce70c0
- Merge pull request #19 from riadvice/web-and-akka-apps-update · 98f178b9
  Richard Alam authored 7 years ago
  
  Web and akka apps update
  98f178b9
- Fix akka-bbb-fsesl build.sbt and upgrade scala to 2.12.2 and akka to 2.5.1 · 08ff58f2
  Ghazi Triki authored 7 years ago
  
  08ff58f2
- Minor fixes to DEVELOPMENT.md · 65a3d16f
  Ghazi Triki authored 7 years ago
  
  65a3d16f
May 31, 2017
- - try to simpify deserializer · 7f980945
  Richard Alam authored 7 years ago
  
  7f980945
- - change localize ant target to locale · 31958979
  Richard Alam authored 7 years ago
  
  31958979
- - update developement doc · 92b06349
  Richard Alam authored 7 years ago
  
  92b06349
- Merge pull request #3970 from riadvice/fix-hangup · 7b393b80
  Richard Alam authored 7 years ago
  
  Fix application startup hanging
  7b393b80
May 30, 2017
- - remove meeting model · 2999e715
  Richard Alam authored 7 years ago
  
  2999e715
May 29, 2017
- - track meeting status · 47b0ada0
  Richard Alam authored 7 years ago
  
  47b0ada0
- Remove the callLater MDIManagerEvent.WINDOW_ADD listener to avoid the... · 6b05222d
  Ghazi Triki authored 7 years ago
  
  Remove the callLater MDIManagerEvent.WINDOW_ADD listener to avoid the application hangup when loading.
  6b05222d
- - handle register user message · 84bfd937
  Richard Alam authored 7 years ago
  
  84bfd937
- - fix test · bd83dc01
  Richard Alam authored 7 years ago
  
  bd83dc01
May 28, 2017
- Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into... · 240176ca
  Richard Alam authored 7 years ago
  
  Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web
  240176ca
May 27, 2017
- - send message to client · 272df3c2
  Richard Alam authored 7 years ago
  
  272df3c2
May 26, 2017
- set a max text length of 1024 for text annotations · 3fe1103e
  Chad Pilkey authored 7 years ago
  
  3fe1103e
- allow shapes to draw again in the whiteboard · 3683bac3
  Chad Pilkey authored 7 years ago
  
  3683bac3
- - implement validate auth token · 73ec6bb2
  Richard Alam authored 7 years ago
  
  73ec6bb2
- Merge pull request #3954 from riadvice/faster-options-reading · 7a60aec8
  Richard Alam authored 7 years ago
  
  Improve client options reading
  7a60aec8
- Merge pull request #3967 from capilkey/multi-user-cursor · 7f0e187a
  Richard Alam authored 7 years ago
  
  First pass at multi-user cursors in the whiteboard
  7f0e187a
- fix whiteboard shapes to again send proper statuses · 302040b8
  Chad Pilkey authored 7 years ago
  
  302040b8
- update WhiteboardTextToolbar to save colour and font between uses · b7fb0588
  Chad Pilkey authored 7 years ago
  
  b7fb0588
- first pass at multi whiteboard cursors · 09ec1e61
  Chad Pilkey authored 7 years ago
  
  09ec1e61
May 25, 2017
- - send and handle meeting created event · 18cce3a8
  Richard Alam authored 7 years ago
  
  18cce3a8
- - handle create meeting request message · 72f7272e
  Richard Alam authored 7 years ago
  
  72f7272e
- More improvements to the configuration parsing. · 30a60b0e
  Ghazi Triki authored 7 years ago
  
  30a60b0e
May 24, 2017
- - send create message from bbb-web · e56a758c
  Richard Alam authored 7 years ago
  
  e56a758c
- Read configuration options for version 2 using the new Options class. · fd253523
  Ghazi Triki authored 7 years ago
  
  fd253523
- - turn off keep alive message · 467598ff
  Richard Alam authored 7 years ago
  
  467598ff
- - try new messages · 4aedea9f
  Richard Alam authored 7 years ago
  
  4aedea9f
May 23, 2017

- wire bbb-apps · 064128db
Richard Alam authored 7 years ago

064128db

Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into faster-options-reading · ef306c74

Ghazi Triki authored 7 years ago

# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/core/model/Config.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/LayoutOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMapDelegate.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentOptions.as
#	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/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml

ef306c74

Merge pull request #3957 from capilkey/multi-user-2.0-take5 · b6176ac7
Richard Alam authored 7 years ago
```
Whiteboard updates for 2.0
```
b6176ac7
Merge pull request #3961 from riadvice/2x-ui-improve · 4dda35a3
Richard Alam authored 7 years ago
```
Fix checking branding options
```
4dda35a3
Merge pull request #3959 from riadvice/merge-master-into-2x · afa320dc
Richard Alam authored 7 years ago
```
Merge master into 2x branch
```
afa320dc
Fix checking branding options. · 93a21b88
Ghazi Triki authored 7 years ago

93a21b88

May 22, 2017

Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x · 7d283cd1

Ghazi Triki authored 7 years ago

# Conflicts:
#	bigbluebutton-client/resources/config.xml.template
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
#	record-and-playback/core/scripts/rap-process-worker.rb

7d283cd1