Steve Pettitt
4438cbd5d0
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-30 19:53:53 +00:00
Steve Pettitt
ec6b0f873e
style credit/debit, spec updates
2016-01-30 19:53:37 +00:00
Steve Pettitt
92d830b884
Table styling
2016-01-30 17:56:04 +00:00
Steve Pettitt
ccd66bba9c
Credit/debit formatting, use filters for money formatting, use full page width for table
2016-01-28 22:42:45 +00:00
Maikel
3dd3cfa7ec
Auto-merged master into uk/account-balances on deployment.
2016-01-25 04:43:25 +11:00
Maikel Linke
1f1b0bd783
styling groups blurb
2016-01-22 16:20:07 +11:00
Maikel Linke
d562f6537e
Cleaner opengraph meta tags
2016-01-20 15:42:01 +11:00
Maikel Linke
d5aea1b00d
Taxon filter for group producers
2016-01-20 13:32:08 +11:00
Maikel Linke
fd9de730c8
group producer style adjustment
2016-01-20 13:32:08 +11:00
Rohan Mitchell
07d691fc97
Only apply cart scrolling to non-mobile devices
2016-01-15 16:54:56 +11:00
Maikel
eeb31f65c3
Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.
2016-01-15 16:15:09 +11:00
Rohan Mitchell
046d0f0d19
Merge branch 'preserve-max-quantity' into combined/cart-fit-to-screen_preserve-max-quantity
2016-01-15 16:07:25 +11:00
ludivinecp
a611e73bed
Opengraph facebook: images and description for shops and groups and home => ok
2016-01-15 14:03:33 +11:00
Rob Harrington
669642292b
Refactoring VariantOverridesController#bulk_reset to only reset VOs for a specified hub
2016-01-15 09:07:51 +11:00
stveep
ecf1aac5cb
Added failure message to VO reset
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
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
4553bc2997
Moving SaveBar directive and StatusMessage service into admin.utils module
2016-01-13 18:49:33 +11:00
Rob Harrington
521f227f74
Adding sku and on_demand to VariantOverride
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
Rob Harrington
f11e878e7f
WIP: Reorganising variant overrides javascript files
2016-01-13 18:49:31 +11:00
Maikel
68e2b9a0b9
Auto-merged master into preserve-max-quantity on deployment.
2016-01-13 16:57:31 +11:00
Rohan Mitchell
406338ea05
Remove cruft
2016-01-13 16:45:14 +11:00
Rohan Mitchell
2c3ff37980
Split order cycles controller into parts
2016-01-13 16:45:03 +11:00
Maikel
826d045532
Auto-merged master into cart-fit-to-screen on deployment.
2016-01-13 16:12:41 +11:00
Rohan Mitchell
a07eabca55
Fit cart to screen and allow scrolling so we can always access all of it
2016-01-13 16:00:43 +11:00
Maikel Linke
1cfb5a7feb
Merge branch 'master' of https://github.com/blancnic/openfoodnetwork into blancnic-master
2016-01-13 15:06:11 +11:00
Nicolas Blanc
770a8d0b17
#771-minor-bug-on-Firefox
...
Z-index:1 solved problem on Firefox. It works on Chrome too.
2016-01-10 09:54:35 +01:00
Steve Pettitt
262a8e75f9
slugs
2016-01-10 07:58:04 +00:00
Rohan Mitchell
71569324f4
Serialise cart updates - do not submit another until the previous has completed
2016-01-07 13:53:37 +11:00
stveep
da0810382b
Sorting by most orders, currency symbol, hide until clicked, reformatting table headers
2015-12-21 22:19:00 +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
knopfler81
ed48b691e1
translations in app/assets/javascripts/admin
2015-12-21 10:11:08 +01:00
Emmanuel
30141bd488
few translations in app/assets/javascripts/admin/
2015-12-21 10:11:08 +01:00
victor goutay
e16e3fba40
translations in app/assets/javascripts/admin/
2015-12-21 10:11:08 +01:00
ludivinecp
69ab113201
translations in app/assets/javascripts/admin/
2015-12-21 10:11:07 +01:00
Florian Vallen
7192f12a49
first js translation for admin interface
2015-12-21 10:11:07 +01:00
Florian Vallen
ec6962ea2c
Implements i18n translation for admin interface
...
it takes the i18n.js files from darkswarm.
This should be changed later and added to the
shared js folder.
At best, the namespacing for yml files should work
just as they work together with ruby, so
general:
sure: sure?
should point to t(general.sure)
2015-12-21 10:11:07 +01:00
