{"shas":[["18919d8e8ecf2ea5be9fc668c002244bf10a0dcf","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","Merge branch 'master' of https://github.com/fluid-project/infusion into FLUID-4307\n\nConflicts:\n\tsrc/webapp/components/uiOptions/css/FatPanelUIOptions.css\n\tsrc/webapp/components/uiOptions/js/UIEnhancer.js\n\tsrc/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html\n\nAdd Fat Panel UIO container styling to the body of the iframe in order for the tabs to have a proper container","mlam"],["1b991dced0f7619b6bc74c1235ef8581c02939b1","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-4307: Refactor variable declaration for the iframe's body element","mlam"],["5544984a2531a3ff5ec70d7d501dcb7eb04bb3d0","2bd8e9c9c868efe968cc583d2d49f67380967d94@ocad.ca","FLUID-4310: Linked UI options demos into demo portal. Some styling improvements might be followed.","Cindy Li"],["9928cfed8ffba6599457fb6cf4bf1b9c6d2637be","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-4308: Remind the user of the file upload limit.   Styling fixes are in need.","mlam"],["410fc648b2894794aaadc9207d68d86215b84a9c","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-4308:  Fixed the styles for the file upload limit text","mlam"],["14911c9f9ce4fb82d119e3acae193600a195f01b","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","Merge branch 'master' of https://github.com/fluid-project/infusion into FLUID-4308","mlam"],["32228faa4f8976166e91b3ef0b8e7079ba3e4866","5c22f68c3fbcf6dea7d1a2f5923006fcdcd8be99@ocad.ca","FLUID-4300: Implementing heidiv's comments.","Jonathan Hung"],["122c39023f43f6befe8a3464ed4bdc262d0b84cf","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","Merge branch 'master' of https://github.com/fluid-project/infusion","mlam"],["6c64a171df4c31743095b2a804e5eedf8c03f24d","d9665ed7ebccda5fcaa9ff1ca6ba54bb133f4318@ocad.ca","FLUID-4319: Additional style over-rides for jq ui tabs in fat panel","heidi valles"],["3f835f49c88d64d36fee69be855f0c698cd99e3e","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-3999: Disable the \"Add more\" button when the upload limit has been reached.  Clean up to follow","mlam"],["89c567a138882426d0fee35826d23563976a48ea","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-4307:  Remove the border around the Fat Panel","mlam"],["b367f8605ce6b7695d87a7d5e209e86b943c3e17","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-3999:","mlam"],["1aded93d076056566a472f92a033fadef44ac108","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-3999: Reset the fileUploadLimit to infinity.\n\nTo comment on the previous commit, we now restrict the user from adding more files to the queue when the upload limit has been exceeded.","mlam"],["c742aa6e63a5103501265bd58ae5e163c3af672a","5c22f68c3fbcf6dea7d1a2f5923006fcdcd8be99@ocad.ca","FLUID-4300: Fixed footer font colour and margin for error message toggle.","Jonathan Hung"],["a1f5e2ef8afd826d1ad380f3904ef397bb92548c","5c22f68c3fbcf6dea7d1a2f5923006fcdcd8be99@ocad.ca","FLUID-4300: Added comment for the footer text margin fix.","Jonathan Hung"],["f62bbe46cf869837115cd9d1d312804a51c8b2e9","5c22f68c3fbcf6dea7d1a2f5923006fcdcd8be99@ocad.ca","FLUID-4300: Adding missing disabled Add More icon.","Jonathan Hung"],["50b1ccf8919292c038194ea6b23935f8fe64389a","5c22f68c3fbcf6dea7d1a2f5923006fcdcd8be99@ocad.ca","FLUID-4310: Modified styles to accomodate UI Options demos.","Jonathan Hung"],["a4ac84856085205d2be8ac26dc8e3f35eb6dc69f","5c22f68c3fbcf6dea7d1a2f5923006fcdcd8be99@ocad.ca","FLUID-4300: Background on delete error message button is now the proper grey.","Jonathan Hung"],["196186c7e270d9e8b5afeb8b6639a32547709a65","2bd8e9c9c868efe968cc583d2d49f67380967d94@ocad.ca","FLUID-4310: removed un-necessary css.","Cindy Li"],["f0de28747f57e8b1e72196f1f754c8a85fc322ad","5c22f68c3fbcf6dea7d1a2f5923006fcdcd8be99@ocad.ca","FLUID-4300: Fixed a problem where the Add More button was not dimming when maximum number of files has been reached.","Jonathan Hung"]],"ref":"refs/heads/master","size":76,"head":"983b40697fdad6c544415edab802d7bf0577f8d8","push_id":36752312}