Rohan Mitchell
d79a6d7e19
Escape HTML entities in JSON
2016-02-24 11:26:37 +11:00
Maikel Linke
c33835e751
fixup whitespace
2016-01-13 16:23:14 +11:00
Christian
01bf64e6b0
Allow delayed_job to use the locale defined for application
...
delayed_job requires a different configuration variable for locale than
the application.
See
https://stackoverflow.com/questions/8478597/rails-3-set-i18n-locale-is-not-working
for reference
2016-01-07 07:15:18 +01:00
Rohan Mitchell
ecc3bad8c8
Merge branch 'master' into folklabs-producer-emails
2015-10-16 12:38:54 +11:00
Rohan Mitchell
bf953f8987
Undo last change, it broke asset precompilation. Rename style.css to scss for inclusion and force recompilation of all assets.
2015-06-16 18:25:44 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rohan Mitchell
b540f645c3
Split CSS to overcome IE9's 4096 rule limit
2015-06-16 11:57:50 +10:00
Rohan Mitchell
d908701b59
Merge branch 'master' into folklabs-producer-emails
...
Conflicts:
Gemfile
2015-06-11 17:02:34 +10:00
Maikel Linke
a8b6f2942a
Releasing Assets Version 1.1
...
The uglifier update affects only re-compiled assets. In order to replace
the broken assets (e.g. #396 ) with re-compiled assets, we change the
assets version number.
2015-06-11 10:54:30 +10:00
Paul Mackay
ca665dc6bc
Merge master into producer-emails.
2015-03-04 19:09:43 +00:00
Paul Mackay
67b17de695
#275 : Add receival time and instructions to order cycle for incoming exchanges. Fix issues from feedback.
2014-12-30 11:33:13 +00:00
Rohan Mitchell
e607c9855f
Add Pin Payments gateway
2014-12-12 10:59:23 +11:00
Rob Harrington
2f83d71931
Adding mail/all.css to assets precompile list
2014-12-10 09:56:33 +11:00
Rafael Schouten
9448e1cbe4
add figaro env config
2014-09-16 00:13:43 +10:00
Will Marshall
c97fa711b7
Adding config changes to app.rb, fixing mixing producers links
2014-06-20 10:47:46 +10:00
Rohan Mitchell
8bf9921eef
Turn off enforce_available_locales, working around performance regression https://github.com/svenfuchs/i18n/issues/230
2014-05-09 14:39:12 +10:00
Rohan Mitchell
d707624525
Fix warnings - faker clash with ffaker, i18n enforce_available_locales
2014-05-02 14:25:32 +10:00
Will Marshall
a89de9a80f
Patching our patch
2014-03-27 13:01:04 +11:00
Rohan Mitchell
a67cea3fcd
Precompile darkswarm css and js
2014-01-08 15:59:09 +11:00
Rohan Mitchell
72efb2096b
Remove comment - everything makes sense now
2013-11-06 11:26:10 +11:00
Rohan Mitchell
fd43227921
Explicitly precompile style needed
2013-11-06 10:42:39 +11:00
Rohan Mitchell
bacd8401b4
Compile all admin css files for manual inclusion (fixes BugHerd #126 )
2013-11-06 10:18:45 +11:00
Rohan Mitchell
25b0306a93
Ensure css is precompiled, reformat configs
2013-11-01 16:22:54 +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
54d95d304f
Convert to Melbourne time zone
2013-09-30 11:25:26 +10:00
Rohan Mitchell
99e12afd04
Explicitly compile store/shop_front.js, which is used on the temp landing page in isolation from all.js
2013-09-23 16:47:03 +10:00
Rohan Mitchell
91550ac82f
Move distributor config to its own file, re-enable pry for tests
2013-09-10 09:50:16 +10:00
alexs
f160e051e5
Added new temporary landing page.
2013-08-19 17:37:22 +10:00
Rohan Mitchell
5f4313b588
Remove itemwise shipping calculator
2013-08-13 10:14:39 +10:00
alexs
44e06fe7fc
Added search stuff to the least of assets to precompile.
2013-08-08 10:43:21 +10:00
Rohan Mitchell
234b2d26e9
Add MiGS payment gateway
2013-04-29 15:37:48 +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
2a645d04ae
Move presentation to presenter, display calculator fields
2012-11-22 14:37:38 +11:00
Rohan Mitchell
98143ffe5b
Add calculator to EnterpriseFee, test passes for listing enterprise fees
2012-11-16 16:07:40 +11:00
Rohan Mitchell
48497266da
Precompile CMS assets
2012-10-11 11:06:52 +11:00
Rohan Mitchell
8394c47064
Add admin js includes
2012-09-13 12:27:20 +10:00
Rohan Mitchell
a84f6f08eb
Compile all admin javascripts, fixes admin/images/new.js not found error
2012-09-13 12:20:35 +10:00
Rohan Mitchell
e0b8b8b4d4
Force precompile admin css and js
2012-08-04 10:27:15 +10:00
Rohan Mitchell
529de72f75
Force precompilation of store/all.css and store/all.js
2012-08-04 10:23:00 +10:00
Rohan Mitchell
b4f867924b
Do not connect to db during asset precompile, fix heroku deploy to cedar
2012-08-04 10:12:06 +10:00
Andrew Spinks
d34e6570fc
trying to get asset precompilation to work on deploy
2012-07-11 20:39:49 +10:00
Andrew Spinks
b5b35491cc
allow asset precompile to work on new heroku instance
2012-07-07 10:17:33 +10:00
Rohan Mitchell
28d2292de0
Add by-weight shipping calculator
2012-06-29 12:46:33 +10:00
Rohan Mitchell
eae05ea59c
Add itemwise shipping cost calculator
2012-06-29 07:52:29 +10:00
Andrew Spinks
04e4523f6b
upgrade to spree 1.1
2012-05-20 16:28:14 +10:00
Andrew Spinks
5ae983caba
Use Australian locale.
2012-03-28 20:28:52 +11:00
Andrew Spinks
cd1938a74e
spree install.
2012-03-27 11:06:49 +11:00
Andrew Spinks
b6ca20beee
new rails 3.1.4 app
2012-03-27 10:10:26 +11:00
