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
Rob H
8179f45272 BPUR: remove unused product update js and tests 2013-07-23 10:37:50 +10:00
Rob H
5258cba2a2 BPUR: change to live tracking of dirty properties (variant price update still failing) 2013-07-23 10:37:50 +10:00
Rob H
c80cba7fa5 BPUR: Don't use master variant to update attributes. Changes to product filtering. 2013-07-23 10:37:50 +10:00
Rob H
0ca0abd0b2 Can alter on_hand and price of individual variants 2013-07-23 10:37:50 +10:00
Rob H
f3d778af1a BPUR: can update master on_hand 2013-07-23 10:37:50 +10:00
Rob H
fbb3657bdc BPUR: can update master price. Test refactor and added angular ng-decimal directive 2013-07-23 10:37:50 +10:00
Rob H
44ad7584f0 BPUR: can update available_on 2013-07-23 10:37:50 +10:00
Rob H
f12c1c00d0 BPUR: rearrange acceptance tests 2013-07-23 10:37:50 +10:00
Rob H
344a084494 BPUR: can update supplier 2013-07-23 10:37:50 +10:00
Rob H
1e64dab9f7 Bulk product update rewrite: basic integration test passing 2013-07-23 10:37:50 +10:00
Rob H
246c6de495 WIP: remove reference to pry 2013-07-23 10:37:50 +10:00
Rob H
6b097eb9f8 WIP: minor fixes to bulk product update js 2013-07-23 10:37:50 +10:00
Rob H
3c57680303 WIP: bulk product update: basic integration test failing because rails infrastructure does not exist yet 2013-07-23 10:37:50 +10:00
Rob H
74291ab1f7 remove leftover debugger; call in code 2013-07-23 10:37:50 +10:00
Rob H
554c67f1a3 WIP: specs and basic js infrastructure for bulk product update 2013-07-23 10:37:50 +10:00
Rob H
731127d55c WIP: Bulk Product Update Rewrite: initial acceptance testing 2013-07-23 10:37:50 +10:00
alexs
bcac56df0e Upgraded pry-debugger. 2013-07-23 10:16:48 +10:00
David Cook
2e2dc216fa WIP: writing order scope test 2013-07-22 17:33:50 +10:00
alexs
15f212713b Updated rvmrc with rvm auto generated scripts. 2013-07-22 17:33:34 +10:00
David Cook
9f1a7746a4 WIP: start writing order scope test 2013-07-22 17:30:01 +10:00
David Cook
8017d79de4 remove report tests (will test scope not_state instead) 2013-07-22 17:17:18 +10:00
Andrew Spinks
4cdd858f48 Disable order cycles in the front end by default. 2013-07-22 17:16:55 +10:00
Rohan Mitchell
bc913fd355 Reset ActionMailer::Base.deliveries at start of test - http://stackoverflow.com/questions/5843284/clearing-out-activemailerbase-deliveries-after-rspec-test 2013-07-22 16:58:53 +10:00
Rohan Mitchell
f5f5433738 Require pry in test env outside of Travis 2013-07-22 16:56:00 +10:00
Rohan Mitchell
452ccfdb68 Remove debug statement 2013-07-22 16:55:44 +10:00
Rohan Mitchell
2ddc5b4e4a Move strip_html to main app, fixes context-sensitive chili feature spec fail 2013-07-22 16:21:32 +10:00
Rohan Mitchell
d9988dac09 Remove unneeded feature application controllers and rake task files 2013-07-22 16:15:35 +10:00
David Cook
55277e2f0a test for inactive enterprises being counted in 'x more' on sidebar, disable limit test 2013-07-22 14:55:46 +10:00
David Cook
66d345d360 fix 'x more' count, disable sidebar limit (config for this to be implemented later) 2013-07-22 14:53:08 +10:00
Rohan Mitchell
d0421cbc4d Define feature toggles in FeatureToggle class rather than ENV['OFW_DEPLOYMENT'] 2013-07-22 14:34:29 +10:00
Rohan Mitchell
7b1d1f1d42 Add FeatureToggle config to replace ENV['OFW_DEPLOYMENT'] 2013-07-22 12:11:52 +10:00
alexs
1ea48af98b Updated contributors list. 2013-07-22 11:56:33 +10:00
alexs
5e4cabc967 Merge branch 'master' of github.com:eaterprises/openfoodweb 2013-07-22 11:49:09 +10:00
alexs
40bd0e9c58 Fixed product seed. 2013-07-22 11:48:59 +10:00
alexs
3b4ad6558c Added .rvmrc. 2013-07-22 11:48:39 +10:00
alexs
6f57c2a01a Bumped up debugger-ruby_core_source version to address bundle installation issues. 2013-07-22 11:48:12 +10:00
Rohan Mitchell
6ceb8e9ee7 Restore change: render checkout distributor details from partial 2013-07-22 11:23:48 +10:00
Rohan Mitchell
568837aa53 Revert "On order confirmation page and email, display distributor details instead of misc fields. HACK - this should be in the engine, not in the main app. FIXME" 
This reverts commit b7f7766893.
 2013-07-22 11:22:20 +10:00
Rohan Mitchell
efec0b07d6 Merge branch 'amazon-ec2' 
Conflicts:
	Gemfile
	Gemfile.lock
 2013-07-22 10:29:11 +10:00
David Cook
f0755f34aa tidy up javascript, remove unnecessary disableSaveOnClick 2013-07-19 17:05:09 +10:00
David Cook
15c454a0f1 move style to stylesheet 2013-07-19 17:04:04 +10:00
David Cook
46043f2237 click new 'Save and Continue' button 2013-07-16 17:02:06 +10:00
David Cook
0a25dfc679 remove disabled flag 2013-07-16 17:01:12 +10:00
David Cook
050b884076 remove old-style deface file in favour of new .deface format 2013-07-16 17:00:04 +10:00
David Cook
1d2704ab4c Clean up comments 2013-07-16 15:55:28 +10:00
David Cook
c9432288c5 Clean up comments and use admin_orders_path for checking current page 2013-07-16 15:36:14 +10:00
David Cook
0ad7cde198 Add factory for an order with items and valid distributor 2013-07-12 16:42:33 +10:00
David Cook
4fc0608a44 Finish capture order test 2013-07-12 16:41:20 +10:00
David Cook
a76232bb7e Make sure admin_user has admin privilege for new version of Spree 2013-07-12 14:02:37 +10:00
Rohan Mitchell
5683656605 Merge branch 'invalid-login-message' 2013-07-12 13:07:30 +10:00