Maikel Linke 68f3d0951a Merge branch 'groups' into indicate-required-fields-for-new-enterprise-form ...

Conflicts:
	app/views/admin/enterprises/_new_form.html.haml

2016-02-24 15:36:25 +11:00

..

account

Formatting dates for account invoices in rails time zone

2015-12-17 11:34:06 +11:00

accounts_and_billing_settings

Using date and time of current timezone

2015-12-10 11:38:41 +11:00

business_model_configuration

Replace with-tip with ofn-with-tip: business model configuration

2016-02-24 11:26:37 +11:00

contents

Admin can upload logo for ContentConfig

2015-07-17 16:06:49 +10:00

customers

Pulling bulk actions dropdown out into partial

2016-01-13 18:49:33 +11:00

enterprise_fees

EnterpriseFee admin interface allows selecting no fee

2015-03-16 14:05:04 +11:00

enterprise_groups

Replace with-tip with ofn-with-tip: enterprise groups

2016-02-24 11:26:37 +11:00

enterprise_relationships

updating relationship spec

2015-06-12 19:32:56 +10:00

enterprise_roles

Delete specific E2ER in spec

2014-09-11 14:54:51 +10:00

enterprises

Merge branch 'groups' into indicate-required-fields-for-new-enterprise-form

2016-02-24 15:36:25 +11:00

json

Render enterprise relationships JSON with AMS instead of rabl

2014-08-25 13:07:31 +10:00

order_cycles

Replace with-tip with ofn-with-tip: misc

2016-02-24 11:26:37 +11:00

producer_properties

Adding properties tab to admin enterprise edit form

2015-04-02 11:30:32 +11:00

shared

Pulling bulk actions dropdown out into partial

2016-01-13 18:49:33 +11:00

variant_overrides

Fix compatibility issues with new version of select2

2016-02-24 11:26:37 +11:00