Taylor Griffin
7bc05fa118
typo
2015-01-12 22:16:42 +11:00
Taylor Griffin
f7af7e649d
update comment to reflect code changes
2015-01-12 20:13:00 +11:00
Taylor Griffin
4efb93ea45
don't load test and admin users in staging
2015-01-12 07:48:48 +11:00
Taylor Griffin
02ff45f705
broaden seeding for staging env
2015-01-11 09:41:04 +11:00
Taylor Griffin
8829acba3f
removed depricated method
2014-12-14 15:54:43 +11:00
Taylor Griffin
a35a573b2b
update follow member code to be rails 4 compatible
2014-12-14 14:51:18 +11:00
Skud
c1bcbd2e7d
Fix parent crop for B. oleracea Acephela group
2014-12-03 14:58:46 +11:00
Skud
a47328eed4
Fixed ordering and capitalisation in brassica import
2014-12-03 14:50:25 +11:00
Miles Gould
4b90f6385b
Merge branch 'dev' into load_alternate_names
...
Conflicts:
Gemfile.lock
script/deploy-tasks.sh
2014-12-01 10:47:10 +00: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
d0b61c259d
Added squashes and new crops from London working bee
2014-12-01 21:20:44 +11:00
Skud
82a5379a25
Added mint family and brassica crops (seed files)
2014-12-01 20:53:17 +11: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
pozorvlak
24d276da37
Merge pull request #420 from Skud/plantingreminder
...
Planting reminder
2014-11-07 14:31:43 +00:00
Miles Gould
f795918e17
Remove alternate names for crops without IDs.
2014-10-19 22:49:18 +01:00
Miles Gould
7c3059fcae
Fix typo in altname CSV
2014-10-19 22:21:10 +01:00
Miles Gould
06a4fcab71
Remove superfluous* error-checks from load_altnames
...
* /me crosses fingers...
2014-10-19 22:19:41 +01:00
Miles Gould
0aea1721d8
Add altname data and include load in deploy-tasks.
2014-10-19 17:24:18 +01:00
Skud
7595d75d20
Merge pull request #432 from pozorvlak/alternate_crop_names
...
Model and CRUD for alternate crop names
2014-10-19 16:34:44 +01:00
Skud
864ce95f11
Merge pull request #430 from Skud/tomatoes
...
Added some additional hierarchy around cherry tomatoes
2014-10-18 14:40:02 +01:00
Skud
ae27a0a5b5
Added some additional hierarchy around cherry tomatoes
2014-10-18 14:38:00 +01:00
Miles Gould
e85cb4598d
Add alternate name model.
2014-10-18 12:38:44 +01:00
Skud
f18feaa131
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
2014-10-18 11:23:30 +01:00
pozorvlak
7c783ecda3
Merge pull request #428 from tygriffin/finish-plantings-javascript
...
Finish plantings javascript
2014-10-18 10:54:50 +01:00
Skud
e4cf636bef
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
app/models/harvest.rb
db/schema.rb
spec/models/harvest_spec.rb
2014-10-15 14:20:16 +01:00
Skud
75e076cef5
Merge branch 'dev' of https://github.com/Growstuff/growstuff into tomatoes
...
Conflicts:
spec/models/crop_spec.rb
2014-10-15 14:07:03 +01:00
Skud
25cb3fd469
Fixed scientific name upload bug and wrote tests
...
Wrote unit tests and refactored Crop.create_from_csv
The actual bug (now fixed) is that if you didn't specify a SN in the
CSV, it would try and pick it up from the parent crop, but then the
testing for "is this a dup?" was based on what was in the CSV and didn't
take that parent SN into account. This is now fixed.
2014-10-15 13:58:21 +01:00
Taylor Griffin
d1e0bdb534
toggling planting finished clears the finished at field or populates it with a cached value
2014-10-12 09:53:09 +11: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
Skud
a5b856b506
Merge pull request #410 from maco/dev
...
Harvest photos
2014-10-02 17:45:59 +10:00
Mackenzie Morgan
48ad561b76
convert tabs to spaces
2014-10-01 23:58:54 -04: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
Mackenzie Morgan
51d8b2d475
Merge branch 'dev' of github.com:maco/growstuff into dev
2014-10-01 20:17:23 -04:00
Mackenzie Morgan
0ad217c9a2
add index to harvest_photo
2014-10-01 20:16:53 -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
Skud
d8b75eaa66
Fixed up db migration and tests for planting reminders
2014-09-28 15:55:55 +10:00
Skud
4a62add88e
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
spec/models/planting_spec.rb
2014-09-28 15:32:53 +10:00
Skud
25abcdc923
Upload tomato varieties to crop database
2014-09-28 13:50:55 +10:00
Mackenzie Morgan
2b7b5bad63
including all the new files needed for harvest photos, this time
2014-09-09 20:21:16 -04: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
817663bdaf
Merge branch 'dev' of https://github.com/Growstuff/growstuff into regularemail
...
Conflicts:
db/schema.rb
2014-07-20 19:30:20 +10:00
Skud
f67732e125
Added checkbox for whether to send planting reminder
2014-07-20 19:17:59 +10:00
Skud
8223025d35
Set default plantings_count to 0 not nil
2014-07-18 18:06:43 +10:00
