Brenda Wallace
9cadbdec2b
Regenerated schema file
2017-01-22 18:27:32 +13:00
Brenda Wallace
ff50ec65d0
Merge remote-tracking branch 'upstream/dev' into HEAD
2017-01-22 18:26:29 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Daniel O'Connor
fef272e30f
Merge remote-tracking branch 'upstream/dev' into likeable
2016-12-09 11:42:32 +10:30
Mackenzie Morgan
c201200e9b
correct schema and add index for photos_seeds
2016-12-02 23:17:01 -05:00
Mackenzie Morgan
637b46ef10
add photos to seeds
...
Fixes #495
2016-12-01 12:54:55 -05:00
Mackenzie Morgan
e1a2b168c9
rename scientific_names.scientific_name to scientific_names.name
...
this mirrors alternate_names.name and allows making code more DRY
2016-11-28 21:57:51 -05:00
Daniel O'Connor
bb25cbe5e2
Merge branch 'dev' of github.com:Growstuff/growstuff into likeable
2016-06-04 21:00:52 +09:30
Daniel O'Connor
6d97a060c3
#509 Add support for a non gravatar profile image. Assumed to be the same dimensions as a gravatar pic
2015-08-25 00:32:06 +09:30
Anthony Atkinson
a80001ffe7
Schema update after migration.
2015-07-22 10:39:02 -04:00
AELOGICA
3181c97a2a
Added the mark as finished button on the index page.
2015-07-07 08:20:42 +08:00
Yoong Kang Lim
75ac2081b0
Merge branch 'dev' into likeable
...
Conflicts:
db/schema.rb
2015-02-10 22:57:28 +11:00
Yoong Kang Lim
36a94156c1
Merge branch 'dev' into likeable
...
Conflicts:
db/schema.rb
2015-02-10 22:54:45 +11:00
Skud
e0d8126514
Merge pull request #694 from maco/cms
...
Add comfortable mexican sofa CMS to growstuff & make footer use it
2015-02-10 20:53:50 +11:00
Taylor Griffin
cbb4f9d7ac
add rejection notes
2015-02-09 22:17:32 +11:00
Taylor Griffin
2db7bf638b
improve copy for new request email
2015-02-09 20:41:28 +11:00
Mackenzie Morgan
b66b8263c1
resolving schema merge
2015-02-09 00:06:18 -05:00
Skud
f7a2ec2054
Merge pull request #676 from pozorvlak/seed_properties
...
New seed properties: days until maturity, organic, GMO, heirloom
2015-02-09 14:07:20 +11:00
robertlandreaux
b78ccaa097
fix crop_wrangling_button_spec.rb
2015-02-06 21:57:47 -05:00
Yoong Kang Lim
33a66dce1f
Starting stages of a like feature for posts.
2015-02-05 00:54:31 +11:00
Taylor Griffin
076a6cc1df
catch up with upstream dev
2015-02-04 21:41:42 +11:00
Mackenzie Morgan
075cdb8272
Merge branch 'dev' of github.com:growstuff/growstuff into cms
2015-02-02 23:11:51 -05:00
Miles Gould
c1870d46a2
Merge branch 'dev' into seed_properties
...
Conflicts:
db/schema.rb
2015-02-02 17:45:49 +00:00
Skud
af39df5e0c
Fixed test failure if elasticsearch isn't present in test env
2015-02-02 18:20:16 +11:00
Taylor Griffin
4211ebec76
add request notes to crop request
2015-02-01 17:56:51 +11:00
Taylor Griffin
e86200b942
requester receives a message when crop request is rejected
2015-02-01 17:32:49 +11:00
Taylor Griffin
c80b42d9bc
change from approved boolean to approval_status string
2015-02-01 16:52:31 +11:00
Mackenzie Morgan
6aa37e6e26
adding CMS via comfortable mexican sofa gem
2015-02-01 00:27:04 -05:00
Miles Gould
089a3d5c24
Merge branch 'dev' into seed_properties
...
Conflicts:
db/schema.rb
2015-02-01 00:03:10 +00:00
Taylor Griffin
22e0379769
give crops a requester
2015-01-31 09:54:59 +11:00
Mackenzie Morgan
2567e7cd74
adding tests (not passing, need to figure out saving mid-test), fixing before_save, adding CSV column, and adding task to set the si_weight throughout the db
2015-01-29 00:27:53 -05:00
Mackenzie Morgan
c38dc4661d
basics of garden photos
2015-01-27 00:54:05 -05:00
Miles Gould
233f9dfd88
Split "days until maturity" into min and max fields.
2015-01-26 19:20:33 +00:00
Miles Gould
9a18b4b62b
Add new properties to seeds
...
Added days_until_maturity, gmo, organic and heirloom properties; added
validation and tests for the last three.
2015-01-24 11:31:35 +00:00
Taylor Griffin
0e0c309c15
Revert "Sci names permitted params"
2015-01-23 11:42:42 +11:00
Taylor Griffin
3c360ab1b8
specify permitted params for nested attributes
2015-01-23 09:22:13 +11:00
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
