[PATCH conductor 0/11] Converge-ui gelato/master merge rev1

Jirka Tomasek jtomasek at redhat.com
Tue Jun 5 13:20:03 UTC 2012


This patchset brings converge-ui into master. Patchset reverts reverted gelato branch merge, adds Brian McLaughlin's gelato patches, implements RM 3364, 3368 and partially 3323.

Before you apply onto master, install rubygem-compass and rubygem-compass-960-plugin. Then when you apply the patchset run "git submodule init" and "git submodule update"

0001-Revert-Revert-Merge-branch-gelato.patch
0002-Unified-UI-converge-ui-changes-to-header-footer-usin.patch
0003-Adding-compass-gem-dependancy-and-symbolic-link-for-.patch
0004-converge-ui-meeting-updates.patch
0005-updated-converge-ui-to-latest-version.patch
0006-Added-symlink-for-fonts-removed-fonts-conductor-styl.patch
0007-Finishing-touches-in-converge-ui-integration.patch
0008-Moved-compass-config-file-to-proper-place-removed-un.patch
0009-Removed-Sass-Plugin-scss-compilation-from-developmen.patch
0010-Removed-old-favicon-and-added-new-into-public-images.patch
0011-rpmbuild-changes-added-converge-ui-files-compass-Bui.patch

Jirka



-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Revert-Revert-Merge-branch-gelato.patch
Type: text/x-patch
Size: 4551 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Unified-UI-converge-ui-changes-to-header-footer-usin.patch
Type: text/x-patch
Size: 22206 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0003-Adding-compass-gem-dependancy-and-symbolic-link-for-.patch
Type: text/x-patch
Size: 2859 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0004-converge-ui-meeting-updates.patch
Type: text/x-patch
Size: 1282 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0003.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0005-updated-converge-ui-to-latest-version.patch
Type: text/x-patch
Size: 606 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0004.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0006-Added-symlink-for-fonts-removed-fonts-conductor-styl.patch
Type: text/x-patch
Size: 607748 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0005.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0007-Finishing-touches-in-converge-ui-integration.patch
Type: text/x-patch
Size: 7529 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0006.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0008-Moved-compass-config-file-to-proper-place-removed-un.patch
Type: text/x-patch
Size: 3126 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0007.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0009-Removed-Sass-Plugin-scss-compilation-from-developmen.patch
Type: text/x-patch
Size: 1204 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0008.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0010-Removed-old-favicon-and-added-new-into-public-images.patch
Type: text/x-patch
Size: 3620 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0009.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0011-rpmbuild-changes-added-converge-ui-files-compass-Bui.patch
Type: text/x-patch
Size: 5847 bytes
Desc: not available
URL: <https://lists.fedorahosted.org/pipermail/aeolus-devel/attachments/20120605/5278bc3c/attachment-0010.bin>


More information about the aeolus-devel mailing list