mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-09 14:44:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,065 Commits 65 Branches 92 Tags
a47328eed45b748e413bfb062e77eb76e2d8fdd2
Commit Graph
399 Commits
Author SHA1 Message Date
pozorvlak 751a66b49b Merge pull request #457 from Skud/multiple_scinames 
Multiple scientific and alternate names
 2014-12-01 10:33:46 +00:00
Skud 593a20c0c5 Load alternate names from CSV 2014-11-30 16:06:43 +11:00
Skud 844791ead9 Allow multiple comma-separated scientific names 2014-11-30 15:48:58 +11:00
Yoong Kang Lim 2036a0f2e9 Used environment variable for site name instead 2014-11-30 15:18:13 +11:00
Yoong Kang Lim 27ad791f67 Merge remote-tracking branch 'upstream/dev' into followerdev 2014-11-30 15:16:48 +11:00
Skud 4e19da56a0 Rearrange fields in crop uploads (sci names last) 2014-11-30 14:51:33 +11:00
Yoong Kang Lim 2ca42bbae3 Slight modification to the notification wording. 2014-11-21 01:05:23 +11:00
Yoong Kang Lim aeb7192f48 Break up tests into different scenarios. Defined cancan ability for follows and updated member profile view 2014-11-20 23:46:15 +11:00
Yoong Kang Lim 996043d8fb Renamed get_follow_id to get_follow as it does not return id. Also added unit tests for the new methods in the member model. 2014-11-20 01:10:28 +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
Skud 6aea16028e Merge pull request #452 from wsmoak/negative-area 
Prevent the creation of a garden with a negative number for the area.
 2014-11-19 17:18:09 +11:00
Wendy Smoak 53d782bc83 Prevent the creation of a garden with a negative number for the area. If entered, the area must be greater than or equal to zero. 2014-11-18 20:33:44 -05:00
Yoong Kang Lim 03fea2a785 Remove dependent detroy as this wipes out both users. Woops. 2014-11-13 01:52:43 +11:00
Yoong Kang Lim b5e1b6bc22 Delete unused views, add feature tests 2014-11-13 00:46:34 +11:00
Yoong Kang Lim 3c3eb1fd78 Fixed/improved method in member model 2014-11-12 01:53:47 +11:00
Yoong Kang Lim cacc002a01 Added follow/unfollow buttons 2014-11-12 01:47:26 +11:00
Yoong Kang Lim a9fdab5d7c Basic follower relationship 2014-11-12 00:23:01 +11:00
Skud 2426c51951 Fixed bug in deleting unused photos 
... and wow, my tests were really not testing what I thought they were
testing :-/
 2014-11-11 19:29:32 +11:00
pozorvlak 24d276da37 Merge pull request #420 from Skud/plantingreminder 
Planting reminder
 2014-11-07 14:31:43 +00: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
Miles Gould 7e4b51d1cb Add "Edit" link for alternate names on crops page. 2014-10-18 15:18:23 +01:00
Miles Gould 83fa291060 Fetch alternate names for a crop. 2014-10-18 13:50:28 +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
Skud a3e02a3e61 Actually delete Crop.random, don't just comment it out 2014-10-15 16:47:43 +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 1d81064ced removed unused Crop.random method 2014-10-15 14:03:00 +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
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
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 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 529c98f5dc Move actual sending of planting reminder to rake task 2014-09-28 15:28:53 +10:00
Skud 3cf2a50a34 modified Planting.interesting to have some options re: howmany and photos 2014-09-12 13:20:41 +10:00
Skud 374987488f Fixed broken tests. 2014-09-12 08:30:44 +10:00
Skud 85b5ac12ca added validation for finished_at (must be after planted_at) 2014-09-12 07:50:25 +10:00
Mackenzie Morgan ed537e583b whitespace fixes and um oops no there shouldn't be a secret key in that config file 2014-09-09 20:31:14 -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
Skud 2be199abbc Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/devise/registrations/edit.html.haml
 2014-08-30 17:45:19 +10:00
Skud af2d0e22ee Automatically set plantings to finished when a garden is marked inactive 2014-08-30 10:51:33 +10:00
Skud e7dd50c3f1 Added scopes for finished and current plantings 2014-08-30 09:28:02 +10:00
Skud b07d9d8db0 Added finished fields for plantings 2014-08-30 09:27:41 +10:00
Taylor Griffin 6bb74039a7 fix slug bug 2014-08-29 07:31:02 +10:00
Taylor Griffin 2c50c3b703 merge in a bunch of (mostly bootstrap 3) changes 2014-08-29 07:14:44 +10:00
Taylor Griffin 550cb4b265 put validation in the correct place this time 2014-08-29 06:56:02 +10:00
Taylor Griffin 62e1c3bb93 add server side validation 2014-08-29 06:45:37 +10:00
Marlena Compton 36199054c0 changed method so that you can now call crop_wranglers and admins. meta-programming ftw 2014-08-21 20:11:10 -07:00