Brian Federle b911cd7df5 Merge branch 'master' into ui-install-wizard ...

Conflicts:
	ui/index-test.html
	ui/index.jsp
	ui/scripts-test/system.js
	ui/scripts/ui-custom/installWizard.js

2011-11-11 12:00:56 -08:00

..

accounts.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

cloudStack.js

Update dialog appearance; add UI support for zone network providers

2011-11-11 10:29:27 -08:00

configuration.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

dashboard.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

domains.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

events.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

globalSettings.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

installWizard.js

Add base install wizard scripts

2011-11-11 10:28:58 -08:00

instances.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

network.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

projects.js

Support invitation-based project user management

2011-11-07 12:37:59 -08:00

storage.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

system.js

Merge branch 'master' into ui-install-wizard

2011-11-11 12:00:56 -08:00

templates.js

Add new UI; move old UI to old/

2011-11-03 10:59:57 -07:00

test-data.js

Add embedded table to detail view, for guest network configuration

2011-11-11 11:31:06 -08:00