mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-03 14:38:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,822 Commits 59 Branches 76 Tags
1d81064ced34b2f11eda9dfd51bbd4e9474ac111
Commit Graph

1822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Skud
25abcdc923 Upload tomato varieties to crop database 2014-09-28 13:50:55 +10:00
Skud
374c17c928 Merge pull request #413 from Skud/talklinks 
Fixed mailing list link to point to Talk instead
 2014-09-12 09:10:42 +10:00
Skud
46eaf37437 Fixed mailing list link to point to Talk instead 2014-09-12 09:10:13 +10:00
Skud
9bd4160102 Merge branch 'Skud-finished2' into dev 2014-09-12 08:41:46 +10:00
Skud
29d43f4e5b Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished2 2014-09-12 08:40:57 +10:00
Skud
aefbce3b1f Merge pull request #411 from Skud/crowdfunding 
added sitewide crowdfunding banner
 2014-09-12 08:39:27 +10:00
Skud
374987488f Fixed broken tests. 2014-09-12 08:30:44 +10:00
Skud
fa9c029493 added sitewide crowdfunding banner 2014-09-12 08:10:58 +10:00
Skud
85b5ac12ca added validation for finished_at (must be after planted_at) 2014-09-12 07:50:25 +10:00
Skud
03235f3952 Add warning about plantings being marked as finished 2014-09-12 07:43:41 +10:00
Skud
51d9bfe97e Merge branch 'Skud-finished' into dev 2014-09-10 09:12:44 +10:00
Skud
9d5c15a7da Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished 
Conflicts:
	spec/features/plantings/planting_a_crop_spec.rb
 2014-09-10 09:12:27 +10:00
Skud
e0485ade1d Added test to make sure the wrong plantings aren't finished 2014-09-10 08:06:07 +10:00
Skud
fb91c78933 Merge pull request #409 from tygriffin/prefill-crop-bug 
Prefill crop bug
 2014-09-09 22:05:15 +10:00
Taylor Griffin
138904bd82 write regression test for creating plantings, harvests and seeds form crop page 2014-09-09 21:52:50 +10:00
Taylor Griffin
00b24890f4 accept a default value in options hash of autosuggest helper 2014-09-09 21:27:21 +10:00
Skud
0c944357c0 Merge pull request #408 from catfriend/dev 
Added placeholder text for crop auto suggest
 2014-09-06 15:15:17 +10:00
catfriend
885ffab012 added contributor info 2014-09-05 20:36:58 -07:00
catfriend
b0ee83bc3e added test for adding placeholder text 2014-09-05 16:23:33 -07:00
catfriend
4caf7b9b28 added placeholder text per 78178814 2014-09-05 15:30:34 -07:00
Skud
56eaea9c06 Merge pull request #405 from Skud/cropmess 
Crop and photo bugfixes
 2014-09-04 21:23:31 +10:00
Skud
3c968ea6be Merge pull request #406 from Skud/branding2 
Branding
 2014-09-04 20:02:16 +10:00
Skud
a3213a99e8 Added apple icon for iOS users 2014-09-04 19:03:07 +10:00
Skud
495f4194e7 Fixed test for branding in navbar 2014-09-04 19:02:38 +10:00
Skud
7543221f73 Added 'skip navigation menu' link for screenreaders 2014-09-04 18:40:51 +10:00
Skud
7184b04397 Added favicon 2014-09-04 18:37:27 +10:00
Skud
0e0a13bbd1 Made sure all headings are sans-serif 2014-09-04 18:31:13 +10:00
Skud
4f4aad7626 Added pear logo to top nav 2014-09-04 18:14:49 +10:00
Skud
baf8b91a4e Removed fairly pointless test for markup 2014-09-04 18:05:10 +10:00
Skud
579f79760b remove bullet points from new photo page 2014-09-04 17:51:13 +10:00
Skud
cdbc4611c9 Fix up crop photo wrapping mess 2014-09-04 17:48:00 +10:00
Skud
ea9597ba75 Merge pull request #403 from Skud/readmeupdate 
Readme update
 2014-09-03 09:09:03 +10:00
Skud
591b8e03d6 we don't always work in pairs, just often 2014-09-03 09:08:18 +10:00
Skud
35470acb86 updated CONTRIBUTING.md with more up to date info 2014-09-03 09:06:59 +10:00
Skud
326248797e Updated readme and contributors 2014-09-03 09:00:55 +10:00
Skud
6704b97542 Merge pull request #399 from tygriffin/fix-layout 
Fix layout
 2014-09-03 08:32:43 +10:00
Taylor Griffin
982572d2bd slight change to width of index card 2014-09-03 08:02:53 +10:00
Taylor Griffin
1fc100eca4 update gem and finesse signup widget 2014-09-03 07:52:45 +10:00
Taylor Griffin
1224bd0ebb import original variables into custom 2014-09-03 07:28:27 +10:00
Taylor Griffin
c95619117b Merge branch 'dev' of https://github.com/Growstuff/growstuff into fix-layout 2014-09-02 06:34:38 +10:00
Skud
919cc45d13 Merge pull request #401 from Skud/moreb3 
Quick and dirty fix for layout of settings tabs
 2014-09-01 23:06:55 +10:00
Skud
0687625049 Quick and dirty fix for layout of settings tabs 2014-09-01 22:30:08 +10:00
Skud
551e4cbe6f Merge pull request #400 from tygriffin/fix-styles 
Fix styles
 2014-09-01 21:08:52 +10:00
Taylor Griffin
7518fbec1c add styles for alerts 2014-09-01 20:58:48 +10:00
Taylor Griffin
703de07647 add crop image class to prevent smooshing again neighboring div 2014-09-01 20:55:54 +10:00
Taylor Griffin
c9cd82d7fd increase z-index of autosuggest dropdown 2014-09-01 20:53:48 +10:00
Taylor Griffin
0af550b6e7 make top nav collapse threshold larger to prevent it from becoming too big at some browser sizes 2014-09-01 20:45:45 +10:00
Taylor Griffin
c4bd4c178d add a little offset on crop index card to prevent info from smooshing against pic 2014-09-01 20:40:16 +10:00