{"shas":[["fc1706f7a69199ccdd90f59dc351165297d180f8","d9665ed7ebccda5fcaa9ff1ca6ba54bb133f4318@ocad.ca","refreshView function for scroller, and using function in Uploader","heidi valles"],["f87c00ce5a4410427131f12dd6b2494184cc94c0","d9665ed7ebccda5fcaa9ff1ca6ba54bb133f4318@ocad.ca","FLUID-4037: refreshView function for scroller, and using function in Uploader","heidi valles"],["7948ead651a02d633041130f6b49a0872c85b554","d9665ed7ebccda5fcaa9ff1ca6ba54bb133f4318@ocad.ca","Merge branch 'FLUID-4037' of github.com:colinbdclark/infusion-FLUID-4037 into FLUID-4037","heidi valles"],["e57ecdbe05d0b6d097c0b0d5c3b4d57ee6f0d680","b3a21f22ac21b3345b72f7f86a2333a7060d07fc@gmail.com","NOJIRA: Delinted FluidView.js.","Colin Clark"],["24f73dfcf328efd7bedaa4d28a8b3c805558743a","b3a21f22ac21b3345b72f7f86a2333a7060d07fc@gmail.com","Merge branch 'master' into FLUID-4037\n\n* master:\n  NOJIRA: Delinted FluidView.js.\n  FLUID-4017: Modified version of Mike's patch to rename Uploader's remote.start() method to .uploadNextFile().\n  FLUID-4017: Mike's patch to fix bugs related to Uploader firing off multiple files at once.\n  NOJIRA: Converting DOS to UNIX line endings for the chili plugin.\n  FLUID-4027: Fixed incorrect appending of the fetched template to the test's container.\n  FLUID-4050: Proper XMLEncoding for all routes where data can enter an attribute value that I can heave a brick at. Some of these are not observable as failures in real-world browsers due to their ancestral tolerance for slop.\n  FLUID-4033: Modified version of Mike's -e patch, which correctly implements file upload limiting (and the lack thereof) in Uploader.\n  FLUID-3905: Delinted FluidView.js and a few Uploader files for IE6 happiness.\n  NOJIRA: Normalising all file permissions to 644 (yes, these are really stored in the git repository)\n  NOJIRA: Converting CRLF to LF in the jQuery scrollTo plugin.\n  FLUID-4048: Upgraded to the latest version of qunit\n\nConflicts:\n\tsrc/webapp/components/uploader/js/FileQueueView.js\n\tsrc/webapp/framework/core/js/FluidView.js","Colin Clark"],["3f03dbfab971b69574d799d29ea8b217e377526c","d9665ed7ebccda5fcaa9ff1ca6ba54bb133f4318@ocad.ca","FLUID-4037: delinted, removed working comments","heidi valles"],["a525ecd84dd3ee8bf51b4659a66850b8aff0ef46","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4055: Incomplete work","Antranig Basman"],["808c59aa868f85f3547b733e214a73b2313c33f1","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-4053:  Fix broken file queue unit test introduced from FLUID-4017","mlam"],["49abcd0024c0ca7945a7f81becb6467189c5e8b3","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4055: First working version with \"instantiator\" passing IoC test cases. Now requires explicit test for injection and application of \"instantiator\".","Antranig Basman"],["9587573aab58d6d3097cc96bb4600d03e2a7c184","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4055: Removed obsolete definitions for locating environmental thatStack, since these have long been folded into the stack at generation time","Antranig Basman"],["58851ce9fd335603fa746ff9c32db5eccddf276b","bb18696321971968c3f7a9a714f83804db8bcc8c@heidi-hazeltons-macbook.local","FLUID-3887: Removed rich invitation class, and edited tooltip text","Heidi Hazelton"],["51462185c7caba1841e1e0676ade0806021ca9d5","bb18696321971968c3f7a9a714f83804db8bcc8c@heidi-hazeltons-macbook.local","FLUID-3887 tooltip text fix","Heidi Hazelton"],["6e06afce63fd92817292631c363fedb6c7f9ddcb","bb18696321971968c3f7a9a714f83804db8bcc8c@heidi-hazeltons-macbook.local","Merge branch 'master' into FLUID-4037","Heidi Hazelton"],["2d86df20d4c35d619b78d7e8731de95887fd42e3","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","FLUID-4037: Minor change which adds a maxHeight property to scrollable instead of determining the maxHeight in refreshView.","Michelle D'Souza"],["0eeadd6682a72c9cd4c08ec7270b4075a31c536e","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","Merge remote branch 'heidi/FLUID-3887'","Justin Obara"],["d56813cbda20049f7e4a71da62ea2538046e11d4","d9665ed7ebccda5fcaa9ff1ca6ba54bb133f4318@ocad.ca","FLUID-3837: Cleaned up Uploader's html/css, removing unused styles and html","heidi valles"],["a5b442a5c83a7cf721d1b5c099e20e2d2c088584","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","Merge remote branch 'heidiv/FLUID-3837'","Michelle D'Souza"],["6368e698fd1a8d22fcbb61b983f4a07b7718de83","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","FLUID-4029: Heidi's patch to improve the progress width calculation.","Michelle D'Souza"],["35b66d7a08a2a6ba78aa808dce465ddea310070e","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4055: Failing test case for reinstantiation, exposing any number of horrible issues with expansion pipeline, including CONTINUED multiple expansion of material within \"components\" etc.","Antranig Basman"],["f0b6e013ba64faa8afb20b2c36ed6be6bb4b7471","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4039, FLUID-4055: Reverting work on \"trundlers\", resolvers, and early work on \"reinstantiation\" preparing for Infusion 1.3.1 release. This work will be recommitted from amb26/FLUID-4055 branch after release process is complete.","Antranig Basman"]],"repo":"cindyli/infusion","actor":"cindyli","ref":"refs/heads/master","size":106,"head":"53b86a6d7781af2ced79e2af0d402506fe99c61c","actor_gravatar":"b10d976c28a49eeafd24d0ccefd773be","push_id":26282614}