raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,597 Commits 20 Branches 451 Tags
29235cd2cb415a3936ac4f930eabd8dbcdcaa251
Commit Graph

1597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Will Marshall
e0c352d135 Merge branch 'master' into darkswarm 
Conflicts:
	spec/features/admin/products_spec.rb
 2014-01-08 14:49:47 +11:00
Will Marshall
7838d759ee Removing redundant functionality from the Order Populator 2014-01-08 14:45:40 +11:00
Rohan Mitchell
5f4d787d26 Fix sorting error in spec 2014-01-08 14:43:46 +11:00
Rohan Mitchell
c42d741d3d Remove browse product specs for removed feature 2014-01-08 14:41:06 +11:00
Rohan Mitchell
4a74c2624c Remove specs for removed features 2014-01-08 14:15:06 +11:00
Rohan Mitchell
ea3e697b73 Rename method for clarity, remove outdated specs for OrderPopulator 2014-01-08 14:14:45 +11:00
Rohan Mitchell
20ad906f7a Fix multicart use of OrderPopulator 2014-01-08 14:13:19 +11:00
Rohan Mitchell
dd16934496 Remove redundant serializer spec, reinstate creation of order distribution charges 2014-01-08 13:22:34 +11:00
Rohan Mitchell
4f7fdd430f Update failing controller spec - order needs distributor set 2014-01-08 11:58:53 +11:00
Rohan Mitchell
df53a14d4b Remove specs that are no longer relevant - distribution selection on product page no longer present 2014-01-08 11:51:26 +11:00
Rohan Mitchell
eda4f241e2 Remove add to cart distribution selection, remove distribution change functionality from OrderPopulator, remove now-redundant tests 2014-01-08 11:39:05 +11:00
Rohan Mitchell
30eb11ad84 Allow select_distribution to take no order_cycle 2014-01-08 11:38:21 +11:00
Rohan Mitchell
ef56574d82 Pass quantity to OrderPopulator 2014-01-08 11:37:38 +11:00
Rohan Mitchell
458f91ef91 Add feature spec helper to select distributor and order cycle 2014-01-08 11:31:44 +11:00
Rohan Mitchell
2f98888acd Remove active model serializers gem 2014-01-08 11:31:05 +11:00
Will Marshall
5e041a6f4f Uncommenting the old OP code 2014-01-08 10:35:27 +11:00
Rohan Mitchell
70e16433d3 Spec for reusing existing option values 2014-01-08 10:16:38 +11:00
Rohan Mitchell
2fec16af5d Merge branch 'master' into product-amount-units 2014-01-07 16:00:06 +11:00
Will Marshall
06ab4d5384 Patching some further regression bugs 2014-01-07 15:28:11 +11:00
Rohan Mitchell
894f86350e Fix megalitre unit specification 2014-01-07 15:17:32 +11:00
Will Marshall
936d80b2c5 Removing a redundant test: no longer show current distributor and order cycle 2014-01-07 15:16:36 +11:00
Rohan Mitchell
042e8386ab Refactor: Extract methods to simplify 2014-01-07 15:16:36 +11:00
Will Marshall
4d03f65766 Reworking everything to use RABL 2014-01-07 15:06:47 +11:00