Taylor Griffin
02ff45f705
broaden seeding for staging env
2015-01-11 09:41:04 +11:00
Taylor Griffin
a35a573b2b
update follow member code to be rails 4 compatible
2014-12-14 14:51:18 +11:00
pozorvlak
751a66b49b
Merge pull request #457 from Skud/multiple_scinames
...
Multiple scientific and alternate names
2014-12-01 10:33:46 +00:00
Skud
4e19da56a0
Rearrange fields in crop uploads (sci names last)
2014-11-30 14:51:33 +11:00
Yoong Kang Lim
0eb5ae58aa
Renamed member_id column in Follow table to follower_id. Made necessary modifications to models and tests.
2014-11-20 00:42:46 +11:00
Yoong Kang Lim
a9fdab5d7c
Basic follower relationship
2014-11-12 00:23:01 +11:00
Miles Gould
e85cb4598d
Add alternate name model.
2014-10-18 12:38:44 +01:00
Shiho Takagi
cf07ecfa4a
improved test spec, crop page and added rake task
2014-10-05 23:16:46 +11:00
Shiho Takagi
6e02f40e0a
merging from dev
2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01
Added crops-posts association as well as updated GUI for crop show
2014-10-05 13:32:08 +11:00
Mackenzie Morgan
fcda8742d8
go back to the nested error handling in the photos controller and add a migration for indexing harvests_photos
2014-10-01 22:52:52 -04:00
Skud
65c46c334b
Delete unused photos
...
Make sure the models are setup so that if a photo is not used for
anything, it's removed from the system.
Also wrote a rake task (which should be run on deploy) to remove older
unused photos.
2014-09-29 09:18:28 +10:00
Mackenzie Morgan
512ccdbaa2
merging the schema changes from finished plantings and making the timestamp newer, then making the styling on harvest photos match the new styling (no li) on planting photos
2014-09-09 20:19:25 -04:00
Mackenzie Morgan
7d54ab347f
Adding photo functionality to harvests
2014-09-09 19:55:40 -04:00
Taylor Griffin
3fbae6a5ee
write regression spec for resource id bug when editing resource
2014-08-30 12:14:36 +10:00
Skud
b07d9d8db0
Added finished fields for plantings
2014-08-30 09:27:41 +10:00
Skud
8223025d35
Set default plantings_count to 0 not nil
2014-07-18 18:06:43 +10:00
Miles Gould
084bdc4f40
Add friendly URLs to plant parts.
2013-10-31 00:19:48 +00:00
Miles Gould
e9a3c0f4ee
rails g scaffold PlantPart...
...
Also migration to remove the string plant_part.
2013-10-30 23:32:20 +00:00
Skud
f89c5e5b86
Added plant_part attribute to harvest
2013-10-29 17:00:32 +11:00
Skud
803f8244c9
Added various fields to garden
...
- active (default: true)
- location, latitude and longitude (because when you move house, you
don't take your garden with you)
- area and area units (square feet or metres)
2013-10-25 21:54:13 +11:00
Miles Gould
9c5b6f6192
Rename Crop.system_name to Crop.name
2013-10-18 11:52:05 +01:00
Skud
c5e8e4298f
Separated informal/human units from measured weights
2013-09-25 15:39:17 +10:00
Skud
9667f43874
Added friendly urls to harvests
2013-09-17 18:02:48 +10:00
Skud
40ce4ab77b
Validate units (must be one of individual/bunches/kg/lb)
...
Also changed "units" attribute to "unit". Oops, we weren't following the
Rails naming convention.
2013-09-17 17:26:18 +10:00
Skud
ccb0e42c95
Prettified harvest form
...
Also renamed "notes" to "description" in database
2013-09-17 16:08:41 +10:00
Skud
37383ba451
rails g scaffold Harvest...
2013-09-17 15:39:25 +10:00
Skud
a250bc162f
Fixed up db/schema to remove spurious payments table
2013-09-16 10:22:42 +10:00
Skud
2422182aa8
Added referral_code to Order
...
Also added validation (alphanumeric), but we're fairly lax about
whitespace and case, and clean up for them if they make minor errors.
2013-09-13 12:14:17 +10:00
Lilly
5c4ee581cc
Added 'bulb' as a 'planted_from' option.
2013-08-30 15:08:23 +10:00
Skud
b73c4db17a
Merge branch 'newsletter' of https://github.com/Skud/growstuff into Skud-newsletter
...
Conflicts:
db/schema.rb
spec/models/member_spec.rb
2013-08-29 00:06:44 +10:00
Skud
290535b557
Add newsletter subscription checkbox
2013-08-27 21:22:35 +10:00
Skud
99bfc704dc
Added plantings_count (i.e. counter_cache) to Member
...
Also removed the superfluous .plantings_count method on Crop, which was
causing some confusion.
A thing we learned today: we should use .size to find the size of
ActiveRecord collections, not .count, because .count doesn't use the
cache (while .size does).
2013-08-26 13:54:09 +10:00
Skud
1ad416269d
Added owner to planting
...
Previously we got the owner indirectly, through the garden in which the
planting was planted. Now we're directly specifying an owner. This
allows us to let people plant things in each other's gardens.
Tests are probably broken at this point; we're about to refactor ALL THE
THINGS.
2013-08-26 12:17:06 +10: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
Skud
a5b2db3458
added creator to scientific names
2013-08-21 17:50:51 +10:00
martyhines
e77f7fdf31
Added creator field to crops
2013-08-20 21:22:02 -04:00
Skud
f0e3c88bd8
Break out interesting? into its own method
2013-08-19 18:09:39 +10:00
martyhines
0d5b2bbcce
Added bio to member model
2013-08-08 21:38:01 -04:00
Miles Gould
b7cbadf84a
Merge branch 'dev' into seed_trade
...
Conflicts:
spec/views/crops/show.html.haml_spec.rb
2013-07-23 12:59:41 +01:00
Skud
292f5185ec
Merge pull request #256 from Skud/seed_trade
...
Seed trade
2013-07-23 04:47:51 -07:00
Skud
bdc267b044
added slug for seeds
2013-07-23 21:14:24 +10:00
Skud
e17f5d6599
Merge pull request #255 from Skud/photo_set
...
Photo set
2013-07-23 03:47:36 -07:00
Skud
2185f257c0
set 'nowhere' as default seed.tradable_to
2013-07-23 20:43:13 +10:00
Skud
3a96cd96df
removed tradable boolean field
...
we're now relying just on the "tradable_to" field, which is clearer.
2013-07-22 15:47:25 +10:00
Ryan Clark
e9dd18d977
Added tradable and tradable_to to seeds
2013-07-17 18:25:55 -07:00
Ryan Clark
973567bfdc
Remane use_by to plant_before to humor Skud
2013-07-17 18:24:12 -07:00
Ryan Clark
106c3a74ba
Display a set dropdown on the new photo page.
2013-07-16 18:27:06 -07:00
Skud
91ea5146ac
rails g scaffold seed...
2013-07-15 22:53:29 +10:00
Skud
b71ac3decb
added planted_from (eg seed, seedling)
2013-07-05 20:53:11 +10:00
