{"head":"d78557c041276a973ba245ff43438b866d0e0fe4","size":49,"push_id":44015374,"shas":[["9e54c2814c1536eaefd5c68a5917f4c2e49dfa27","d9665ed7ebccda5fcaa9ff1ca6ba54bb133f4318@ocad.ca","FLUID-4362: Merge conflict fix","heidi valles"],["a4485f001d9049f8276f7f804e24cf9faf1618a5","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4428: Revised version of botched options munging scheme for FLUID-4409 with test case demonstrating listener registration for NoPreview configuration (many more required). New directive in \"inline\" grade for \"middle level defaults\" named \"derivedDefaults\" with the options munging directive returned to being simply a map of strings to strings representing EL source and destination. New shared \"inline\" component creator function shares some more code between preview and noPreview - fatPanel is still generally a junkyard.","Antranig Basman"],["c998d2b4492aaa6932ad3e0f70f7a64a86729260","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","Merge remote-tracking branch 'amb26/FLUID-4428'\n\n* amb26/FLUID-4428:\n  FLUID-4428: Revised version of botched options munging scheme for FLUID-4409 with test case demonstrating listener registration for NoPreview configuration (many more required). New directive in \"inline\" grade for \"middle level defaults\" named \"derivedDefaults\" with the options munging directive returned to being simply a map of strings to strings representing EL source and destination. New shared \"inline\" component creator function shares some more code between preview and noPreview - fatPanel is still generally a junkyard.","Michelle D'Souza"],["d424ae3fe151a6b9b0ebce62a8ac1a76103fed13","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4428: Fix and test case for failure to apply \"direct options\". As a result of a failure in merging, it is necessary to give different namespaces to the events so one listener in the test case does not overwrite the other - but the test demonstrates that both are at least now being taken into account in the merging process.","Antranig Basman"],["fb80094f2407c5775b3a0801c6a6c3f414cd89ce","2bd8e9c9c868efe968cc583d2d49f67380967d94@ocad.ca","FLUID-4427: Fixed the issue that 'text size' and 'line spacing' are broken in certain version of IE as well as the originally broken UIEnhancer unit test.","Cindy Li"],["0e3ec655f0304ec7a81a8ed27435732aa9ab04cd","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4429: Restoring three demo path renames that went to my FLUID-4370 branch by mistake","Antranig Basman"],["05fb4eef550f40706301f2aee414e4e7beb69fc2","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","Merge remote-tracking branch 'amb26/FLUID-4429'\n\n* amb26/FLUID-4429:\n  FLUID-4429: Restoring three demo path renames that went to my FLUID-4370 branch by mistake","Michelle D'Souza"],["a35b8f863cc6e527688cabb628ef4323b957dcba","603d607e5b0b11061e185e857e973afc9c130487@ocad.ca","FLUID-4430: Updated the style name in the test file","mlam"],["576013024be0bf0653e35b05851be3e858d5673a","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","Merge remote-tracking branch 'mlam/FLUID-4430'\n\n* mlam/FLUID-4430:\n  FLUID-4430: Updated the style name in the test file","Michelle D'Souza"],["a29adc3ebd03ea650d67e3e9981f106474713191","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","Merge remote-tracking branch 'amb26/FLUID-4428'\n\n* amb26/FLUID-4428:\n  FLUID-4428: Fix and test case for failure to apply \"direct options\". As a result of a failure in merging, it is necessary to give different namespaces to the events so one listener in the test case does not overwrite the other - but the test demonstrates that both are at least now being taken into account in the merging process.","Michelle D'Souza"],["fb453686397ac4d1601f1a149c7429d903f2cfe7","2bd8e9c9c868efe968cc583d2d49f67380967d94@ocad.ca","Merge branch 'master' into FLUID-4427","Cindy Li"],["da3bea89fcf1ada8e79a776ae2e5f1e16876ecd5","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","FLUID-4428: Linting fixes","Antranig Basman"],["7898b32484c0c26542016d4cab1036bc7a5c1cf5","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","Merge remote-tracking branch 'amb26/FLUID-4428'\n\n* amb26/FLUID-4428:\n  FLUID-4428: Linting fixes","Michelle D'Souza"],["a3898ca8a7200744bee8dc3c36cbb88ea5b7da95","2bd8e9c9c868efe968cc583d2d49f67380967d94@ocad.ca","Merge branch 'master' into FLUID-4427","Cindy Li"],["39489dc91617e09fb1c8d64b0c04112559c7f7e9","2bd8e9c9c868efe968cc583d2d49f67380967d94@ocad.ca","FLUID-4427: Fetch fontSizeMap from that.options rather than the direct access thru fluid.defaults(). Also set font-size in em instead of px.","Cindy Li"],["711fffd37d4681fbf375826010a224bd6be182ad","d9665ed7ebccda5fcaa9ff1ca6ba54bb133f4318@ocad.ca","FLUID-4432: Changed fl-fix to fl-clearfix to avoid scrollbars in I7 around Uploaders status area","heidi valles"],["552f4a9946ccf6b47602f8afba8e7a18f7aa37a7","2bd8e9c9c868efe968cc583d2d49f67380967d94@ocad.ca","FLUID-4427: Added the configurable option of the factor to convert px to em.","Cindy Li"],["5b9b1083b57de2d39f6449796f0185ce77792924","15b407793e00661b0f6435a4e2ff8cc57b1b934c@gmail.com","Merge remote-tracking branch 'heidiv/FLUID-4432'\n\n* heidiv/FLUID-4432:\n  FLUID-4432: Changed fl-fix to fl-clearfix to avoid scrollbars in I7 around Uploaders status area","Michelle D'Souza"],["68f69313e7da641032c6fa8bec4ccd15dd2a0f00","ee76976466d2b81240838f3bccb1d70f34ac9b44@colorado.edu","Merge branch 'FLUID-4427'\n\n* FLUID-4427:\n  FLUID-4427: Added the configurable option of the factor to convert px to em.\n  FLUID-4427: Fetch fontSizeMap from that.options rather than the direct access thru fluid.defaults(). Also set font-size in em instead of px.\n  FLUID-4427: Fixed the issue that 'text size' and 'line spacing' are broken in certain version of IE as well as the originally broken UIEnhancer unit test.","Antranig Basman"],["591805538042a922667f3c88a259b19b1eef763b","1b34bffe6b8dd6c929a854cf46c70e06803ab6b4@gmail.com","Merge remote-tracking branch 'heidi/FLUID-4362'\n\n* heidi/FLUID-4362:\n  FLUID-4362: Added fss-base-global to fat panel, for consistency across UIOs, cleaned up styling so aligning preserved when line height and font size changed\n  FLUID-4362: Changed back ground position to percent - icons should now stay centred with any text size","Justin Obara"]],"ref":"refs/heads/master"}