Maikel Linke
e4f855b64a
Display calculator in payment method edit form
2016-05-25 14:56:52 +10:00
Rob Harrington
3aea387b9a
First iteration of a model for tag rules
2016-04-01 19:44:17 +11:00
Maikel Linke
2ea1a59666
depricating db2fog.rb initializer due to invalid bucket name
...
Once everybody changed their server config, we can remove that file.
2015-10-21 10:04:28 +11:00
Rob Harrington
3a505abfc7
Adding WickedPDF for generation of order invoices
2015-10-16 17:25:39 +11:00
Rob Harrington
9dc0598870
Adding fix to prevent account_invoice orders from being sucked into the frontend as normal orders
2015-09-18 17:25:34 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Maikel Linke
f88f42283a
Session stored in ActiveRecored instead of Cookies
...
The cookie store is not big enough in some cases. In order to solve a
CookieOverflow error and maybe track down the underlying issue this
patch uses the database instead of cookies to store session data.
2015-06-10 13:49:24 +10:00
Maikel Linke
678b591c18
Explain how to disable delayed jobs to send emails again
2015-05-29 15:24:16 +10:00
Rohan Mitchell
b5a6f9c1bc
Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.
2015-05-06 14:54:16 +10:00
Rohan Mitchell
a207f50aeb
Merge branch 'master' into delay-devise-emails
...
Conflicts:
script/run_tests.sh
2015-04-30 12:29:06 +10:00
Rohan Mitchell
c3f99d7540
Merge branch '441-default-country' of https://github.com/folklabs/openfoodnetwork into folklabs-441-default-country
2015-04-29 14:07:58 +10:00
Rohan Mitchell
998288e21f
Keep failed jobs around for debugging. Limit max runtime to 15 mins (we're only sending emails at present). Notify bugsnag of errors in jobs.
2015-04-21 15:37:36 +10:00
Rohan Mitchell
048c6a8ee8
Include only the bare minimum of helpers into JS template context to avoid intermittent SASS @include issues
2015-04-17 13:41:38 +10:00
Rohan Mitchell
05551aa2a9
Make helpers available to javascript templates
2015-04-17 13:41:38 +10:00
Rohan Mitchell
2b5fc656fe
Configure delayed job logging, add startup script for monit
2015-04-17 10:40:25 +10:00
Paul Mackay
d4cf44a6dd
Use COUNTRY_CODE instead of COUNTRY in application.yml.
2015-03-29 17:06:05 +01:00
Paul Mackay
af9a7a2ed4
#443 : Support currency configuration. Fix LOCALE variable name.
2015-03-24 15:34:45 +00:00
Rohan Mitchell
1e5e009735
Spree init works when database has not been created, remove duplicate FK from db/schema.rb
2015-03-12 11:29:01 +11:00
Maikel Linke
ff4bd449a2
Setting default_country_id by application.yml
...
The spree default_country_id was set using ENV["DEFAULT_COUNTRY"] for
production environment, but not for tests and development. Since tests
reset the default_country_id in specs/support/seeds.rb, only the
development environment had a fix id set to 12. This is removed now.
This fixes creating enterprises and enterprise groups without sample
data (12 is Australia).
2015-02-26 16:29:46 +11:00
Rafael Schouten
8395dbb3e9
Merge branch 'master' into config
...
Conflicts:
.gitignore
Gemfile
2014-10-25 15:29:53 +11:00
Rob Harrington
4d078feea2
Add default scope to devise to stop it from checking other devise enabled models (in this case :enterprise)
2014-10-17 16:12:51 +11:00
Rob Harrington
1a86206e1f
Fixing super annoying server reload bug
2014-09-24 13:01:40 +10:00
Rafael Schouten
9448e1cbe4
add figaro env config
2014-09-16 00:13:43 +10:00
Rohan Mitchell
a26450d173
Remove unused spree searcher class - causing intermittent test failures
2014-07-31 14:58:18 +10:00
Rohan Mitchell
b33a077fd0
Remove bugsnag config - this is added in deployment on a server-by-server basis
2014-07-16 11:45:44 +10:00
Rohan Mitchell
ff507b4b25
Put db backups in their own bucket on S3, put db2fog cron commands in schedule.rb
2014-07-16 09:33:59 +10:00
Will Marshall
33b5359a16
Spiking AMS implementation of data
2014-06-25 15:18:13 +10:00
Will Marshall
476eeef69d
Starting on on the map
2014-06-05 12:18:26 +10:00
Will Marshall
de9319f002
Auto-aligning BEFORE resizing
2014-05-30 15:23:42 +10:00
Will Marshall
f65ff5af18
Automatically sorting out image rotation
2014-05-28 16:03:42 +10:00
Will Marshall
3542799349
Removing pointless foundation crud, reworking the login
2014-05-06 18:28:20 +10:00
Will Marshall
f6bfc71c4b
Various small functional tweaks
2014-04-24 16:28:12 +10:00
Will Marshall
87cef4edcc
Reverting previous commit
2013-12-19 12:29:21 +11:00
Will Marshall
aaa2999ee1
Dropping our override of ActionMailer
2013-12-19 11:58:21 +11:00
Will Marshall
987ba1a81a
Adding a monkeypatch to spree to always allow SSL
2013-12-04 14:08:08 +11:00
Rohan Mitchell
57a450b0aa
Load landing page distributors from enterprise groups instead of yaml file
2013-10-30 13:55:47 +11:00
Rohan Mitchell
6161114750
Standardise on Australia having ID 12, as staging and prod servers do
2013-10-30 10:34:29 +11:00
Rohan Mitchell
763dab9efc
Fix country init for Jenkins
2013-10-23 10:41:50 +11:00
Rohan Mitchell
101510f2f4
Fix error when setting up a fresh db
2013-10-23 09:25:26 +11:00
Rohan Mitchell
34607ff556
Rename misc items from openfoodweb to openfoodnetwork
2013-10-18 17:43:59 +11:00
Rohan Mitchell
89f93cae77
Rename namespaced includes from open_food_web to open_food_network
2013-10-18 17:43:18 +11:00
Rohan Mitchell
e47fa0edfd
Rename application from Openfoodweb to Openfoodnetwork
2013-10-18 17:32:22 +11:00
Rohan Mitchell
57f7d489ff
Rename OpenFoodWeb namespace to OpenFoodNetwork
2013-10-18 17:29:55 +11:00
Rohan Mitchell
0b0c8253c1
Provide a hardcoded country code for CI (Jenkins), where countries are not pre-loaded
2013-10-11 14:13:24 +11:00
Rohan Mitchell
ba31e5d9fb
Remove hardcoded ID for Australia
2013-10-11 12:52:49 +11:00
Rohan Mitchell
91550ac82f
Move distributor config to its own file, re-enable pry for tests
2013-09-10 09:50:16 +10:00
Rohan Mitchell
15d3bff92d
Add delete_content_for helper, can be used for removing the sidebar from spree views
2013-09-10 08:45:59 +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
Rob H
703f51ac1b
WIP (Spree Update): Update reference to current_user -> spree_current_user
2013-07-23 10:43:08 +10:00
