mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-02 19:24:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 97 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
726 Commits
Author SHA1 Message Date
Yoong Kang Lim 36a94156c1 Merge branch 'dev' into likeable 
Conflicts:
	db/schema.rb
 2015-02-10 22:54:45 +11:00
Yoong Kang Lim e3db003bbc Added tests for the concern and member model 2015-02-10 20:18:26 +11: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
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
Miles Gould c1870d46a2 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-02 17:45:49 +00:00
Mackenzie Morgan 7ca89908cd merge from upstream 2015-02-01 22:00:52 -05:00
Mackenzie Morgan 2c94f61843 use %0.3f instead of %0.2f so we get to gram-granularity, and don't duplicate code 2015-02-01 21:59:33 -05:00
Taylor Griffin 2f67ffd2f8 fix regressions 2015-02-02 00:01:49 +11:00
Miles Gould 089a3d5c24 Merge branch 'dev' into seed_properties 
Conflicts:
	db/schema.rb
 2015-02-01 00:03:10 +00:00
Mackenzie Morgan de5b16e384 back to kg for si weight, also now adding si_weight to the csv correctly 2015-01-31 18:35:29 -05:00
Shiho Takagi 2aa30475e9 merge 2015-02-01 00:14:52 +11:00
Mackenzie Morgan bb9695b272 add check for nil to set_si_weights and the corresponding deploy script and update test 2015-01-31 00:45:31 -05: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 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
Shiho Takagi 018b2b4711 elasticsearch to be turned off as a default in dev and test 2015-01-21 16:47:22 +11:00
Shiho Takagi 2a184bcb2e updated test spec for improved elasticsearch syncing method 2015-01-18 00:20:50 +11:00
Shiho Takagi b4cd151a03 merge from upstream 2015-01-17 14:09:45 +11:00
Shiho Takagi 19dcf6f3d5 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-01-15 21:44:04 +11:00
Shiho Takagi ba3a1f6298 Integrate Elasticsearch and implement crop search against scientific_name 2015-01-15 19:28:28 +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 593a20c0c5 Load alternate names from CSV 2014-11-30 16:06:43 +11:00
Yoong Kang Lim b06d48091e Indentation problem 2014-11-30 15:50:13 +11:00
Skud 844791ead9 Allow multiple comma-separated scientific names 2014-11-30 15:48:58 +11:00
Yoong Kang Lim 27ad791f67 Merge remote-tracking branch 'upstream/dev' into followerdev 2014-11-30 15:16:48 +11:00
Yoong Kang Lim 13c98eac89 Wrapped tests around context blocks to clarify the purpose of the tests. 2014-11-30 15:14:56 +11:00
Skud 4e19da56a0 Rearrange fields in crop uploads (sci names last) 2014-11-30 14:51:33 +11:00
Skud 924efe6af5 Fixed a bug which only occurs in the few months before February 
This is the fundamental problem:

    2.1.2 :005 > Time.zone.now + 3.months
    => Sat, 28 Feb 2015 03:17:24 UTC +00:00
    2.1.2 :006 > Time.zone.now + 3.months + 3.months
    => Thu, 28 May 2015 03:17:32 UTC +00:00
    2.1.2 :007 > Time.zone.now + 6.months
    => Sat, 30 May 2015 03:17:37 UTC +00:00

I changed the test to use the "3.months + 3.months" formulation and it
now passes.
 2014-11-30 14:19:55 +11:00
Yoong Kang Lim 8c55a6101d Formatting problem 2014-11-21 01:14:12 +11:00
Yoong Kang Lim 0ba6562d79 Added more model tests for following behaviour 2014-11-20 01:46:04 +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 02994bd5cc Added a test for the validator to show it doesn't accept negative numbers for garden area. 2014-11-18 20:58:00 -05:00
Taylor Griffin 0ffe9adc86 tests are green 2014-11-16 21:40:43 +11:00
Taylor Griffin f1945151c7 update RSpec true / false matchers 2014-11-16 14:40:50 +11:00
Taylor Griffin 7fc886f43c implement custom Sweeper class as stop gap against errors when running specs 2014-11-16 12:01:27 +11:00
Yoong Kang Lim e687bd43dc Added model tests for follows 2014-11-13 01:22:28 +11:00
Yoong Kang Lim b5e1b6bc22 Delete unused views, add feature tests 2014-11-13 00:46:34 +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 dc2cf5275c Fix model tests for alternate names. 2014-10-18 17:30:22 +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 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