mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-09 08:17:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,516 Commits 59 Branches 82 Tags
b489fda18e84b2ba6c330cbfccf8ba13824d3713
Commit Graph

1516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud
b489fda18e revert to devise 3.0.x due to confirmable misbehaviour 
as documented here: https://github.com/plataformatec/devise/issues/3009

also update mailer to use letter_opener and also localhost:8080 since
we're mostly using unicorn at this point.
 2014-05-01 22:48:52 +10:00
pozorvlak
f7411da5cf Merge pull request #345 from Skud/figaro 
Figaro
 2014-04-30 14:12:09 +01:00
Skud
53a4812571 oops, fixed incorrect syntax for env vars 2014-04-29 14:02:39 +10:00
Skud
9e5c5239a8 Need to put the site name in .travis.yml for tests to pass 2014-04-29 13:46:54 +10:00
Skud
ee27b3bd6a updated docs in application.yml.example 2014-04-29 13:28:44 +10:00
Skud
8384233f4d Moved RAILS_SECRET_TOKEN to figaro 
This is the last of the stuff that was in credentials.sh so I'm removing
the deprecated credentials.example at this point.
 2014-04-29 13:18:02 +10:00
Skud
72ce69ea8f moved flickr and twitter api config to figaro 2014-04-29 13:14:47 +10:00
Skud
b61bbc2170 moved mailchimp settings to figaro 2014-04-29 13:11:57 +10:00
Skud
bf6bb7f620 Moved mandrill config to figaro 2014-04-29 13:07:23 +10:00
Skud
bc36713449 Switched paypal settings to figaro 2014-04-29 13:01:04 +10:00
Skud
2cd5b1d2ed Changed one config setting (site name) over to figaro 
Also massively simplified the original application.yml.example I
originally committed. Let's do this one step at a time.
 2014-04-29 12:57:16 +10:00
Skud
923f943717 added application.yml to gitignore 2014-04-29 12:46:41 +10:00
Skud
13fcf9db4b added deprecation notice to credentials.example 2014-04-29 12:30:56 +10:00
Skud
bacbaf756e added application.yml.example 2014-04-29 12:29:28 +10:00
Skud
3f92f1fb79 Added figaro gem 2014-04-29 12:25:07 +10:00
Skud
1c34d428f2 Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search 
Conflicts:
	spec/models/crop_spec.rb
 2014-04-29 11:16:20 +10:00
Joseph Caudle
b95647e353 Merge pull request #344 from Skud/ruby2 
Ruby2
 2014-04-28 13:47:08 -04:00
Skud
c21310c4e2 tweaking less versions as heroku is complaining about later ones 2014-04-28 13:11:43 +10:00
Skud
b86014b04f attempting to fix libv8 problem occurring on heroku 2014-04-28 13:02:23 +10:00
Skud
66a7dca5ab apparently leaflet.ie isn't a thing any more? 
https://github.com/Leaflet/Leaflet/issues/2159
 2014-04-28 12:54:07 +10:00
Skud
64d96f427f update travis.yml to use 2.1.1 2014-04-28 12:44:22 +10:00
Skud
74e1e07567 tweaking secret key settings to match what heroku already has 2014-04-28 12:42:23 +10:00
Skud
28c789f85c Update to ruby 2.1.1 and various gem tweaks to go with it 2014-04-28 12:33:43 +10:00
Skud
d33d0c507b Upgrade to ruby 2.0.0 2014-04-28 12:08:13 +10:00
Skud
14318ec235 Merge pull request #342 from pozorvlak/harvest_grams 
Allow harvesting non-integer quantities.
 2014-04-28 11:02:08 +10:00
Skud
813b0da6ef Merge pull request #343 from pozorvlak/seed-transaction 
Wrap rake db:seed in a transaction.
 2014-04-28 11:01:54 +10:00
Miles Gould
79f96f5ef4 Insist that crops created by db:seed are new. 
This shaves 2s off the 22s runtime of `rake db:seed` on my machine.
 2014-01-10 18:11:27 +00:00
Miles Gould
c50f345f1c Wrap rake db:seed in a transaction. 
This gives about a 30% speedup on my machine (from 30s to 20s). See
http://stackoverflow.com/questions/1711631/how-do-i-improve-the-performance-of-sqlite
 2014-01-10 14:10:27 +00:00
Miles Gould
4b88bf80f1 Test for spec=any in harvests/new. 2014-01-05 13:20:07 +00:00
Miles Gould
deb706607e Explain step="any" in harvest _form view. 2014-01-05 12:27:10 +00:00
Miles Gould
96675e2eca Allow harvesting non-integer quantities. 
Some browsers (grrr Firefox for Android grrrr) assume "number" means
"integer" unless you specify `step="any"`. Perhaps the developers were
inspired by Kronecker?
http://mathoverflow.net/questions/34445/meaning-of-kroneckers-comment-to-lindemann

This was reported as a bug for non-integer weights; I've allowed
non-integer quantities in the other field, because some allowable units
(eg litres) are obviously divisible.
 2014-01-03 21:03:01 +00:00
Skud
aa07928f1f Show crop thumbnails on search results page 2014-01-03 22:56:31 +11:00
Skud
47f182193f Added sexy search button to navbar search box 2014-01-03 22:48:06 +11:00
Skud
4ce071a0df Fixed a bug that was deleting crops from the database! 
Best bug of the night. TIL: don't call delete on an activerecord
collection expecting it to act like an array. D'oh!
 2014-01-03 22:47:18 +11:00
Skud
0a3ecdc5ad Added crop search controller and views 2014-01-03 22:29:44 +11:00
Skud
addd9cbddf Added search method to crops 
For now it just does a naive SQL LIKE query. We can make this fancier in
future, if we want to.
 2014-01-03 21:50:41 +11:00
Skud
30c1129cab Added route for crop search 2014-01-03 21:28:08 +11:00
Skud
9b278ed05e Added crop search form to header 2014-01-03 21:26:35 +11:00
Skud
8588d0f901 Added a bit more info about mailchimp lists 
(not really part of this story, was just hanging around, sorry)
 2014-01-03 21:25:54 +11:00
pozorvlak
06f1d9cb7e Merge pull request #338 from Skud/crop-mentions 
Crop mentions
 2014-01-02 03:16:40 -08:00
Skud
f45a8b346f Merge pull request #339 from pozorvlak/harvest-parts 
Harvest parts
 2014-01-02 03:05:56 -08:00
Miles Gould
338a7512e8 Explain reordering of plant_parts in a comment. 2014-01-02 11:04:57 +00:00
Miles Gould
18ccb0d9fb Merge branch 'dev' into harvest-parts 
Conflicts:
	spec/models/harvest_spec.rb
 2013-12-03 13:25:18 +00:00
Miles Gould
2a260abf05 Fix Postgres problem with PlantParts#crops 
Postgres complains if the ORDER BY clause of a SELECT DISTINCT query is
not precisely one of the SELECTed fields. The default sort order on
crops is lower(name), and Postgres is not smart enough to notice that it
can calculate this from fields which are selected. The solution is to
override PlantParts#crops to remove the ORDER BY clause, and replace it
with `ORDER BY name`. This is not perfect, because it means the crops
associated to plant parts will not be sorted in the same order as crops
on the rest of the site.
 2013-12-03 12:56:57 +00:00
Skud
06b8740f58 Specify ruby version for heroku's benefit 2014-01-02 2014-01-03 2013-11-23 15:34:42 +11:00
Skud
21c10e09ab upgrade ruby version on heroku due to vulnerability 2013-11-23 15:31:40 +11:00
Skud
9da92c8f71 Make growstuff HAML extensions case insensitive 2013-11-11 11:18:14 +11:00
Skud
11e7055497 Improved case (in-)sensitivity in tests 2013-11-11 11:11:35 +11:00
Skud
9c899e80a3 Updated help text for markdown 2013-11-11 11:11:12 +11:00
Skud
076db6dd07 Use growstuff markdown in RSS feeds 2013-11-11 10:33:35 +11:00