[Commits] [fluid-project/infusion] d2531c: FLUID-4985: Moved Touch Punch into the plugins dir...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/fluid-project/infusion
  Commit: d2531ccfcfa199591052420455f8c6c4db915854
      https://github.com/fluid-project/infusion/commit/d2531ccfcfa199591052420455f8c6c4db915854
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    A src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js
    R src/webapp/lib/jquery/ui/js/jquery.ui.touch-punch.js
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html

  Log Message:
  -----------
  FLUID-4985: Moved Touch Punch into the plugins directory.


  Commit: 5f1cd14b6b9849153d0e1ee9087fefe3c635671e
      https://github.com/fluid-project/infusion/commit/5f1cd14b6b9849153d0e1ee9087fefe3c635671e
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    M src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchDependencies.json

  Log Message:
  -----------
  FLUID-4985: Added the dependency for Touch Punch to UIO


  Commit: cba55ff6b5eddd4a8d641143752ee770de4f2815
      https://github.com/fluid-project/infusion/commit/cba55ff6b5eddd4a8d641143752ee770de4f2815
  Author: Michelle D'Souza <michelled33 at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    R src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json

  Log Message:
  -----------
  FLUID-4985: Renamed the touch punch dependencies file.


  Commit: b6ea32a4b4c91b0c2b8bf1ac16d81bca9e2760e8
      https://github.com/fluid-project/infusion/commit/b6ea32a4b4c91b0c2b8bf1ac16d81bca9e2760e8
  Author: Justin Obara <obarajustin at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ReleaseNotes.txt
    M build-scripts/build.properties
    M src/webapp/components/uiOptions/html/FatPanelUIOptionsFrame.html
    M src/webapp/components/uiOptions/uiOptionsDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/jQueryTouchPunchPluginDependencies.json
    A src/webapp/lib/jquery/plugins/touchPunch/js/jquery.ui.touch-punch.js
    R src/webapp/lib/jquery/ui/js/jquery.ui.touch-punch.js
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithPreview.html
    M src/webapp/tests/manual-tests/html/uiOptionsFullWithoutPreview.html

  Log Message:
  -----------
  Merge remote-tracking branch 'michelle/FLUID-4985'

* michelle/FLUID-4985:
  FLUID-4985: Renamed the touch punch dependencies file.
  FLUID-4985: Added the dependency for Touch Punch to UIO
  FLUID-4985: Moved Touch Punch into the plugins directory.


Compare: https://github.com/fluid-project/infusion/compare/faf140ac354a...b6ea32a4b4c9