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
553 Commits 21 Branches 450 Tags
cbeffaced1f6daf538cea28e4c41fa3cd7a3669f
Commit Graph

553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
cbeffaced1 Configure Travis, remove spork, add simplecov, add turbo sprokets. 
Add travis config
(cherry picked from commit e3fdb12289)

Only build on Ruby 1.9.3
(cherry picked from commit 719ef386bf)

Exclude pry from CI build
(cherry picked from commit d60935c800)

Conflicts:

	Gemfile

Attempt 2
(cherry picked from commit 2b19253895)

Conflicts:

	Gemfile.lock

Configure travis for postgres
(cherry picked from commit 3a441cd7d9)

Fix migrations that fail because of coupling to changed/removed models
(cherry picked from commit b030793f15)

Set up xvfb for Travis
(cherry picked from commit cdc3ab09a1)

Add a failing test to test travis
(cherry picked from commit 72aa8fe5e5)

Revert "Add a failing test to test travis"

This reverts commit 72aa8fe5e5.
(cherry picked from commit bd5533e2b1)

Add simplecov
(cherry picked from commit 5089d3bb22)

Conflicts:

	Gemfile.lock

Add turbo sprockets for faster asset precompile
(cherry picked from commit 3e6c56a638)

Remove spork
(cherry picked from commit ed7bded642)

Conflicts:

	spec/spec_helper.rb

Remove more spork-specific things, remove unused cuc config from zeus
(cherry picked from commit fa11ff8982)

Ensure order decorator is required, fix test fragility
(cherry picked from commit 1e94f88c5e)
 2013-06-07 16:23:24 +10:00
Rohan Mitchell
249e1e013f Slight wording change to confirmation email 2013-06-04 09:11:49 +10:00
Rohan Mitchell
ed067be530 Do not set site name and logo URLs in initializer, so that they can be set through admin interface 2013-06-04 08:43:35 +10:00
Rohan Mitchell
6fd13212f5 Remove HTML entities from order confirmation email 2013-05-21 17:44:34 +10:00
Rohan Mitchell
c3b2f52b7a Cache DistributorChangeValidator#all_available_distributors, move Enterprise#available_variants into SQLland - massive render speed improvement 2013-05-20 21:16:43 +10:00
Rohan Mitchell
f19ef4ed07 Move save button back within form, fix failing test 2013-05-20 16:05:25 +10:00
Rohan Mitchell
3b2508dad3 On local organics checkout, remove distributor change, move save button to top right 2013-05-20 15:29:13 +10:00
Rohan Mitchell
cc2e8694f0 Move LineItem update to source of change (order update). On empty cart, re-instanciate shipping method adjustment, fixing no shipping fees after empty cart bug. 2013-05-20 15:01:04 +10:00
Rohan Mitchell
571dfd9e9f Regroup OrderController methods - actions / callbacks / utils 2013-05-20 14:56:39 +10:00
Rohan Mitchell
b7f7766893 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 2013-05-18 19:54:27 +10:00
Rohan Mitchell
d65dda4dc5 When order distributor changes, update line item shipping method 2013-05-18 19:21:01 +10:00
Andrew Spinks
174d7fac6f Increase unicorn timeout so that reports can run over long date range. 2013-05-05 18:42:42 +10:00
Andrew Spinks
6777a3ce58 Update CMS configuration take S3 details from the spree config. 2013-05-05 14:10:11 +10:00
Rohan Mitchell
a1f189627b Only show UserVoice feedback button on Eaterprises deployment 2013-04-29 16:34:19 +10:00
Rohan Mitchell
da3267a302 Add OpenFoodWeb logo to footer 2013-04-29 16:20:26 +10:00
Rohan Mitchell
234b2d26e9 Add MiGS payment gateway 2013-04-29 15:37:48 +10:00
Rohan Mitchell
e20e4950bb Install db2fog for S3 database backups 2013-04-29 11:31:01 +10:00
Rohan Mitchell
06c285689e Order confirmation email contains distributor info 2013-04-29 11:14:00 +10:00
Rohan Mitchell
50f3455523 Fix gemspec 2013-04-26 16:55:30 +10:00
Rohan Mitchell
89b749fe95 Add terms and conditions to footer 2013-04-26 16:31:33 +10:00
Rohan Mitchell
92a7f19ff1 Add specs for enterprises distributor info as rich text feature 2013-04-26 15:43:13 +10:00
Rohan Mitchell
63768df3d7 Replace distributor info box on product details and checkout pages with rich text field 2013-04-26 13:30:21 +10:00
Rohan Mitchell
fb999732ee Rename enterprises admin extended description to profile info, add distributor info field 2013-04-26 13:10:32 +10:00
Rohan Mitchell
08161ece61 Remove sample defaces 2013-04-26 13:09:32 +10:00
Rohan Mitchell
1b6bf6ca2b Add distributor info field to enterprises 2013-04-26 12:31:19 +10:00
Rohan Mitchell
4900129511 Enable feature for local organics only 2013-04-26 12:31:11 +10:00
Rohan Mitchell
953fe22d4c Add new feature for rich text distributor info for enterprises 2013-04-26 12:27:15 +10:00
Rohan Mitchell
2379861c92 Shrink local organics local/remote product heading 2013-04-26 10:16:51 +10:00
Rohan Mitchell
f17907e06f Style local organics product details distributor heading 2013-04-26 09:56:16 +10:00
Rohan Mitchell
7911adab6a Update local organics product listing style 2013-04-26 09:47:20 +10:00
Rohan Mitchell
06364ec759 Increase local organics font size, change local products background colour 2013-04-26 09:42:50 +10:00
Rohan Mitchell
ea0df511cc Enlarge local organics sidebar font 2013-04-26 09:23:42 +10:00
Rohan Mitchell
9909261c8c Update local organics logo 2013-04-26 09:18:47 +10:00
Rohan Mitchell
4730ba0734 Restore display of admin top-right menu 2013-04-25 21:52:10 +10:00
Rohan Mitchell
9f6d1a2f18 Order cycle reports are precise to time of day, not just date 2013-04-25 21:22:26 +10:00
Rohan Mitchell
cea2089768 Add empty admin.js, fixes asset not precompiled error 2013-04-25 15:50:41 +10:00
Rohan Mitchell
bea247e64d Only configure sass load paths if sass defined. Fixes production init. 2013-04-25 15:31:32 +10:00
Rohan Mitchell
0da57f1d6c Remove spree_heroku - S3 support is now built into Spree 2013-04-23 07:32:23 +10:00
Rohan Mitchell
8f6cc361cc Precompile all engine-specific assets 2013-04-22 18:34:11 +10:00
Rohan Mitchell
9e60e6269e Remove unneeded variables override file 2013-04-22 18:33:53 +10:00
Rohan Mitchell
139188e021 Turn on asset init on precompile - now precompile can find assets stored in engines (lib/chili/...), but this breaks Heroku deployment 2013-04-22 17:37:02 +10:00
Rohan Mitchell
3df2207664 Remove non-present files from gemspecs 2013-04-22 17:36:18 +10:00
Rohan Mitchell
7bee04e5f6 Update selenium-webdriver, test with eaterprises deployment settings by default 2013-04-22 16:48:49 +10:00
Rohan Mitchell
3db23393d2 Scope admin css to admin section, add simple styling for front-end 2013-04-22 16:23:30 +10:00
Rohan Mitchell
27d7a2c6c2 Remove example deface, update README with licence 2013-04-22 16:14:52 +10:00
Rohan Mitchell
3dd4e074fc Split spree variable changes into per-feature files, add an eaterprises feature for default layout 2013-04-22 16:12:50 +10:00
Rohan Mitchell
a90f060b28 Add local organics logo 2013-04-22 10:49:37 +10:00
Rohan Mitchell
3bd766eab9 Update local organics feature readme 2013-04-22 10:32:23 +10:00
Rohan Mitchell
3d8d8ecd49 Move assets deface to correct directory 2013-04-22 10:32:09 +10:00
Rohan Mitchell
a4bdea4d5c Add chili feature for local organics 2013-04-22 10:29:05 +10:00