raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-31 21:37:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,954 Commits 18 Branches 452 Tags
5a5cbbd3181a71494de522c287a165950e9f98aa
Commit Graph

16954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Cook
7341d5e11a ignore Sublime project files 2013-07-05 16:24:37 +10:00
David Cook
8df0f30b4f Move override into .deface format, and removed unecessary bits 2013-07-05 16:08:26 +10:00
David Cook
50b5d13e1f Add javascript to hide new save button if not supported (not yet tested on old browsers) 2013-06-28 17:53:39 +10:00
David Cook
5b58351b73 minor changes 2013-06-28 17:04:58 +10:00
David Cook
3007549aa5 use .length instead of .count which produced unexpected results 2013-06-28 17:02:26 +10:00
Rohan Mitchell
3de52b10b2 Fix JS error: Unknown provider: a from order_cycle 2013-06-25 12:31:28 +10:00
Rohan Mitchell
ce2c6c5661 Fix uninjected directive for enterprise fees 2013-06-25 12:17:15 +10:00
Rohan Mitchell
b7a778b0de Define order cycles JS methods in a minification-friendly manner 2013-06-25 10:58:12 +10:00
Rohan Mitchell
f78db2493f Define enterprise fees controller in a minification-safe manner 2013-06-25 10:35:45 +10:00
Rohan Mitchell
2373601e9d Switch to Karma for angluar testing 2013-06-25 10:35:17 +10:00
Rohan Mitchell
37a4ad3372 Don't 500 when setting cart order cycle to nil 2013-06-21 17:04:47 +10:00
David Cook
a63b8908bb Moved inline style to stylesheet 2013-06-21 16:12:56 +10:00
David Cook
0525abb084 Test that scopes don't return deleted products 2013-06-21 15:53:12 +10:00
David Cook
250e76c281 Fix incorrect count of enterprises (due to bug in rails issue #5554) 2013-06-21 15:10:21 +10:00
Rohan Mitchell
ae43fd1333 Set distributor and order cycle in one step, avoiding validation errors. Update spec with new error messages. 2013-06-21 11:36:24 +10:00
Rohan Mitchell
72f1c52b3e Update Order model distribution validation - make fully inclusive of order cycles 2013-06-21 11:35:42 +10:00