Commit Graph

1228 Commits

Author SHA1 Message Date
pozorvlak
0fd5cf71a3 Merge pull request #282 from Skud/crop-creator
Crop creator
2013-08-21 03:55:57 -07:00
Skud
183acff5f4 populate scientific names creator field 2013-08-21 17:52:33 +10:00
Skud
836ed7aa85 Added creator to scientific name views etc 2013-08-21 17:52:10 +10:00
Skud
a5b2db3458 added creator to scientific names 2013-08-21 17:50:51 +10:00
Skud
29908351be die sooner if you can't find cropbot 2013-08-21 17:36:48 +10:00
martyhines
eaa8ca0084 set default crop creator (rake task, deploy script, seeds) 2013-08-20 22:30:08 -04:00
martyhines
098595721b Added crop creator to crop edit form 2013-08-20 21:46:22 -04:00
martyhines
e77f7fdf31 Added creator field to crops 2013-08-20 21:22:02 -04:00
Skud
a8a87fe458 Merge pull request #281 from Skud/redesign-homepage
Redesign homepage
2013-08-20 17:42:26 -07:00
Skud
1843e7e754 Merge branch 'dev' of https://github.com/Growstuff/growstuff into redesign-homepage 2013-08-21 10:34:12 +10:00
Skud
347be0633b cache posts/forums on homepage 2013-08-20 18:59:13 +10:00
Skud
b913ca7a19 tiny test fixes to bring things up to date with reality 2013-08-20 14:48:17 +10:00
Skud
1f80dae243 Merge pull request #280 from Skud/redesign-homepage
Redesign homepage
2013-08-19 21:48:00 -07:00
Skud
10cb0d3bfc changed about link in footer to point to specific wiki page 2013-08-20 14:36:32 +10:00
Skud
1b8cd3db6d reinstate members to logged in homepage 2013-08-20 10:25:24 +10:00
Skud
119d3bd0d3 added posts to homepage, tweaked display 2013-08-19 23:01:30 +10:00
Skud
91cce3e360 fixed weird spacing on member index 2013-08-19 22:07:44 +10:00
Skud
107bd19d29 added more info to member popover 2013-08-19 22:07:34 +10:00
Skud
c64e0f5fc7 various tweaks/fixes for caching 2013-08-19 21:34:21 +10:00
Skud
3c1b464bd9 don't show seeds if there aren't any 2013-08-19 20:58:25 +10:00
Skud
ffdb881d5a Update interesting_plantings when photos added/removed 2013-08-19 20:57:59 +10:00
Skud
68cdb2b50c moved model access from controller to views to help caching 2013-08-19 20:35:00 +10:00
Skud
20171942d8 Merge branch 'master' of heroku.com:growstuff-payments into redesign-homepage
Conflicts:
	app/models/crop.rb
2013-08-19 19:28:31 +10:00
Skud
ccd0f9c46a got rid of last remnants of direct cache access 2013-08-19 18:15:14 +10:00
Skud
06c608e6b6 added rake task to reset crop.plantings_count 2013-08-19 18:10:11 +10:00
Skud
f0e3c88bd8 Break out interesting? into its own method 2013-08-19 18:09:39 +10:00
Skud
8c78651d05 Break out interesting? into its own method 2013-08-19 18:00:23 +10:00
Skud
3d19772515 Fixed some broken tests for displaying member location 2013-08-19 17:59:40 +10:00
Skud
b2ab29397e Cache interesting seeds fragment for homepage.
(refresh cache if any of them are deleted)
2013-08-19 17:59:10 +10:00
Skud
46cc7b3984 Fixing cache problems (really this time!?!?)
It seems that the .shuffle was causing all kinds of weirdness.  So, for
now, let's just get used to the fact that we won't have such a mixed set
of crops on the homepage.
2013-08-18 20:53:46 +10:00
Skud
a485778c06 experimenting with what's causing caching errors on staging 2013-08-18 20:46:44 +10:00
Skud
ed0739d56c no need to return interesting_crops twice 2013-08-18 20:42:02 +10:00
Skud
266fd99a12 Merge branch 'master' of heroku.growstuff:growstuff-dev into redesign-homepage 2013-08-18 20:14:00 +10:00
Skud
b793762dc1 rearranged interesting methods a bit 2013-08-18 20:06:10 +10:00
Skud
75bdd0068e Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-08-14 14:00:33 +10:00
Skud
e1fcac240a Merge pull request #279 from Skud/redesign-homepage
removed redundant check for photos
2013-08-13 21:00:18 -07:00
Skud
48313007f9 removed redundant check for photos 2013-08-14 13:58:26 +10:00
Skud
06927e2a4b Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-08-14 13:54:47 +10:00
Skud
66e19bf02e Merge pull request #278 from Skud/redesign-homepage
and another try and making caching work
2013-08-13 20:54:34 -07:00
Skud
9409fc6507 and another try and making caching work 2013-08-14 13:52:53 +10:00
Skud
8ba611a54a and another try and making caching work 2013-08-14 13:51:54 +10:00
Skud
91cc08d46c Merge pull request #277 from Skud/redesign-homepage
fixed caching errors (we weren't caching what we thought we were)
2013-08-13 20:40:05 -07:00
Skud
a04c93f843 fixed caching errors (we weren't caching what we thought we were) 2013-08-14 13:38:05 +10:00
Skud
96b236cb72 Merge pull request #276 from Skud/redesign-homepage
Redesign homepage
2013-08-13 19:55:50 -07:00
Skud
ebe36438ba Cache recent crops on homepage 2013-08-14 12:38:52 +10:00
Skud
f0d4ec2690 cache crop image with popover 2013-08-14 12:15:53 +10:00
Skud
7e98981c0a standardise on _id for caching 2013-08-14 12:09:11 +10:00
Skud
f6fea51ac3 cache planting snippets on homepage 2013-08-14 12:08:27 +10:00
Skud
e8cb5e89b6 Changed interesting methods to always return 12
... because it makes the caching more effective.  Use .first(n) to get a
smaller number if you want it.
2013-08-14 11:58:54 +10:00
Skud
5d3a44ae0c cache stats and member thumbnails on homepage 2013-08-14 11:47:09 +10:00