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
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
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
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
Maikel Linke
c4b0245399
Merge branch 'master' of https://github.com/marito59/openfoodnetwork into marito59-master
2016-01-13 16:07:21 +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
Steve Pettitt
f5db1cd921
Images, first attempt at column formatting
2016-01-10 15:53:14 +00: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
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
Rohan Mitchell
037c524df2
Preserve max quantity when reloading shopfront
2016-01-07 16:35:54 +11:00
Rohan Mitchell
71569324f4
Serialise cart updates - do not submit another until the previous has completed
2016-01-07 13:53:37 +11:00
Maikel Linke
030f4f63ed
SingleSignOn controller with routes and config
2016-01-07 12:58:30 +11:00
Rohan Mitchell
257b5a9eef
Move premature Spree::Order#update prevention up a level, for even greater efficiency gains
2016-01-07 12:09:57 +11:00
Rohan Mitchell
e24027a8d0
Speed up add to cart: Update the order once per fee calculation, rather than for every line item x fee
2016-01-07 10:52:36 +11:00
stveep
6992d66202
Add payments data, reformat dates
2016-01-01 09:37:21 -05: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
48896ab3d8
More serializer specs
2015-12-22 15:09:24 +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
Emmanuel
5e081ce3ee
Translations of validation messages in app/models
2015-12-21 10:11:08 +01: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
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
