merge cont.
authorStefan Schubert <schubi@suse.de>
Thu, 30 Jun 2011 11:09:43 +0000 (13:09 +0200)
committerStefan Schubert <schubi@suse.de>
Thu, 30 Jun 2011 11:09:43 +0000 (13:09 +0200)
commit77cfe04d8c1a4ec4eea97ca64a39215bcb959c1d
tree957b7a786cf624ff3b26a7215112796a194ea77c
parent327b0a28447034151ac72798dfae934ea61f35d3
merge cont.
186 files changed:
webservice/app/controllers/sessions_controller.rb
webservice/config/routes.rb
webservice/public/404.html
webservice/public/422.html
webservice/public/500.html
webservice/public/apache.htaccess [new file with mode: 0644]
webservice/public/dispatch.cgi
webservice/public/dispatch.rb
webservice/public/favicon.ico
webservice/public/icons/COPYING [new file with mode: 0644]
webservice/public/icons/active_directory.png [new file with mode: 0755]
webservice/public/icons/administrator.png [new file with mode: 0755]
webservice/public/icons/firewall.png [new file with mode: 0755]
webservice/public/icons/groups.png [new file with mode: 0755]
webservice/public/icons/kerberos.png [new file with mode: 0755]
webservice/public/icons/kupdateapplet_green.png [new file with mode: 0644]
webservice/public/icons/kupdateapplet_optional.png [new file with mode: 0644]
webservice/public/icons/kupdateapplet_red.png [new file with mode: 0644]
webservice/public/icons/kupdateapplet_yellow.png [new file with mode: 0644]
webservice/public/icons/ldap.png [new file with mode: 0755]
webservice/public/icons/mail.png [new file with mode: 0755]
webservice/public/icons/monitoring-tango.png [new file with mode: 0644]
webservice/public/icons/monitoring.png [new file with mode: 0644]
webservice/public/icons/network.png [new file with mode: 0755]
webservice/public/icons/permissions.png [new file with mode: 0755]
webservice/public/icons/plugin-icons.png [new file with mode: 0644]
webservice/public/icons/registration-new.png [new file with mode: 0755]
webservice/public/icons/registration.png [new file with mode: 0644]
webservice/public/icons/repositories.png [new file with mode: 0755]
webservice/public/icons/roles.png [new file with mode: 0755]
webservice/public/icons/status.png [new file with mode: 0755]
webservice/public/icons/system-software-install.png [new file with mode: 0644]
webservice/public/icons/system_services.png [new file with mode: 0755]
webservice/public/icons/time.png [new file with mode: 0755]
webservice/public/icons/update2.png [new file with mode: 0755]
webservice/public/icons/updates.png [new file with mode: 0755]
webservice/public/icons/users.png [new file with mode: 0755]
webservice/public/icons/yast-dns-server.png [new file with mode: 0644]
webservice/public/icons/yast-firewall-tango.png [new file with mode: 0644]
webservice/public/icons/yast-firewall.png [new file with mode: 0644]
webservice/public/icons/yast-groups-tango.png [new file with mode: 0644]
webservice/public/icons/yast-groups.png [new file with mode: 0644]
webservice/public/icons/yast-groups_16.png [new file with mode: 0644]
webservice/public/icons/yast-kerberos.png [new file with mode: 0644]
webservice/public/icons/yast-language.png [new file with mode: 0644]
webservice/public/icons/yast-ldap.png [new file with mode: 0644]
webservice/public/icons/yast-mail-server-tango.png [new file with mode: 0644]
webservice/public/icons/yast-mail-server.png [new file with mode: 0644]
webservice/public/icons/yast-network-tango.png [new file with mode: 0644]
webservice/public/icons/yast-network.png [new file with mode: 0644]
webservice/public/icons/yast-ntp-client-tango.png [new file with mode: 0644]
webservice/public/icons/yast-ntp-client.png [new file with mode: 0644]
webservice/public/icons/yast-online_update-tango.png [new file with mode: 0644]
webservice/public/icons/yast-online_update.png [new file with mode: 0644]
webservice/public/icons/yast-permissions-tango.png [new file with mode: 0644]
webservice/public/icons/yast-permissions.png [new file with mode: 0644]
webservice/public/icons/yast-product-registration-tango.png [new file with mode: 0644]
webservice/public/icons/yast-product-registration.png [new file with mode: 0644]
webservice/public/icons/yast-samba-client-tango.png [new file with mode: 0644]
webservice/public/icons/yast-samba-client.png [new file with mode: 0644]
webservice/public/icons/yast-sw_source-tango.png [new file with mode: 0644]
webservice/public/icons/yast-sw_source.png [new file with mode: 0644]
webservice/public/icons/yast-system-files.png [new file with mode: 0644]
webservice/public/icons/yast-system-tango.png [new file with mode: 0644]
webservice/public/icons/yast-system-user-tango.png [new file with mode: 0644]
webservice/public/icons/yast-system-user.png [new file with mode: 0644]
webservice/public/icons/yast-system.png [new file with mode: 0644]
webservice/public/icons/yast-timezone.png [new file with mode: 0644]
webservice/public/icons/yast-update.png [new file with mode: 0644]
webservice/public/icons/yast-users-tango.png [new file with mode: 0644]
webservice/public/icons/yast-users.png [new file with mode: 0644]
webservice/public/icons/yast-users_16.png [new file with mode: 0644]
webservice/public/images/COPYING [new file with mode: 0644]
webservice/public/images/button-gradient.png [new file with mode: 0644]
webservice/public/images/cat-gradient.png [new file with mode: 0644]
webservice/public/images/checked.gif [new file with mode: 0644]
webservice/public/images/checkmark.gif [new file with mode: 0644]
webservice/public/images/circle-gray.png [new file with mode: 0644]
webservice/public/images/circle-green.png [new file with mode: 0644]
webservice/public/images/circle-red.png [new file with mode: 0644]
webservice/public/images/close-g.png [new file with mode: 0644]
webservice/public/images/close.png [new file with mode: 0644]
webservice/public/images/control-panel-home.png [new file with mode: 0644]
webservice/public/images/control-panel-logout.png [new file with mode: 0644]
webservice/public/images/control-panel-user.png [new file with mode: 0644]
webservice/public/images/delete-user.png [new file with mode: 0644]
webservice/public/images/delete.png [new file with mode: 0644]
webservice/public/images/delete2.png [new file with mode: 0644]
webservice/public/images/dialog-warning.png [new file with mode: 0644]
webservice/public/images/edit-icon.png [new file with mode: 0644]
webservice/public/images/fill-gradient.png [new file with mode: 0644]
webservice/public/images/filter.png [new file with mode: 0644]
webservice/public/images/firewall-off-grey.png [new file with mode: 0644]
webservice/public/images/firewall-on-led.png [new file with mode: 0644]
webservice/public/images/firewall-switch-bg.png [new file with mode: 0644]
webservice/public/images/go-bottom2.png [new file with mode: 0755]
webservice/public/images/go-down2.png [new file with mode: 0755]
webservice/public/images/go-top2.png [new file with mode: 0755]
webservice/public/images/go-up2.png [new file with mode: 0755]
webservice/public/images/gradient40-60.png [new file with mode: 0644]
webservice/public/images/gradientx40.png [new file with mode: 0644]
webservice/public/images/gradientx60.png [new file with mode: 0644]
webservice/public/images/green.png [new file with mode: 0644]
webservice/public/images/greenuser.png [new file with mode: 0644]
webservice/public/images/grey.png [new file with mode: 0644]
webservice/public/images/home.png [new file with mode: 0644]
webservice/public/images/info.png [new file with mode: 0644]
webservice/public/images/input-bg.png [new file with mode: 0644]
webservice/public/images/input-gradient.png [new file with mode: 0644]
webservice/public/images/install.png [new file with mode: 0644]
webservice/public/images/key-grey.png [new file with mode: 0644]
webservice/public/images/launcher-pushed.png [new file with mode: 0644]
webservice/public/images/line.png [new file with mode: 0644]
webservice/public/images/loading.gif [new file with mode: 0644]
webservice/public/images/lock.png [new file with mode: 0644]
webservice/public/images/locko.png [new file with mode: 0644]
webservice/public/images/loupe-icon.png [new file with mode: 0644]
webservice/public/images/loupe.png [new file with mode: 0644]
webservice/public/images/passwordstrength.png [new file with mode: 0644]
webservice/public/images/rails.png [deleted file]
webservice/public/images/red.png [new file with mode: 0644]
webservice/public/images/reset-search.png [new file with mode: 0644]
webservice/public/images/search-gradient.png [new file with mode: 0644]
webservice/public/images/services.png [new file with mode: 0644]
webservice/public/images/spinner.gif [new file with mode: 0644]
webservice/public/images/status-warning.png [new file with mode: 0644]
webservice/public/images/stripes-bg.png [new file with mode: 0644]
webservice/public/images/tab-header.png [new file with mode: 0644]
webservice/public/images/tipsy.gif [new file with mode: 0644]
webservice/public/images/update.png [new file with mode: 0644]
webservice/public/images/user-roles.png [new file with mode: 0644]
webservice/public/images/wait.gif [new file with mode: 0644]
webservice/public/images/warning.png [new file with mode: 0644]
webservice/public/images/webyast-iphone-icon.png [new file with mode: 0644]
webservice/public/images/webyast-logo.png [new file with mode: 0644]
webservice/public/images/working.gif [new file with mode: 0644]
webservice/public/images/yast-config.png [new file with mode: 0644]
webservice/public/images/yui/tree/treeview-loading.gif [new file with mode: 0644]
webservice/public/images/yui/tree/treeview-sprite-menu.gif [new file with mode: 0644]
webservice/public/images/yui/tree/treeview-sprite.gif [new file with mode: 0644]
webservice/public/stylesheets/css-min.css
webservice/public/stylesheets/grid.css [new file with mode: 0644]
webservice/public/stylesheets/ie/ie_fixes.css [new file with mode: 0644]
webservice/public/stylesheets/images/bg-head-gradient-grey.png [new file with mode: 0644]
webservice/public/stylesheets/images/bg-head-gradient.png [new file with mode: 0644]
webservice/public/stylesheets/images/bug.png [new file with mode: 0644]
webservice/public/stylesheets/images/button-bg-rollover-gradient.png [new file with mode: 0644]
webservice/public/stylesheets/images/button-bg-rollover.gif [new file with mode: 0644]
webservice/public/stylesheets/images/gradient-light-short.png [new file with mode: 0644]
webservice/public/stylesheets/images/spinner.gif [new file with mode: 0644]
webservice/public/stylesheets/images/status-imagemap.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-bg_glass_75_ffffff_1x400.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-bg_highlight-soft_75_cccccc_1x100.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-icons_222222_256x240.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-icons_2e83ff_256x240.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-icons_454545_256x240.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-icons_888888_256x240.png [new file with mode: 0644]
webservice/public/stylesheets/images/ui-icons_cd0a0a_256x240.png [new file with mode: 0644]
webservice/public/stylesheets/jquery-ui-1.7.2.custom.css [new file with mode: 0644]
webservice/public/stylesheets/jquery.jqplot.css [new file with mode: 0644]
webservice/public/stylesheets/new_inputs.css [new file with mode: 0644]
webservice/public/stylesheets/slidernav.css [new file with mode: 0644]
webservice/public/stylesheets/tipsy.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-administrator.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-controlpanel.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-firewall.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-forms.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-mail.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-modal-dialog.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-network.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-online-help.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-plugin-toolbar.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-repositories.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-roles.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-services.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-software.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-status.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-time.css [new file with mode: 0644]
webservice/public/stylesheets/webyast-users.css [new file with mode: 0644]
webservice/public/stylesheets/yast.css [new file with mode: 0644]