Skip to content

Commit

Permalink
Merge remote-tracking branch 'justin/FLUID-6087'
Browse files Browse the repository at this point in the history 
* justin/FLUID-6087:
  FLUID-6087: removed typo
  FLUID-6087: Updated copyright for Gruntfile
  FLUID-6087: updated copyrights for test-core
  FLUID-6087: Updated copyrights for node-tests
  FLUID-6087: Updated copyrights for manual-tests
  FLUID-6087: correct copyrights
  FLUID-6087: updated copyrights in framework-tests
  FLUID-6087: Updated copyrights for framework-tests
  FLUID-6087: Updating copyrights in component tests
  FLUID-6087: Correcting some copyrights
  FLUID-6087: Updating the module copyrights.
  FLUID-6087: Updated copyrights in the framework
  FLUID-6087: Corrected copyrights for pager and uploader
  FLUID-6087: Updating copyrights for components
  FLUID-6087: Updated copyrights for demos and examples
  • Loading branch information
@cindyli
cindyli committed Dec 6, 2016
2 parents 73f7f90 + a0f9378 commit 945866a
Show file tree
Hide file tree
Showing 123 changed files with 315 additions and 168 deletions.
1 change: 1 addition & 0 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2013-2016 OCAD University
Copyright 2014-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions demos/keyboard-a11y/js/five-star.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2010-2014 OCAD University
Copyright 2013 Raising the Floor - US
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 1 addition & 1 deletion demos/keyboard-a11y/js/keyboardDemo.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2010-2014 OCAD University
Copyright 2010-2016 OCAD University
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions demos/prefsFramework/js/prefsEditorDemo.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2014-2015 OCAD University
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions demos/renderer/js/rendererDemo.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
Copyright 2009 University of Toronto
Copyright 2016 OCAD University
Copyright 2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 1 addition & 1 deletion examples/framework/preferences/conditionalAdjusters/js/conditional.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2013 OCAD University
Copyright 2013-2015 OCAD University
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 1 addition & 1 deletion examples/framework/preferences/shared/js/panels.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2013 OCAD University
Copyright 2013-2016 OCAD University
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 1 addition & 1 deletion examples/framework/preferences/usingGrades/js/prefsEditorSeparatedPanel.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2011-2014 OCAD University
Copyright 2011-2015 OCAD University
Copyright 2011 Lucendo Development Ltd.
Licensed under the Educational Community License (ECL), Version 2.0 or the New
Expand Down
1 change: 1 addition & 0 deletions examples/framework/renderer/dataBinding/js/data-bound-menu.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2008-2009 University of Toronto
Copyright 2014 OCAD University
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions examples/framework/renderer/programmaticTree/js/programmatic-tree-menu.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2008-2009 University of Toronto
Copyright 2014 OCAD University
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
4 changes: 3 additions & 1 deletion src/components/inlineEdit/js/InlineEdit.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
Copyright 2008-2009 University of Cambridge
Copyright 2008-2010 University of Toronto
Copyright 2008-2009 University of California, Berkeley
Copyright 2010-2011 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2012-2013 Raising the Floor - US
Copyright 2015-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
3 changes: 2 additions & 1 deletion src/components/inlineEdit/js/InlineEditIntegrations.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
Copyright 2008-2009 University of Cambridge
Copyright 2008-2010 University of Toronto
Copyright 2010-2011 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2013 Raising the Floor - US
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 1 addition & 1 deletion src/components/overviewPanel/js/OverviewPanel.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2014 OCAD University
Copyright 2014-2015 OCAD University
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions src/components/pager/js/PagedTable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Copyright 2008-2009 University of Cambridge
Copyright 2008-2009 University of Toronto
Copyright 2010-2013 OCAD University
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2014-2016 Raising the Floor - International
Copyright 2016 Dinuka De Silva
Licensed under the Educational Community License (ECL), Version 2.0 or the New
Expand Down
4 changes: 3 additions & 1 deletion src/components/pager/js/Pager.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
Copyright 2008-2009 University of Cambridge
Copyright 2008-2009 University of Toronto
Copyright 2010-2011 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2013 Raising the Floor - US
Copyright 2014-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 2 additions & 0 deletions src/components/pager/js/Table.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Copyright 2008-2009 University of Cambridge
Copyright 2008-2009 University of Toronto
Copyright 2010-2014 OCAD University
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2013 Raising the Floor - US
Copyright 2015-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
3 changes: 2 additions & 1 deletion src/components/progress/js/Progress.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
Copyright 2008-2009 University of Toronto
Copyright 2008-2009 University of California, Berkeley
Copyright 2010-2011 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2013 Raising the Floor - US
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
4 changes: 3 additions & 1 deletion src/components/reorderer/js/GeometricManager.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
Copyright 2008-2010 University of Cambridge
Copyright 2008-2010 University of Toronto
Copyright 2010 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2010 Lucendo Development Ltd.
Copyright 2012 Raising the Floor - US
Copyright 2014 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions src/components/reorderer/js/ImageReorderer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Copyright 2008-2009 University of Cambridge
Copyright 2008-2009 University of Toronto
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2011 OCAD University
Copyright 2013 Raising the Floor - US
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 2 additions & 0 deletions src/components/reorderer/js/ModuleLayout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Copyright 2008-2009 University of Cambridge
Copyright 2008-2009 University of Toronto
Copyright 2010-2011 OCAD University
Copyright 2010 Lucendo Development Ltd.
Copyright 2013 Raising the Floor - US
Copyright 2015-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
4 changes: 3 additions & 1 deletion src/components/reorderer/js/Reorderer.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/*
Copyright 2007-2009 University of Toronto
Copyright 2007-2010 University of Cambridge
Copyright 2010-2011 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2012-2014 Raising the Floor - US
Copyright 2015-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions src/components/slidingPanel/js/SlidingPanel.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
Copyright 2011-2015 OCAD University
Copyright 2011 Lucendo Development Ltd.
Copyright 2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
4 changes: 3 additions & 1 deletion src/components/tableOfContents/js/TableOfContents.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
Copyright 2011-2015 OCAD University
Copyright 2011-2016 OCAD University
Copyright 2011 Lucendo Development Ltd.
Copyright 2012 Raising the Floor - US
Copyright 2015-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
5 changes: 3 additions & 2 deletions src/components/tabs/js/Tabs.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
Copyright 2011 OCAD University
Copyright 2011-2016 OCAD University
Copyright 2011 Lucendo Development Ltd.
Copyright 2015 Raising the Floor (International)
Copyright 2013 Raising the Floor - US
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 1 addition & 1 deletion src/components/textToSpeech/js/TextToSpeech.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2015 OCAD University
Copyright 2015-2016 OCAD University
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
4 changes: 3 additions & 1 deletion src/components/tooltip/js/Tooltip.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/*
Copyright 2010-2015 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2013-2014 Raising the Floor - US
Copyright 2015-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 1 addition & 1 deletion src/components/uiOptions/js/UIOptions.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2013 OCAD University
Copyright 2013-2016 OCAD University
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 2 additions & 0 deletions src/components/undo/js/Undo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Copyright 2008-2009 University of Cambridge
Copyright 2008-2010 University of Toronto
Copyright 2010 Lucendo Development Ltd.
Copyright 2013 Raising the Floor - US
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 2 additions & 0 deletions src/components/uploader/js/DemoUploadManager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Copyright 2009 University of Toronto
Copyright 2009 University of California, Berkeley
Copyright 2010-2011 OCAD University
Copyright 2011 Lucendo Development Ltd.
Copyright 2013 Raising the Floor - US
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions src/components/uploader/js/ErrorPanel.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2011 OCAD University
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 2 additions & 0 deletions src/components/uploader/js/FileQueue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Copyright 2008-2009 University of Toronto
Copyright 2008-2009 University of California, Berkeley
Copyright 2010-2011 OCAD University
Copyright 2013 Raising the Floor - US
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
4 changes: 3 additions & 1 deletion src/components/uploader/js/FileQueueView.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
Copyright 2008-2009 University of Toronto
Copyright 2008-2009 University of California, Berkeley
Copyright 2008-2009 University of Cambridge
Copyright 2010-2011 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2011 Lucendo Development Ltd.
Copyright 2013 Raising the Floor - US
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
4 changes: 3 additions & 1 deletion src/components/uploader/js/HTML5UploaderSupport.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
Copyright 2010-2011 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2011 Lucendo Development Ltd.
Copyright 2013 Raising the Floor - US
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions src/components/uploader/js/MimeTypeExtensions.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2011 OCAD University
Copyright 2013 Raising the Floor - US
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
5 changes: 3 additions & 2 deletions src/components/uploader/js/Uploader.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/*
Copyright 2008-2009 University of Toronto
Copyright 2008-2009 University of California, Berkeley
Copyright 2010-2011 OCAD University
Copyright 2010-2014 OCAD University
Copyright 2011 Lucendo Development Ltd.
Copyright 2015 Raising the Floor (International)
Copyright 2013 Raising the Floor - US
Copyright 2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
1 change: 1 addition & 0 deletions src/components/uploader/js/UploaderCompatibility-Infusion1.2.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
Copyright 2010-2011 OCAD University
Copyright 2011 Lucendo Development Ltd.
Copyright 2013-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
3 changes: 2 additions & 1 deletion src/components/uploader/js/UploaderCompatibility-Infusion1.3.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
Copyright 2011 OCAD University
Copyright 2011-2012 OCAD University
Copyright 2013-2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 2 additions & 0 deletions src/framework/core/js/DataBinding.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Copyright 2008-2010 University of Cambridge
Copyright 2008-2009 University of Toronto
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2010-2014 OCAD University
Copyright 2012-2014 Raising the Floor - US
Copyright 2014-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
7 changes: 4 additions & 3 deletions src/framework/core/js/Fluid.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Fluid Infusion v2.0
* Fluid Infusion v2.0.0
*
* Infusion is distributed under the Educational Community License 2.0 and new BSD licenses:
* http://wiki.fluidproject.org/display/fluid/Fluid+Licensing
Expand All @@ -12,9 +12,10 @@ Copyright 2007-2010 University of Cambridge
Copyright 2007-2009 University of Toronto
Copyright 2007-2009 University of California, Berkeley
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2010 OCAD University
Copyright 2010-2015 OCAD University
Copyright 2011 Charly Molter
Copyright 2014-2015 Raising the Floor - International
Copyright 2012-2014 Raising the Floor - US
Copyright 2014-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
2 changes: 2 additions & 0 deletions src/framework/core/js/FluidDebugging.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Copyright 2007-2009 University of Toronto
Copyright 2007-2009 University of California, Berkeley
Copyright 2010 OCAD University
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2012 Raising the Floor - US
Copyright 2014-2015 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
3 changes: 2 additions & 1 deletion src/framework/core/js/FluidDocument.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
Copyright 2007-2010 University of Cambridge
Copyright 2007-2009 University of Toronto
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2010 OCAD University
Copyright 2010-2016 OCAD University
Copyright 2013-2014 Raising the Floor - US
Copyright 2005-2013 jQuery Foundation, Inc. and other contributors
Licensed under the Educational Community License (ECL), Version 2.0 or the New
Expand Down
6 changes: 4 additions & 2 deletions src/framework/core/js/FluidIoC.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*
Copyright 2011-2013 OCAD University
Copyright 2010-2015 Lucendo Development Ltd.
Copyright 2011-2016 OCAD University
Copyright 2010-2011 Lucendo Development Ltd.
Copyright 2012-2014 Raising the Floor - US
Copyright 2014-2016 Raising the Floor - International
Licensed under the Educational Community License (ECL), Version 2.0 or the New
BSD license. You may not use this file except in compliance with one these
Expand Down
6 changes: 4 additions & 2 deletions src/framework/core/js/FluidPromises.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/*!
Copyright unscriptable.com / John Hann 2011
Copyright Lucendo Development Ltd. 2014
Copyright 2011 unscriptable.com / John Hann
Copyright 2014 Lucendo Development Ltd.
Copyright 2014 Raising the Floor - US
Copyright 2014-2016 Raising the Floor - International
License MIT
*/
Expand Down
Loading

0 comments on commit 945866a

Please sign in to comment.