[Commits] svn commit: 6007

Subversion Database Process svn at thor.atrc.utoronto.ca
Thu Nov 13 17:50:52 UTC 2008


------------------------------------------------------------------------
r6007 | colin | 2008-11-13 12:50:52 -0500 (Thu, 13 Nov 2008) | 3 lines
Changed paths:
   A /fluid/components/trunk/src/webapp/fluid-components/css/Uploader2.css (from /fluid/components/trunk/src/webapp/fluid-components/css/Uploader2.css:6004)
   A /fluid/components/trunk/src/webapp/fluid-components/html/templates/Uploader2.html (from /fluid/components/trunk/src/webapp/fluid-components/html/templates/Uploader2.html:6004)
   A /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2 (from /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2:6004)
   R /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/DemoUploadManager.js (from /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/DemoUploadManager.js:6004)
   R /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/FileQueue.js (from /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/FileQueue.js:6004)
   R /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/FileQueueView.js (from /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/FileQueueView.js:6004)
   R /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/Progress.js (from /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/Progress.js:6004)
   R /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/SWFUploadManager.js (from /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/SWFUploadManager.js:6004)
   R /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/Scroller.js (from /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/Scroller.js:6004)
   R /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/Uploader.js (from /fluid/components/trunk/src/webapp/fluid-components/js/fluid/uploader2/Uploader.js:6004)
   A /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2 (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/DemoUploadManager-test.html (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/DemoUploadManager-test.html:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/FileQueue-test.html (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/FileQueue-test.html:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/FileQueueView-test.html (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/FileQueueView-test.html:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/Progress-test.html (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/Progress-test.html:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/Scroller-test.html (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/Scroller-test.html:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/Uploader-test.html (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/Uploader-test.html:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/DemoUploadManagerTests.js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/DemoUploadManagerTests.js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/FileQueueTests.js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/FileQueueTests.js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/FileQueueViewTests.js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/FileQueueViewTests.js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/ProgressTests.js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/ProgressTests.js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/ScrollerTests.js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/ScrollerTests.js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/UploaderTests.js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/js/UploaderTests.js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/.DS_Store (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/.DS_Store:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/Progess (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/Progess:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/Progess/simple-progress.css (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/Progess/simple-progress.css:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/Progess/simple-progress.html (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/Progess/simple-progress.html:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/Progess/simple-progress.js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/Progess/simple-progress.js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/scroller (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/scroller:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/scroller/simple-scroller.css (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/scroller/simple-scroller.css:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/scroller/simple-scroller.js (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/scroller/simple-scroller.js:6004)
   R /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/scroller/simplescroller.html (from /fluid/components/trunk/src/webapp/tests/fluid-tests/uploader2/manual/scroller/simplescroller.html:6004)

FLUID-1797: Taking a different approach to fix the bad merge of Uploader 2. This will restore the files to trunk, then we'll progressively rewind changes made to Uploader 2 after the merge, then we'll sync trunk up with the missing changes from the branch.


------------------------------------------------------------------------



More information about the Commits mailing list