upgrading extjs to 4.2.1
increasing timeouts on security mgmt grids
data migration to add neptune extjs theme preference
Merge branch 'master' into extjs421
adding quantity to order_line_items
Merge branch 'master' into extjs421
Merge branch 'master' into extjs421
Merge branch 'master' into extjs421
Merge branch 'master' into extjs421
fixing configuration is_template validation
Merge branch 'master' of github.com:portablemind/compass_agile_enterprise into extjs421
Merge branch 'master' of github.com:portablemind/compass_agile_enterprise into extjs421
- Add store listeners config to dynamic editable grid builder.
Merge branch 'extjs421' of github.com:portablemind/compass_agile_enterprise into extjs421
Pass database host to pg_dump in rake compass_ae:backup:postgres
use username in database yml
PGPASSWORD
fix
performance improvement for with_instance_security scope
Merge branch 'master' into regression

Conflicts:
	erp_base_erp_svcs/CHANGELOG