Hey all, Looks like we had a bit of a Friday afternoon mishap with this commit. Nothing big; a directory of temporary files got accidentally committed along with our shiny new version of the UI Options demo.
Here's a quick reminder about a couple of our commit standards: * In bug parade, all pull requests need to be reviewed and pushed by another committer * If possible, try to avoid Github's automatic pull request merging feature in favour of the additional information provided by merging with --log Anastasia, can you spend some time with Justin on Monday morning to back out these changes and then reissue the pull request? We're all super keen to get this new demo in the repository, so I don't think you'll have any trouble finding someone to review it. In the meantime, I expect it will make their job easier if we all hold off from pushing new code to the repository until after the weekend. Thanks, Colin Begin forwarded message: > From: [email protected] > Date: August 12, 2011 2:37:15 PM EDT > To: [email protected] > Subject: [Commits] [fluid-project/infusion] 4db23f: Merge branch 'master' of > github.com:fluid-project/... > > Branch: refs/heads/master > Home: https://github.com/fluid-project/infusion > > Commit: 4db23fe593e83ee32f68f77376df3561b9690002 > > https://github.com/fluid-project/infusion/commit/4db23fe593e83ee32f68f77376df3561b9690002 > Author: Anastasia Cheetham <[email protected]> > Date: 2011-08-12 (Fri, 12 Aug 2011) > > Changed paths: > M src/webapp/framework/core/js/Fluid.js > M src/webapp/framework/core/js/FluidIoC.js > M src/webapp/framework/renderer/js/RendererUtilities.js > M src/webapp/framework/renderer/js/fluidParser.js > M src/webapp/framework/renderer/js/fluidRenderer.js > > Log Message: > ----------- > Merge branch 'master' of github.com:fluid-project/infusion into > FLUID-4351-newUIOContextDemo > > > Commit: c02cacd45cbd71c0456a55a8df3d61e62bb390b2 > > https://github.com/fluid-project/infusion/commit/c02cacd45cbd71c0456a55a8df3d61e62bb390b2 > Author: Anastasia Cheetham <[email protected]> > Date: 2011-08-12 (Fri, 12 Aug 2011) > > Changed paths: > M src/webapp/demos/uiOptions/html/uiOptions.html > > Log Message: > ----------- > FLUID-4351: Minor tweaks to address Heidi's comments. > > > Commit: b2d1be4f1cf7f36e486016bec8ca60433af5180b > > https://github.com/fluid-project/infusion/commit/b2d1be4f1cf7f36e486016bec8ca60433af5180b > Author: Anastasia Cheetham <[email protected]> > Date: 2011-08-12 (Fri, 12 Aug 2011) > > Changed paths: > M src/webapp/demos/index.html > R src/webapp/demos/uiOptions/FatPanelUIOptions/demo.html > R src/webapp/demos/uiOptions/FatPanelUIOptions/html/uiOptions.html > R src/webapp/demos/uiOptions/FatPanelUIOptions/js/fatPanelUIOptions.js > R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptions.css > R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/css/UIOptionsPreview.css > R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/demo.html > R src/webapp/demos/uiOptions/FullNoPreviewUIOptions/html/uiOptions.html > R src/webapp/demos/uiOptions/FullPreviewUIOptions/css/UIOptionsPreview.css > R src/webapp/demos/uiOptions/FullPreviewUIOptions/css/uiOptions.css > R src/webapp/demos/uiOptions/FullPreviewUIOptions/demo.html > R src/webapp/demos/uiOptions/FullPreviewUIOptions/html/UIOptionsPreview.html > R src/webapp/demos/uiOptions/FullPreviewUIOptions/html/uiOptions.html > R > src/webapp/demos/uiOptions/FullPreviewUIOptions/images/500x327_mint_truffle.jpg > R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/border_1.png > R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/expand_collapse.png > R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/h1.png > R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/main_bg.png > R src/webapp/demos/uiOptions/FullPreviewUIOptions/images/mintleaf.png > A src/webapp/demos/uiOptions/css/UIOptionsFullPage.css > A src/webapp/demos/uiOptions/css/uiOptions.css > A src/webapp/demos/uiOptions/demo.html > A src/webapp/demos/uiOptions/fonts/Lato-Black.ttf > A src/webapp/demos/uiOptions/fonts/Lato-Light.ttf > A src/webapp/demos/uiOptions/fonts/Lato-LightItalic.ttf > A src/webapp/demos/uiOptions/fonts/Lato-Regular.ttf > A src/webapp/demos/uiOptions/fonts/LoveYaLikeASister.ttf > A src/webapp/demos/uiOptions/html/.tmp_SomeKindOfNews.html.82053~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptions.html.4603~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptions.html.57809~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptions.html.79675~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptionsFullNoPreview.html.19706~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptionsFullPage.html.34674~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptionsFullPage.html.99158~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptionsFullWithPreview.html.43646~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptionsPreview.html.5247~ > A src/webapp/demos/uiOptions/html/.tmp_uiOptionsPreview.html.98552~ > A src/webapp/demos/uiOptions/html/uiOptions.html > A src/webapp/demos/uiOptions/html/uiOptionsFullWithPreview.html > A src/webapp/demos/uiOptions/html/uiOptionsFullWithoutPreview.html > A src/webapp/demos/uiOptions/html/uiOptionsPreview.html > A src/webapp/demos/uiOptions/images/arrow_left.png > A src/webapp/demos/uiOptions/images/arrow_right.png > A src/webapp/demos/uiOptions/images/background_texture.png > A src/webapp/demos/uiOptions/images/photo_apple.png > A src/webapp/demos/uiOptions/images/photo_orange.png > A src/webapp/demos/uiOptions/js/uiOptions.js > > Log Message: > ----------- > Merge pull request #121 from acheetham/FLUID-4351-newUIOContextDemo > > The new contextual UI Options demo, merging the three demos into one. > > > Compare: https://github.com/fluid-project/infusion/compare/284a423...b2d1be4 > _______________________________________________________ > Commits mailing list - [email protected] > To unsubscribe, change settings or access archives, > see http://lists.idrc.ocad.ca/mailman/listinfo/commits --- Colin Clark Technical Lead, Fluid Project http://fluidproject.org _______________________________________________________ fluid-work mailing list - [email protected] To unsubscribe, change settings or access archives, see http://lists.idrc.ocad.ca/mailman/listinfo/fluid-work
