mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-03 05:43:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 61 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Caudle
9a3e3390a7 Merge pull request #286 from Skud/redirect-after-signin 
don't redirect to homepage after signin
 2013-08-21 19:19:06 -07:00
Skud
83f99dd32e Merge pull request #289 from Growstuff/dev 
Production push: redesigned homepage, JSON API cleanup, RSS improvements, recent activity bugfix
 2013-08-21 18:13:03 -07:00
Skud
db901161be Merge pull request #288 from Skud/performance 
Performance
 2013-08-21 17:49:24 -07:00
Skud
656edefb5f Eager loading for frequently-accessed/database-heavy pages 2013-08-22 10:18:33 +10:00
Skud
b47771d29c We need to refresh member thumbnails more often 2013-08-22 10:18:16 +10:00
Skud
5de6d4389f Oops, we weren't caching interesting members 2013-08-22 10:18:02 +10:00
Skud
bf090dc908 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2013-08-22 00:59:47 +10:00
Skud
a20f2d35ff Merge branch 'master' of heroku.growstuff:growstuff-dev into dev 2013-08-22 00:45:42 +10:00
Skud
ef61753e7b Merge pull request #287 from Skud/redesign-homepage 
Redesign homepage
 2013-08-21 07:40:53 -07:00
Skud
960d3064f5 don't like this line-height 2013-08-22 00:35:14 +10:00
Skud
cc97fd8f49 think we've FINALLY really fixed the member layout 2013-08-22 00:30:02 +10:00
Skud
908cf41f39 tweaked thumbnail to take up less vertical space 2013-08-21 23:42:16 +10:00
Skud
238fd0b3ff don't redirect to homepage after signin 2013-08-21 22:51:40 +10:00
pozorvlak
de1e3f11c7 Merge pull request #283 from Skud/recentactivity 
fixed recent activity sorting for posts
 2013-08-21 05:45:13 -07:00
Skud
3e84d47c90 fixed bug with tradable_to reverting to 'nowhere' 2013-08-21 21:57:43 +10:00
Skud
c109905cb0 fixed recent activity sorting for posts 2013-08-21 21:42:58 +10:00
Skud
8f7becfa78 added a basic crop wrangler homepage 2013-08-21 21:24:22 +10:00
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
Skud
57fe663675 Merge branch 'dev' of https://github.com/Growstuff/growstuff into places2 
Conflicts:
	app/controllers/members_controller.rb
	app/models/member.rb
	app/views/members/_popover.html.haml
	spec/models/member_spec.rb
 2013-08-21 17:35:31 +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