[seam-commits] [seam/faces] cebcad: merge inputContainers

Branch: refs/heads/master Home: https://github.com/seam/faces Commit: cebcadb1b767a1930fb49955071d1ad7c72f0aae https://github.com/seam/faces/commit/cebcadb1b767a1930fb49955071d1ad7c72f... Author: joserodolfofreitas <joserodolfo.freitas(a)gawab.com&gt; Date: 2011-05-24 (Tue, 24 May 2011) Changed paths: M impl/src/main/resources/META-INF/resources/components/seamfaces/inputContainer.xhtml Log Message: ----------- merge inputContainers Commit: 55dcc421573833ce11a6fadbbb22596950a925e8 https://github.com/seam/faces/commit/55dcc421573833ce11a6fadbbb22596950a9... Author: joserodolfofreitas <joserodolfo.freitas(a)gawab.com&gt; Date: 2011-05-24 (Tue, 24 May 2011) Changed paths: M impl/src/main/resources/META-INF/resources/components/seamfaces/inputContainer.xhtml Log Message: ----------- merged some conflicts Commit: c54e956b5be453e3120acf1e77e38fe7258ce0c2 https://github.com/seam/faces/commit/c54e956b5be453e3120acf1e77e38fe7258c... Author: joserodolfofreitas <joserodolfo.freitas(a)gawab.com&gt; Date: 2011-05-24 (Tue, 24 May 2011) Changed paths: M impl/src/main/resources/META-INF/resources/components/seamfaces/inputContainer.xhtml Log Message: ----------- code formatted with standards Commit: f1a0e0a0666c690001a6c7eb94683b4cd3b5e14f https://github.com/seam/faces/commit/f1a0e0a0666c690001a6c7eb94683b4cd3b5... Author: joserodolfofreitas <joserodolfo.freitas(a)gawab.com&gt; Date: 2011-05-24 (Tue, 24 May 2011) Changed paths: A api/src/main/java/org/jboss/seam/faces/component/UIFacetInputContainer.java A impl/src/main/resources/META-INF/resources/components/seamfaces/facetInputContainer.xhtml Log Message: ----------- SEAMFACES-93 - I created a new ui component to replace UIInputContainer using a facetInputContainer while there're bugs on JSF composite components Commit: 07d6e949372383f244b70b2252f8124cb8dd0653 https://github.com/seam/faces/commit/07d6e949372383f244b70b2252f8124cb8dd... Author: joserodolfofreitas <joserodolfo.freitas(a)gawab.com&gt; Date: 2011-05-24 (Tue, 24 May 2011) Changed paths: M docs/reference/src/main/docbook/en-US/faces-components.xml Log Message: ----------- SEAMFACES-93 - documentation about the new component build to fill the need created by jsf bug. Commit: eff5c1920776da427dee6ff1ac344afac96421f4 https://github.com/seam/faces/commit/eff5c1920776da427dee6ff1ac344afac964... Author: joserodolfofreitas <joserodolfo.freitas(a)gawab.com&gt; Date: 2011-05-24 (Tue, 24 May 2011) Changed paths: M impl/src/main/resources/META-INF/resources/components/seamfaces/inputContainer.xhtml Log Message: ----------- finished merging conflicts in inputContainer Commit: 37ec843de2b1fb68061fc98a18c12a1b52750151 https://github.com/seam/faces/commit/37ec843de2b1fb68061fc98a18c12a1b5275... Author: Brian Leathem <bleathem(a)gmail.com&gt; Date: 2011-05-24 (Tue, 24 May 2011) Changed paths: A api/src/main/java/org/jboss/seam/faces/component/UIFacetInputContainer.java M docs/reference/src/main/docbook/en-US/faces-components.xml A impl/src/main/resources/META-INF/resources/components/seamfaces/facetInputContainer.xhtml M impl/src/main/resources/META-INF/resources/components/seamfaces/inputContainer.xhtml Log Message: ----------- Merge pull request #33 from joserodolfofreitas/master seamfaces-93 bugfix Compare: https://github.com/seam/faces/compare/ef6f9fe...37ec843