{"shas":[["c02cacd45cbd71c0456a55a8df3d61e62bb390b2","54686818f3a2e8baa14f7105cfd59f5167fec159@ocad.ca","FLUID-4351: Minor tweaks to address Heidi's comments.","Anastasia Cheetham"],["b2d1be4f1cf7f36e486016bec8ca60433af5180b","0c11d463c749db5838e2c0e489bf869d531e5403@anastasiacheetham.ca","Merge pull request #121 from acheetham/FLUID-4351-newUIOContextDemo\n\nThe new contextual UI Options demo, merging the three demos into one.","Anastasia Cheetham"],["59905622e23de4edcaddcd1f8bc288ef70d6a1b8","b3a21f22ac21b3345b72f7f86a2333a7060d07fc@gmail.com","FLUID-4389: Replaced relative path in build scripts with Ant-generated path.","Colin Clark"],["e640f5a7a3cb6d5fe474bd483c2026f16b25a4b2","b3a21f22ac21b3345b72f7f86a2333a7060d07fc@gmail.com","Merge branch 'FLUID-4389'\n\n* FLUID-4389:\n  FLUID-4389: Replaced relative path in build scripts with Ant-generated path.","Colin Clark"],["0b2068cffe66fb1b594980aa372a4cc566058c01","b3a21f22ac21b3345b72f7f86a2333a7060d07fc@gmail.com","FLUID-4389: Absolutified all CSS Generation-related paths so that the build can be run from any location on the file system.","Colin Clark"],["f870aba81a1bfd2f2919b97e895e16b853d1f192","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","Merge remote-tracking branch 'colin/master'\n\n* colin/master:\n  FLUID-4389: Absolutified all CSS Generation-related paths so that the build can be run from any location on the file system.","Justin Obara"],["7e481608b362b629efd8158b28ce19a6a95fafd2","54686818f3a2e8baa14f7105cfd59f5167fec159@ocad.ca","FLUID-4351: Removing temporary files that shouldn't have been committed.","Anastasia Cheetham"],["b93bf53afcf71741419e5a33d9510f113b854555","54686818f3a2e8baa14f7105cfd59f5167fec159@ocad.ca","FLUID-4351: Move all JS into one file; update demo namespace.","Anastasia Cheetham"],["7a0b914c47ca6ff78dc49e2e3ee6cfa306c3da8e","54686818f3a2e8baa14f7105cfd59f5167fec159@ocad.ca","FLUID-4351: Cleaning up the code based on Justin's suggestions.","Anastasia Cheetham"],["1db1311270299d85f13d758c4dcbf7385800765c","54686818f3a2e8baa14f7105cfd59f5167fec159@ocad.ca","FLUID-4351: Move the basic options into an object.","Anastasia Cheetham"],["7627c7abe461561516e04cc80a1936a0eb5fe78f","54686818f3a2e8baa14f7105cfd59f5167fec159@ocad.ca","FLUID-4351: Moved paths into shared variables; hid TOC on full-page UIOs.","Anastasia Cheetham"],["82298c8650e3b3ecb0fdb8e4ee666fdadad96096","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","Merge remote-tracking branch 'anastasia/FLUID-4351-newUIOContextDemo'\n\n* anastasia/FLUID-4351-newUIOContextDemo:\n  FLUID-4351: Moved paths into shared variables; hid TOC on full-page UIOs.\n  FLUID-4351: Move the basic options into an object.\n  FLUID-4351: Cleaning up the code based on Justin's suggestions.\n  FLUID-4351: Move all JS into one file; update demo namespace.\n  FLUID-4351: Removing temporary files that shouldn't have been committed.","Justin Obara"],["457fba9c079883f6e4f518693da0f1a4e4dddb0e","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","Merge remote-tracking branch 'amb26/FLUID-4393'\n\n* amb26/FLUID-4393:\n  FLUID-4393: Slightly firmer detection\n  FLUID-4393: Avoid mangling non-relative URLs in relative prefix computation for iframe rebasing in Fat Panel UIOptions","Michelle D'Souza"],["b33fe23cffbbeecac6d1a25ef3acb3a0cf1b4a52","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","Merge branch 'master' into FLUID-4377\n\nConflicts:\n\tbuild-scripts/importantInjection.json\n\tsrc/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html\n\tsrc/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html\n\tsrc/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html\n\tsrc/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html\n\n\tAlso updated the new demo with the changes that were being made in this branch.","Justin Obara"],["79735087eb03a28197f367039d705f519d8fd418","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","Merge branch 'master' into FLUID-4377","Justin Obara"],["db6e9407ce7ef87840a79f08dc62157965156d38","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","FLUID-4377: Updating the new demo\n\nIt appears that my changes to the new demo didn't go in with the merge.\nI'm committing them now.","Justin Obara"],["4d8e91d13dff8090fdfda2cc551012ac0eed765a","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","FLUID-4370: Setting contrast styles on all elements\n\nUsing the universal selector \"*\" to set the colour, background colour,\nand border colour or all elements. There is still an issue with this for\nthe \"Colour & Contrast\" select box which should have theme specific\nstyling for each option. However these have the same specificity as the\nactive theme so may be overridden. Need to investigate this more.","Justin Obara"],["7fefc0686cb7a847aa5188ae2654ab643b09d88a","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","Merge branch 'FLUID-4377' into FLUID-4370","Justin Obara"]],"ref":"refs/heads/FLUID-4370","size":18,"head":"7fefc0686cb7a847aa5188ae2654ab643b09d88a","push_id":39933937}