mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-29 20:25:09 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,257 Commits 54 Branches 76 Tags
3ffedaac59e56dfcb7e09d09ed6541a333d7ddfb
Commit Graph

1257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pozorvlak
3ffedaac59 Merge pull request #297 from Skud/cropbot-over-enthusiasm 
reined in over-enthusiastic rake task
 2013-08-27 08:07:36 -07:00
Skud
7b307ab907 reined in over-enthusiastic rake task 2013-08-27 11:18:41 +10:00
Skud
fa93293ed8 Merge pull request #293 from pozorvlak/rake_dependency 
Make "rake" depend on "rake db:test:prepare".
 2013-08-23 17:05:19 -07:00
Miles Gould
b31bdbb325 Make "rake" depend on "rake db:test:prepare". 
This also tests for pending migrations.
 2013-08-24 00:00:43 +01:00
Skud
95c1f61346 Merge pull request #291 from Skud/location-autocomplete 
Location autocomplete
 2013-08-22 00:47:48 -07:00
Skud
5a87ecfeeb Merge branch 'dev' of https://github.com/Growstuff/growstuff into location-autocomplete 2013-08-22 15:09:31 +10:00
Skud
4cdb571e27 Merge pull request #284 from Skud/wrangler-homepage 
added a basic crop wrangler homepage
 2013-08-21 21:54:04 -07:00
Skud
7530c84247 Merge pull request #290 from Skud/member-bio 
Member bio
 2013-08-21 21:53:41 -07:00
Skud
9df8ec15ba Merge branch 'dev' of https://github.com/Growstuff/growstuff into member-bio 
Conflicts:
	db/schema.rb
 2013-08-22 13:15:02 +10:00
Joseph Caudle
190e287cca Merge pull request #285 from Skud/tradable_nowhere 
fixed bug with tradable_to reverting to 'nowhere'
 2013-08-21 19:22:09 -07:00
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
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
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