Maikel Linke
|
ea796d4f94
|
Taxon filter for group hubs
|
2016-01-20 13:32:08 +11:00 |
|
Maikel Linke
|
d5aea1b00d
|
Taxon filter for group producers
|
2016-01-20 13:32:08 +11:00 |
|
ludivinecp
|
a611e73bed
|
Opengraph facebook: images and description for shops and groups and home => ok
|
2016-01-15 14:03:33 +11:00 |
|
Maikel Linke
|
f68f7ea2b6
|
Fix display of "Total"
|
2016-01-15 12:07:43 +11:00 |
|
Maikel
|
ddf6eef370
|
Auto-merged master into ng-vo-inventory-reset on deployment.
|
2016-01-15 09:21:54 +11:00 |
|
Rob Harrington
|
9979e31220
|
Final tidy up after rebasing default_inventory and ng-vo onto origin/master
Fixes a few VO feature specs and a few interface tweaks
|
2016-01-15 09:07:51 +11:00 |
|
Rob Harrington
|
0bbae19b41
|
Variant Overrides Index: User can manually reset inheritance
|
2016-01-15 09:07:51 +11:00 |
|
Rob Harrington
|
607a66b6c6
|
WIP: Fixing a few broken VO specs
|
2016-01-15 09:07:50 +11:00 |
|
Steve Pettitt
|
e423e890e0
|
Changed name enable_reset to resettable in Variant Overrides table & updated views, specs accordingly
|
2016-01-15 09:07:50 +11:00 |
|
Steve Pettitt
|
25454d3e97
|
Added new fields to fix VO deletion feature specs
|
2016-01-15 09:07:49 +11:00 |
|
Steve Pettitt
|
0ee078e232
|
Added toggle to enable/disable reset stock. Updated specs
|
2016-01-15 09:07:48 +11:00 |
|
Steve Pettitt
|
34c603a9c3
|
Added angular service tests for variant overrides stock reset
|
2016-01-15 09:07:48 +11:00 |
|
Rob Harrington
|
53d97dab08
|
WIP: Adding view and routes for resetting variant_overrides count_on_hand
|
2016-01-15 09:07:48 +11:00 |
|
Continuous Integration
|
e070168c4a
|
Auto-merge from CI [skip ci]
|
2016-01-15 03:30:02 +11:00 |
|
Rob Harrington
|
cc4dc068ab
|
Adding variant SKU field to BPE
|
2016-01-13 18:49:34 +11:00 |
|
Rob Harrington
|
64cd52e067
|
Adding SKU and on demand to a few VO specs
|
2016-01-13 18:49:34 +11:00 |
|
Rob Harrington
|
521f227f74
|
Adding sku and on_demand to VariantOverride
|
2016-01-13 18:49:33 +11:00 |
|
Rob Harrington
|
cab6871de3
|
Pulling bulk actions dropdown out into partial
|
2016-01-13 18:49:33 +11:00 |
|
Rob Harrington
|
7cd8f35ac8
|
Tidying up styling and use of skeleton columns on index pages
|
2016-01-13 18:49:33 +11:00 |
|
Rob Harrington
|
2b70ddb23c
|
Adding columns toggle to variant overrides index
|
2016-01-13 18:49:33 +11:00 |
|
Rob Harrington
|
9eaec6061e
|
Pulling columns dropdown out into a shared partial
|
2016-01-13 18:49:32 +11:00 |
|
Rob Harrington
|
54e7677888
|
Integrating StatusMessages into save-bar, adding to variant overrides index
|
2016-01-13 18:49:32 +11:00 |
|
Rob Harrington
|
c781113a65
|
Adding filters to variant overrides interface
|
2016-01-13 18:49:32 +11:00 |
|
Rob Harrington
|
4237a83028
|
Moving components required for variant overrides into appropriate modules
|
2016-01-13 18:49:32 +11:00 |
|
Steve Pettitt
|
f5db1cd921
|
Images, first attempt at column formatting
|
2016-01-10 15:53:14 +00:00 |
|
Steve Pettitt
|
262a8e75f9
|
slugs
|
2016-01-10 07:58:04 +00:00 |
|
stveep
|
81b688f0e8
|
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
|
2016-01-07 13:26:13 +00:00 |
|
stveep
|
698d36180d
|
Move query from injector to User instance method
|
2016-01-07 13:25:15 +00:00 |
|
Maikel Linke
|
217fa9a57c
|
UI integration of Discourse login
|
2016-01-07 19:01:09 +11:00 |
|
Christian
|
839bf8794f
|
Fix a hard cocded string on Order summary screen
Created an order_pickup_time entry in locale files.
|
2016-01-07 07:06:26 +01:00 |
|
Christian
|
823a6bff5b
|
Use config to get logo in mails
Use ContentConfig.footer_logo to get localized logo file instead of
defaut AUS logo.
|
2015-12-24 11:31:47 +11:00 |
|
stveep
|
f9435a3c34
|
Starting i18n
|
2015-12-23 14:39:56 +00:00 |
|
stveep
|
59adf88cad
|
Feature spec
|
2015-12-22 22:59:07 +00:00 |
|
stveep
|
da0810382b
|
Sorting by most orders, currency symbol, hide until clicked, reformatting table headers
|
2015-12-21 22:19:00 +00:00 |
|
stveep
|
90e627ad60
|
Data manipulation and balance calc in rails instead
|
2015-12-21 17:40:36 +00:00 |
|
stveep
|
7e50cc9ce8
|
Data organisation in angular, basic table structure and balance calculation.
|
2015-12-21 14:12:38 +00:00 |
|
elf Pavlik
|
2a4f3f9ae4
|
making test pass
|
2015-12-21 10:11:08 +01:00 |
|
elf Pavlik
|
8a390dd237
|
fixing test failing after i18n changes
|
2015-12-21 10:11:07 +01:00 |
|
julienFR88
|
5290d0be6b
|
add translation in /cache/code/ofn/openfoodnetwork/app/views/spree/admin
|
2015-12-21 10:11:07 +01:00 |
|
Edem
|
6cd7fbb455
|
all string translated in admin bulk orders management
|
2015-12-21 10:11:07 +01:00 |
|
Edem
|
8ccf527e01
|
all strings in app/views/spree/admin/overview/* translated!
|
2015-12-21 10:11:06 +01:00 |
|
Edem
|
d2ec4fcf88
|
Everything string translated in admin/entreprise_relationships
|
2015-12-21 10:11:06 +01:00 |
|
julienFR88
|
8fa293f561
|
my admin interface translations
|
2015-12-21 10:10:58 +01:00 |
|
apprenti
|
b58306aad8
|
my first translations
|
2015-12-21 09:47:18 +01:00 |
|
Edem
|
2a2f8f3531
|
admin entreprise_group are translated!
|
2015-12-21 09:47:18 +01:00 |
|
stveep
|
16ab8f04c3
|
Angularise /account page: Order service/controller, rough layout
|
2015-12-18 17:06:04 +00:00 |
|
Rob Harrington
|
7a23f671a2
|
Restricting access to orders within Sales Tax Report
Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for
|
2015-12-17 14:21:30 +11:00 |
|
Rob Harrington
|
d115eb816e
|
Restricting access to orders within Xero Invoices Report
Managers of suppliers should not be able to generate xero invoices for orders they supply products for
|
2015-12-17 14:21:30 +11:00 |
|
Rob Harrington
|
e0da49e4df
|
Formatting dates for account invoices in rails time zone
|
2015-12-17 11:34:06 +11:00 |
|
Rob Harrington
|
b004060679
|
Printing invoices doesn't fail when order has no order cycle
|
2015-12-17 11:33:18 +11:00 |
|