raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,970 Commits 21 Branches 450 Tags
cdfaf4fc92b4a4594de97d03e4ef47c9eeae6b20
Commit Graph

1970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Marshall
b6590000a4 Improving Product's has_stock, filtering Shop#products to in_stock products 2014-01-17 14:41:15 +11:00
Rob H
cfbf4d5bc4 Adding attributes to Order Managment API 2014-01-17 10:35:40 +08:00
Will Marshall
6f5ff0ab2c Making a light grey option 2014-01-16 16:49:50 +11:00
Will Marshall
939b216c12 Changing text to N/A 2014-01-16 16:31:46 +11:00
Will Marshall
dac287f67a Removing distributors and farmers, curse them 2014-01-16 16:28:10 +11:00
Will Marshall
b6d796e3bc Getting in ze test for previous commit 2014-01-16 16:25:41 +11:00
Rob H
4e9ae7549e Add sub menu to Orders menu item in admin view, add 'Bulk Order Management' page 2014-01-16 13:20:07 +08:00
Rob H
031414a41f Make BPE menu tab selected 2014-01-16 13:18:28 +08:00
Will Marshall
d68551c6eb Patching an issue with quantity fields showing for products with variants 2014-01-16 16:09:03 +11:00
Will Marshall
cbce5958e0 Removing an attr_accessible which breaks EVERYTHING 2014-01-16 15:47:38 +11:00
Will Marshall
0ddef9626e First working image upload for enterprise logos 2014-01-16 15:47:38 +11:00
Rob H
11499178cb Set up API for Bulk Order Management (BOM) 2014-01-16 11:56:11 +08:00
Rohan Mitchell
d861495d7d Fix incomplete save when first setting variant_unit 2014-01-16 14:20:26 +11:00
Rohan Mitchell
1ebfea9c76 Require uglifier, should fix asset precompilation 2014-01-16 14:16:45 +11:00
Will Marshall
cdd64d438a Adding another trivial sort to a test 2014-01-16 13:23:57 +11:00
Will Marshall
1a1057b824 Removing unhelpful gem 2014-01-16 13:04:44 +11:00
Will Marshall
35cc113aca Fixing the checkout spec to conform to reply_to instead of from on mailer 2014-01-16 13:04:26 +11:00
Rohan Mitchell
7d224fb5ac Update js compressor for staging as well as production 2014-01-16 12:06:00 +11:00
Rohan Mitchell
38a20e4a8c Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4 2014-01-16 12:05:43 +11:00
Will Marshall
26a8daed0e Patching up the order mailer to set reply_to 2014-01-16 11:39:10 +11:00
Will Marshall
d4d2482927 Adding ng-min 2014-01-16 11:24:53 +11:00
Rob H
ce5b24a777 Prevent duplicate filters being added 2014-01-15 15:50:41 +08:00
Rob H
8146301b2f Add validation to BPE advanced filter box 2014-01-15 14:35:46 +08:00
Rohan Mitchell
29235cd2cb Merge branch 'master' into product-amount-units 
Conflicts:
	app/assets/javascripts/admin/bulk_product_update.js.coffee
	spec/spec_helper.rb
 2014-01-14 15:34:05 +11:00
Rohan Mitchell
7bbf2037e8 Add commented out option for remote debugging via poltergeist 2014-01-14 15:15:09 +11:00
Rohan Mitchell
68e5de0290 Update acceptance specs to expect unit values to be stored in base units 2014-01-14 15:14:54 +11:00
Rohan Mitchell
d0d0fc1a06 Fix intermittently failing spec - comparison of slightly differing dates 2014-01-14 11:47:56 +11:00
Rohan Mitchell
a30e46d747 Do not delete variant options_text when saving/refreshing products 2014-01-14 11:40:58 +11:00
Rohan Mitchell
9442b7b5dc On save, scale from chosen unit to base unit (eg. mL to L) 2014-01-14 11:13:19 +11:00
Rohan Mitchell
c43b56f3f8 On load, scale from base unit to chosen unit (eg. g to kg) 2014-01-14 10:16:21 +11:00
Rohan Mitchell
22ec6aa852 Add comment 2014-01-10 15:59:38 +11:00
Rohan Mitchell
28c641a932 Remove redundant test stubs 2014-01-10 15:44:16 +11:00
Rohan Mitchell
9c28b5baae Fix product lists not matching when saving changes to product unit+values fields 2014-01-10 15:43:45 +11:00
Rob H
aff35e5749 Remove unused toggle-column-list directive 2014-01-10 01:08:03 +08:00
Rob H
29ba0ccc97 Initialise BPE page with 'Available On' column hidden 2014-01-10 00:46:42 +08:00
Rob H
ee2da3e008 Toggle new view controls on BPE 2014-01-10 00:26:54 +08:00
Rohan Mitchell
a60c9a9cea When variant already has a value set, remove old option value and assign a new one 2014-01-09 14:11:54 +11:00
Rohan Mitchell
c396c2a21f Improve speed of BPE specs 2014-01-09 12:37:43 +11:00
Rohan Mitchell
420ff37562 Provide explicit ordering for intermittently failing spec 2014-01-09 12:09:50 +11:00
Rohan Mitchell
cbe46bffed Merge branch 'bpe_paginate' 
Conflicts:
	config/ng-test.conf.js
 2014-01-09 12:07:42 +11:00
Rohan Mitchell
8f479868b4 Fix js test errors - foundation not found, but not reqd for testing angular 2014-01-09 11:44:03 +11:00
Rohan Mitchell
e35eccca93 Revert 3b3815a 6c5539a 39c2803 - remove non-mangling js compression which breaks build 2014-01-09 11:18:54 +11:00
Rohan Mitchell
3b3815a09d Require uglifier, should fix asset precompilation 2014-01-09 09:35:29 +11:00
Rohan Mitchell
6c5539a1da Update js compressor for staging as well as production 2014-01-08 17:25:32 +11:00
Rohan Mitchell
39c2803493 Turn off name mangling to make DI more natural in angular - https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4 2014-01-08 16:45:21 +11:00
Rohan Mitchell
a67cea3fcd Precompile darkswarm css and js 2014-01-08 15:59:09 +11:00
Rob H
ac17502046 Fix test 2014-01-08 12:30:32 +08:00
Will Marshall
533a987684 Uncommenting imgs for Angular, disabling image loading in Poltergeist/Phantom 2014-01-08 15:20:33 +11:00
Rohan Mitchell
c08c42b087 Fix inconsistent test fails - insignificant ordering 2014-01-08 15:11:46 +11:00
Will Marshall
e5514920c8 Fixing up the error messages in our specs 2014-01-08 15:11:23 +11:00