raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 453 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
142e1d6d9a Report outputs rules as array for use by OrderGrouper 2015-07-23 10:46:20 +10:00
Rohan Mitchell
1d39fb4438 Report rules can define a summary row 2015-07-23 10:37:47 +10:00
Rohan Mitchell
07eb857a8d Report can define nested rules 2015-07-23 10:24:10 +10:00
Rohan Mitchell
66f64fc413 Report can define basic rules 2015-07-23 10:08:38 +10:00
Rohan Mitchell
c7a1ca29f4 Report can define and retrieve columns 2015-07-23 09:52:59 +10:00
Rohan Mitchell
0a5e8fe629 Report class can define and retrieve header 2015-07-23 09:36:09 +10:00
Rohan Mitchell
61a39ea82f Cherry-pick 00927f7: Refactoring to move bulk out of reports_controller_decorator 2015-07-22 15:25:12 +10:00
Rohan Mitchell
eabf792238 Amend changes to readme 2015-07-22 13:25:55 +10:00
Myriam
c15e281286 Add command cd openfoodnetwork 
Just added the command to go into the openfoodnetwork folder before bundle install
 2015-07-19 12:39:51 +02:00
Myriam
5f0766cb75 When installing the gems we had only 1.9.2, there were an imprecision with >=1.9.3 or 1.9.x 2015-07-19 12:37:23 +02:00
Myriam
3a0c5bf0c3 I changed the "Get it" link as the git@ one was reserved to people with access rights 2015-07-19 12:09:20 +02:00
Rohan Mitchell
61435b2dea Add brand guide colours next to definition 2015-07-17 17:05:44 +10:00
Rohan Mitchell
b6892c82f1 Rename australia-orange sass var to country-agnostic brand-colour 2015-07-17 16:27:17 +10:00
Rohan Mitchell
5fd3dc1d28 Customise footer logo 2015-07-17 16:24:07 +10:00
Rohan Mitchell
bb3a4170f5 Add dimensions to image upload 2015-07-17 16:06:50 +10:00
Rohan Mitchell
74f90dada3 Allow overriding mobile logo (raster and SVG) and home hero image 2015-07-17 16:06:50 +10:00
Rohan Mitchell
e4a4cdd915 Rewrite alias_method_chain to use super. Ahhhhh :) 2015-07-17 16:06:50 +10:00
Rohan Mitchell
66b4eb4c5d Move Spree::Preferences::Configuration patches into superclass FileConfiguration 2015-07-17 16:06:50 +10:00
Rohan Mitchell
1d67e3b2b8 Fix image update, display logo on frontend 2015-07-17 16:06:50 +10:00
Rohan Mitchell
0e67a116b6 Admin can upload logo for ContentConfig 2015-07-17 16:06:49 +10:00
Rohan Mitchell
1234b35199 Add file handling to Spree::Preferences::Configuration 2015-07-17 16:06:49 +10:00
Rohan Mitchell
1b17a7fb35 Add logo field to ContentConfig 2015-07-17 16:06:49 +10:00
Rohan Mitchell
4887871474 Remove SVG TODOs - we'll ask admins to upload double-sized images for retina instead 2015-07-17 16:06:49 +10:00
Rohan Mitchell
372b17703a Remove unused content fields and partial 2015-07-17 16:06:49 +10:00
Rohan Mitchell
5de9a5eb54 Add config setting to enable/disable stats on home page 2015-07-17 16:06:49 +10:00
Rohan Mitchell
1f72e4001c Use site name config for hero title 2015-07-17 16:06:49 +10:00
Rohan Mitchell
bd83dde89d Content manage group signup page 2015-07-17 16:06:49 +10:00
Rohan Mitchell
a490d9696b Content manage hub signup page 2015-07-17 16:06:49 +10:00
Rohan Mitchell
d353906bb8 Content manage producer signup page 2015-07-17 16:06:49 +10:00
Continuous Integration
858a613ba2 Auto-merge from CI [skip ci] 2015-07-17 11:48:16 +10:00
Rohan Mitchell
2ef0196200 Merge branch 'add-to-cart-robustness' into combined/vo-on-demand-stock-control_add-to-cart-robustness 2015-07-16 10:06:34 +10:00
Rohan Mitchell
f3ae812f2b Update cart when max_quantity value changes, not just quantity 2015-07-16 10:05:19 +10:00
Rohan Mitchell
904a3a5bd4 When add to cart fails, retry every 3 seconds, with no limit of the number of retries 2015-07-16 10:05:19 +10:00
Rohan Mitchell
de7f3a9e5c When an on-demand variant has overridden stock levels, make it not on-demand 2015-07-16 10:05:07 +10:00
Rohan Mitchell
7424e93133 Merge branch 'proximity-search' 2015-07-15 17:31:22 +10:00
Lynne Davis
f21f57a42c Additions for packing reports, sans refactoring 2015-07-15 14:44:49 +10:00
Lynne Davis
dc95167f15 Adding bits missed from the last commit. 
Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
 2015-07-15 14:44:49 +10:00
Lynne Davis
c168dec14b Adding packing reports as required by the UK contingent 2015-07-15 14:44:49 +10:00
Rohan Mitchell
28b8e0b0c8 Update distance matches when filter settings change 2015-07-10 17:45:17 +10:00
Rohan Mitchell
0ab75fe2ea Take the first name match from the post-filter results to avoid matching off a result the user can't see 2015-07-10 17:45:17 +10:00
Rohan Mitchell
669c9911fe Fix profile display 2015-07-10 17:45:17 +10:00
Rohan Mitchell
6e6d2566d9 Do not show distance when zero 2015-07-10 17:45:16 +10:00
Rohan Mitchell
6816df5f72 Do not show 'Closest to...' heading when no query entered 2015-07-10 17:45:16 +10:00
Rohan Mitchell
5b93ac2ae1 Remove unneeded injections, consistent spacing 2015-07-10 17:45:16 +10:00
Rohan Mitchell
dcf98ee29f Fix enterprises no results for producers 2015-07-10 17:45:16 +10:00
Rohan Mitchell
7d340d5084 Update taxon search to only display taxons from enterprises on the page 2015-07-10 17:45:16 +10:00
Rohan Mitchell
0eb6d9aaed Disable animate-repeat on shops listing entirely - previous fix was not 100% successful 2015-07-10 17:45:16 +10:00
Rohan Mitchell
d8dfb5b5ee Move most filters back out into view - they now respond to filter preference changes 2015-07-10 17:45:16 +10:00
Rohan Mitchell
07e6a204f3 Do not bindonce ng-repeat, remove translateZ(0) optimisation - address dangling DOM nodes after ng-repeat finishes. 
https://github.com/angular/angular.js/issues/4490
 2015-07-10 17:45:16 +10:00
Rohan Mitchell
06c5ffb427 Wrap geocode callback in ., fixing inconsistent updates 2015-07-10 17:45:16 +10:00