Rob Harrington
f288c09380
Moving inventory settings to their own section within the enterprise edit form
2016-03-02 12:10:22 +11:00
Rob Harrington
488daed8f3
Translating variant overrides / inventory page
2016-03-02 12:10:22 +11:00
Rob Harrington
f05f88c1cb
Adding global config to allow shop users to only select from inventory variants in OC interface
2016-03-02 12:10:22 +11:00
Rob Harrington
28b143da73
WIP: Splitting Variant overrides into views
2016-03-02 12:10:22 +11:00
Rob Harrington
8f37aa0522
WIP: Adding Loading flash to variant overrides page
2016-03-02 12:10:22 +11:00
Rob Harrington
7008d26f68
WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited
2016-03-02 12:10:22 +11:00
Rob Harrington
f06d909c23
WIP: Adding infrastructure to show/hide variants + overrides using inventory items
2016-03-02 12:10:22 +11:00
Rob Harrington
caa8818f02
Adding option to 'Inherit From Product' for enterprise_fee tax categories
2016-03-02 11:56:46 +11:00
Rob Harrington
a66582a8fb
WIP: Using directive for EnterpriseFee index select elements, to properly bind data to the model
2016-03-02 11:56:46 +11:00
Rob Harrington
0bd9dc7af0
Enterprise Fees: Splitting ng controllers and directives into separate files, reanming module and coffee-ising
2016-03-02 11:56:46 +11:00
Maikel
81ec3fef60
Auto-merged master into products-caching on deployment.
2016-03-02 11:12:40 +11:00
Maikel Linke
7cb64e8804
Merge remote-tracking branch 'origin/master' into groups
2016-03-02 11:12:33 +11:00
Rohan Mitchell
ec55af5b8a
Display products cache integrity checker results on cache settings admin page
2016-03-02 11:05:03 +11:00
elf Pavlik
54ecdb670d
fixed failing i18n test in variant overrides
2016-02-28 19:58:16 +00:00
elf Pavlik
68db9b9926
fixing faling tests
2016-02-28 19:58:03 +00:00
Nicolas Blanc
cb33ede9dc
Revert "elf-pavlik@ee52f1d"
...
This reverts commit a8d7732a39
2016-02-28 19:54:44 +00:00
Nicolas Blanc
a8d7732a39
elf-pavlik@ee52f1d
2016-02-28 19:23:26 +00:00
Maikel Linke
1770cbb6bf
Display footer_email in confirmation emails correctly
...
A bug introduced in a9c37c162e
2016-02-26 16:09:14 +11:00
Nicolas Blanc
4621f625a0
new validation6 02/25/2016
2016-02-25 12:36:21 +00:00
Nicolas Blanc
5e71790cd1
new validation5 02/25/2016
2016-02-25 11:04:21 +00:00
Steve Pettitt
c07fefde1a
Change non-js translations to be done in rails
2016-02-24 20:23:13 +00:00
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
Maikel Linke
4feb7c893b
Introduce contact email address for enterprises
...
Add a new column email_address to enterprises.
Use this new field for public display of contact details.
The old field enterprise.email is still used internally.
It is still displayed on orders and emails sent to customers.
A new enterprise has the owner's email address by default now.
Fix GH #757
2016-02-24 15:14:07 +11:00
Rohan Mitchell
977ff7b35d
Fix compatibility issues with new version of select2
2016-02-24 11:26:37 +11:00
Rohan Mitchell
258e84fc0a
Replace with-tip with ofn-with-tip: misc
2016-02-24 11:26:37 +11:00
Rohan Mitchell
17cda86dfa
Replace with-tip with ofn-with-tip: enterprise groups
2016-02-24 11:26:37 +11:00
Rohan Mitchell
bdd6d3ba6b
Replace with-tip with ofn-with-tip: business model configuration
2016-02-24 11:26:37 +11:00
Rohan Mitchell
d699f8321a
Replace with-tip with ofn-with-tip: dashboard
2016-02-24 11:26:37 +11:00
Rohan Mitchell
b4976a5445
Replace with-tip with ofn-with-tip: enterprise forms
2016-02-24 11:26:37 +11:00
Nicolas Blanc
52d5b8936e
new validation4 02/22/2016
2016-02-22 14:54:31 +00:00
Nicolas Blanc
1738db9e1f
new validation 02/22/2016
2016-02-22 13:00:27 +00:00
Steve Pettitt
f7387048b0
Remove cruft and 2nd active table, to stop constant hover
2016-02-21 12:40:53 +00:00
Nicolas Blanc
614f83799e
new test 2016/02/20
2016-02-20 19:23:22 +00:00
Steve Pettitt
d39b62aa31
Fallback to a default tractor logo if missing
2016-02-20 19:00:37 +00:00
Steve Pettitt
ec3e158781
Merge current master
2016-02-20 17:24:57 +00:00
Steve Pettitt
23e774bede
Styling, fewer columns in small/medium screen, logo resize
2016-02-20 17:20:43 +00:00
Maikel Linke
0cb5dfbbe0
delete old sidebar partials
2016-02-19 16:29:19 +11:00
Maikel Linke
6ba534fb58
Show noticeboard in mobile menu
2016-02-19 15:16:24 +11:00
Maikel Linke
38cac3a3c4
Explicitly referencing main_app.discourse_login_path
...
Fixes #830 .
2016-02-19 11:23:38 +11:00
Maikel Linke
82182d24e7
Merge remote-tracking branch 'origin/master' into discourse-sso
2016-02-19 11:02:59 +11:00
stveep
83d248469f
Running balances
2016-02-16 20:32:09 +00:00
Lynne Davis
2d620071f0
Fxing conflicts
2016-02-11 16:14:44 +00:00
Paul Mackay
50c657133a
Change "&" to "and"
...
There are very few places where ampersands are appropriate.
Minor typo in footer.
2016-02-09 10:01:51 +00:00
Rob Harrington
2ebad800b2
Try again: using :site_meta_description for translation of global site meta description
2016-02-05 14:57:18 +11:00
Rob Harrington
dbe7fbc760
Using :meta_description for translation of global site description
2016-02-05 14:17:42 +11:00
Maikel Linke
eef62d4128
fix hub filter style
2016-02-04 16:34:03 +11:00
Maikel Linke
f5ff5bd5b0
Merge remote-tracking branch 'origin/master' into groups
2016-02-04 16:12:57 +11:00
Maikel Linke
bd19bf5f3c
Refactoring filter selectors
...
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.
For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Steve Pettitt
0ad3d8f351
WIP: styling updates
2016-02-02 23:21:04 +00:00
Nicolas Blanc
2be005d344
i18n from berlin hackathon
2016-01-31 12:16:33 +00:00
