Brian Federle 7b011e7ef4 Merge branch 'master' into ui-vm-affinity ...

Conflicts:
	client/WEB-INF/classes/resources/messages.properties
	ui/scripts/cloudStack.js
	ui/scripts/instanceWizard.js

2013-04-22 13:45:29 -07:00

..

css

Merge branch 'master' into ui-vm-affinity

2013-04-22 13:45:29 -07:00

images

Install wizard logo text: lighten trademark text to match color

2013-02-28 15:11:30 -08:00

lib

Add plugin loading functionality and basic framework

2012-12-19 15:47:25 -08:00

modules

Add UI 'module' API

2013-04-18 12:52:55 -07:00

plugins

rat: Fix license for file from recent ui-plugins merge

2013-02-14 17:18:22 +05:30

scripts

Merge branch 'master' into ui-vm-affinity

2013-04-22 13:45:29 -07:00

tests

License header updates for the UI folder

2012-08-03 12:45:47 -04:00

dictionary.jsp

Update affinity UI labels

2013-04-15 14:56:23 -07:00

index.jsp

Merge branch 'master' into ui-vm-affinity

2013-04-22 13:45:29 -07:00