Rob Harrington a96cdd5ee7 Merge branch 'master' into line_item_naming ...

Conflicts:
	app/views/admin/order_cycles/edit.html.haml

2015-11-13 09:54:26 +11:00

..

account

Translating words on admin accounts page

2015-09-17 22:38:29 +10:00

accounts_and_billing_settings

Redesignating all references to user_invoices as account_invoices

2015-09-17 22:38:28 +10:00

contents

Admin can upload logo for ContentConfig

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

customers

Fixing layout of customers index

2015-05-14 12:37:55 +10:00

enterprise_fees

EnterpriseFee admin interface allows selecting no fee

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

enterprise_groups

permalink editable

2015-05-28 11:27:40 +10: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

WIP: BOM Refactor, adding for_line_items action to enterprises controller

2015-11-04 15:02:29 +11:00

json

Render enterprise relationships JSON with AMS instead of rabl

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

order_cycles

Merge branch 'master' into line_item_naming

2015-11-13 09:54:26 +11:00

producer_properties

Adding properties tab to admin enterprise edit form

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

shared

Change all global links to www

2015-06-16 14:47:40 +10:00

variant_overrides

Show extended variant name/unit info for admin variant overrides

2015-01-29 15:15:28 +11:00