Commits · 6955757a3edb34531bedd3d1cb66b5af0d98f966 · hosting / chat / fairblue · GitLab

Snippets Groups Projects

Mar 18, 2013
- Merge branch 'master' into merge-master-into-dynamic-config · 6955757a
  Richard Alam authored 12 years ago
  
  6955757a
- Merge pull request #108 from SenecaCDOT-BigBlueButton/rename-participants-module · b4a1cd19
  Richard Alam authored 12 years ago
  
  Rename participants module
  b4a1cd19
- Merge branch 'upgrade-to-red5-r4597' into merge-master-into-dynamic-config · 5549373a
  Richard Alam authored 12 years ago
  
  5549373a
- Merge branch 'master' into merge-master-into-dynamic-config · db8d305d
  Richard Alam authored 12 years ago
  
  db8d305d
- - upgrade to red5 r4597 · d28a7ecf
  Richard Alam authored 12 years ago
  
  d28a7ecf
- Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton · f0bbe5db
  Markos Calderon authored 12 years ago
  
  f0bbe5db
- fix close cam if it's not available · 9babc757
  Markos Calderon authored 12 years ago
  
  9babc757
- Updates to bbb_api.jsp to pass along redirectClient=true for joinURL to load demo11.html · f59e34ed
  Dixon Fred authored 12 years ago
  
  f59e34ed
- First pass at adding demo11.jsp and demo11.html which gives examples of using... · ca78934f
  Dixon Fred authored 12 years ago
  
  First pass at adding demo11.jsp and demo11.html which gives examples of using the new BigBlueButton JavaScript API
  ca78934f
Mar 15, 2013
- changed all internal references to participants to users · df557b89
  Chad Pilkey authored 12 years ago
  
  df557b89
- renamed participants files to users files · c77ceba8
  Chad Pilkey authored 12 years ago
  
  c77ceba8
- renamed participants module to users · 86714772
  Chad Pilkey authored 12 years ago
  
  86714772
- Merge branch 'master' into merge-master-into-dynamic-config · 0e386ada
  Richard Alam authored 12 years ago
  
  0e386ada
- - make JS API voice mute/unmute, etc. work with the participants module · 52bd6f2b
  Richard Alam authored 12 years ago
  
  52bd6f2b
Mar 14, 2013
- Merge pull request #107 from kishba/fix-lti-custom-welcome-message · 1e307769
  Jesus Federico authored 12 years ago
  
  Fixes LTI custom welcome message for bbb-lti 0.1.1
  1e307769
- - use Participants module as default · 956242d6
  Richard Alam authored 12 years ago
  
  956242d6
- Merge pull request #106 from jfederico/master · f22a4368
  Richard Alam authored 12 years ago
  
  Added a footer to welcome message.
  f22a4368
- Rename custom_record to custom_bbb_record and override welcome message when appropriate · 8908657b
  Brandon Kish authored 12 years ago
  
  I'm re-applying this code after reviewing the 0.1.1 version of bbb-lti. From my testing, an LTI's custom welcome message is currently being ignored.
  8908657b
- - change bw and port test to connect to a subscope. Somehow if we don't, we... · a6736d8e
  Richard Alam authored 12 years ago
  
  - change bw and port test to connect to a subscope. Somehow if we don't, we can't reconnect again when all users logs out
  a6736d8e
Mar 13, 2013
- Merge branch 'bbb-red5-r4592' · 8731a431
  Richard Alam authored 12 years ago
  
  8731a431
- bigbluebutton-web: Added a footer to welcome message. A disclaimer or... · f56c4474
  jfederico authored 12 years ago
  
  bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server.
  f56c4474
- Merge pull request #105 from jfederico/master · 091ba72f
  Dixon Fred authored 12 years ago
  
  bbb-lti_v0.1.1.
  091ba72f
- Merge branch 'bbb-lti_v0.1.1' · 2b23d9ce
  jfederico authored 12 years ago
  
  2b23d9ce
- bbb-lti_v0.1.1: Extended roles to support Blackboard LTI implementation · ebe26d81
  jfederico authored 12 years ago
  
  As contributed by Brandon Kish
  ebe26d81
- Merge pull request #104 from SenecaCDOT-BigBlueButton/more-client-fixes · b6d85ad0
  Richard Alam authored 12 years ago
  
  More client fixes
  b6d85ad0
Mar 12, 2013
- Merge remote branch 'upstream/master' into more-client-fixes · af7e8c5b
  Chad Pilkey authored 12 years ago
  
  Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
  af7e8c5b
- added mute all except presenter and removed presenter from sort function · 2bc57e95
  Chad Pilkey authored 12 years ago
  
  2bc57e95
- added localization strings for participants module · d3c30377
  Markos Calderon authored 12 years ago
  
  d3c30377
Mar 11, 2013
- Check if accessibility is supported · 0d01fb9a
  Markos Calderon authored 12 years ago
  
  0d01fb9a
- removed chat colour picker and coloured the welcome message · 1c7a0600
  Chad Pilkey authored 12 years ago
  
  1c7a0600
- moved the Select File button · d581bf69
  Chad Pilkey authored 12 years ago
  
  d581bf69
- Merge branch 'master' into bbb-red5-r4592 · 897cc08c
  Richard Alam authored 12 years ago
  
  897cc08c
- - upgrade to red5 r4592 · 02296cf2
  Richard Alam authored 12 years ago
  
  02296cf2
Mar 08, 2013
- - BBB now starts properly on red5 r4582. Need a bit more testing though. · ece4ef7f
  Richard Alam authored 12 years ago
  
  ece4ef7f
- - try making sure that the different components execute the lifecycle properly · 412f4469
  Richard Alam authored 12 years ago
  
  412f4469
- Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton · 86970340
  Markos Calderon authored 12 years ago
  
  86970340
- Merge branch 'layout-module' of https://github.com/mconf/bigbluebutton into mconf-layout-module · 34616c04
  Markos Calderon authored 12 years ago
  
  Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
  34616c04
- - make bbb start on red5 r4582 · 7c4326a2
  Richard Alam authored 12 years ago
  
  7c4326a2
- Merge branch 'master' into upgrade-to-red5-r4580 · 3868f595
  Richard Alam authored 12 years ago
  
  3868f595
- Merge pull request #102 from SenecaCDOT-BigBlueButton/css-improvements · 74e98360
  Richard Alam authored 12 years ago
  
  cleaned up the UI a little
  74e98360

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net