raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +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
Andrew Spinks
7cb054f430 Merge branch 'master' into order-cycle-selection 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/spree/orders_controller_decorator.rb
	app/models/enterprise.rb
	app/models/spree/order_decorator.rb
	app/views/spree/checkout/_other_available_distributors.html.erb
	app/views/spree/products/_add_to_cart.html.haml
	lib/open_food_web/distributor_change_validator.rb
	spec/spec_helper.rb
 2013-07-23 14:42:57 +10:00
Rohan Mitchell
f580b43619 Merge remote-tracking branch 'origin/master' 2013-07-23 14:03:08 +10:00
Rohan Mitchell
b73c584c3b Update order confirmation email in line with changes in spree 2013-07-23 14:00:29 +10:00
Rohan Mitchell
3315191b81 Fix intermittent admin-user-has-no-admin-role error in specs 2013-07-23 14:00:07 +10:00
Rohan Mitchell
7532ebee5a Require feature toggle within engines needs require_relative 2013-07-23 13:59:39 +10:00
alexs
418393afbd Updated requirements documentation. 2013-07-23 13:53:00 +10:00
Rohan Mitchell
fe61cddda6 Merge branch 'local-organics' 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/store/variables.css.scss
	app/overrides/add_feedback_script.rb
	app/views/spree/shared/_order_details_steps_data.html.erb
	db/schema.rb
	script/rails
	spec/spec_helper.rb
 2013-07-23 11:40:03 +10:00
Rohan Mitchell
86616c4a6c Add sass gem explicitly 2013-07-23 10:47:35 +10:00
Rob H
de78d09790 New branch for spree_last_address to fix compatibility issue with spree_auth_devise 1.3 2013-07-23 10:43:08 +10:00
Rob H
0322f21e5c Rearrange bpe action buttons 2013-07-23 10:43:08 +10:00
Rob H
275b64c7d3 Fix broken delete action for variants 2013-07-23 10:43:08 +10:00
Rob H
ba04d0ea74 Increase wait time for delete action in bpe specs 2013-07-23 10:43:08 +10:00
Rob H
4c435e118a BPE action buttons in separate columns 2013-07-23 10:43:08 +10:00
Rob H
3c973178fd WIP: remove unneeded representative-based data request infrastructure 2013-07-23 10:43:08 +10:00
Rob H
961d63ec4c WIP: Fix references in js tests for bpe 2013-07-23 10:43:08 +10:00
Rob H
9863a84a27 WIP: transfer bulk product update data requests to API 2013-07-23 10:43:08 +10:00
Rob H
97c03b50cc Create new api routes/views/controllers for bulk product edit 2013-07-23 10:43:08 +10:00
Rob H
8f6ec9bd9b WIP (Spree Update): Fix frontend order payment summary 2013-07-23 10:43:08 +10:00
Rob H
45309d6a75 WIP (Spree Update): Remove unrequired reference to AnalyticsHelper 2013-07-23 10:43:08 +10:00
Rob H
703f51ac1b WIP (Spree Update): Update reference to current_user -> spree_current_user 2013-07-23 10:43:08 +10:00
Rob H
1f152d8121 WIP (Spree Update): Update authentication workflow input names 2013-07-23 10:43:08 +10:00
Rob H
78263f6835 WIP (Spree Update): change formats of tab overrides 2013-07-23 10:43:08 +10:00
Rob H
56f507dc03 WIP (Spree Update): Bump spree_auth_devise to resolve issue with admin 'Configuration' tab 2013-07-23 10:43:08 +10:00
Rob H
f055ece503 WIP (Spree Update): update variables.css.scss 2013-07-23 10:43:08 +10:00
Rob H
7941a61879 WIP (Spree Update): Update Spree 1.3.3, install and run migrations 2013-07-23 10:43:08 +10:00
Rob H
108dd6e619 Update Rails to 3.2.13 from 3.2.11 2013-07-23 10:42:07 +10:00
Rob H
19fbbb8374 BPUR: match product supplier on clone 2013-07-23 10:40:42 +10:00
Rob H
c826b18584 Wait for variants and products to be deleted 2013-07-23 10:40:42 +10:00
Rob H
f169dcda88 BPUR: Fix final unstable tests, js concurrency etc. 2013-07-23 10:40:42 +10:00
Rob H
ba840124d2 Install rabl and oj 2013-07-23 10:40:42 +10:00
Rob H
2384c4a43e Remove naughty pry 2013-07-23 10:37:51 +10:00
Rob H
126f11683d BPUR: Add datetimepicker to Available On 2013-07-23 10:37:51 +10:00
Rob H
23a56ff4f1 BPUR: toggle visbility of columns 2013-07-23 10:37:51 +10:00
Rob H
f750251cb8 BPUR: Visually differentiate products and variants in table 2013-07-23 10:37:51 +10:00
Rob H
5d30df5717 BPUR: add supplier name to product model to allow searching 2013-07-23 10:37:50 +10:00
Rob H
f9832d1375 BPUR: Remove unnecessary setValidity method in ngDecimal 2013-07-23 10:37:50 +10:00
Rob H
4ae5085192 BPUR: Remove unnecessary collections of products on bulk edit page 2013-07-23 10:37:50 +10:00
Rob H
0ddd9cc6d0 BPUR: use where rather than select for product collection 2013-07-23 10:37:50 +10:00
Rob H
9beb560b72 BPUR: cancel any pre-existing timeouts on message models when new message set 2013-07-23 10:37:50 +10:00
Rob H
b775145b16 BPUR: Add ability to filter by search and toggle variants 2013-07-23 10:37:50 +10:00
Rob H
57f2eff1b0 BPUR: Add warnings before deleting products/variants or directing to edit page 2013-07-23 10:37:50 +10:00
Rob H
ef435dc6da Typo 2013-07-23 10:37:50 +10:00
Rob H
8453b43c25 BPUR: Allow updating of delegated variant properties 2013-07-23 10:37:50 +10:00
Rob H
1bd4875a6f BPUR: Can clone products 2013-07-23 10:37:50 +10:00
Rob H
89e684a328 BPUR: add js tests for deleting products and variants 2013-07-23 10:37:50 +10:00
Rob H
e8f24dc2dd BPUR: Add edit link for products and variants 2013-07-23 10:37:50 +10:00
Rob H
febb9a44a2 Remove commented (unrequired) lines on code 2013-07-23 10:37:50 +10:00
Rob H
c503c1b10c BPUR: refactor of filterSubmitProducts 2013-07-23 10:37:50 +10:00
Rob H
dcf6446450 BPUR: can delete variants 2013-07-23 10:37:50 +10:00
Rob H
5db0d839fa BPUR: can delete products 2013-07-23 10:37:50 +10:00