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
46eaf37437
Fixed mailing list link to point to Talk instead
2014-09-12 09:10:13 +10:00
Skud
29d43f4e5b
Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished2
2014-09-12 08:40:57 +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
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
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
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
a3213a99e8
Added apple icon for iOS users
2014-09-04 19:03:07 +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
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
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
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
Skud
965a3bf2a1
Modernise redirection after signup to use devise's stored_location_for
2014-08-31 18:28:26 +10:00
Skud
474b56cf6b
Updated devise tokens in emails for devise 3.2
2014-08-31 17:54:07 +10:00
Skud
99ffa3775e
Remove puts used for debugging
2014-08-30 18:38:16 +10:00
Skud
ecbeb986c3
Merge pull request #396 from Skud/moreb3
...
b3ify 'sort by' dropdown on crops page
2014-08-30 18:19:51 +10:00
Skud
e7d9ebe37a
b3ify 'sort by' dropdown on crops page
2014-08-30 18:05:11 +10:00
Skud
d991765edb
Fixed up label with link to field it relates to
2014-08-30 17:10:36 +10:00
Skud
d55d2c6409
Ongoing coverage improvements
2014-08-30 17:09:47 +10:00
Taylor Griffin
1cd2fd9b07
Merge branch 'dev' of https://github.com/Growstuff/growstuff into crop-suggest
2014-08-30 12:15:02 +10:00
Taylor Griffin
3fbae6a5ee
write regression spec for resource id bug when editing resource
2014-08-30 12:14:36 +10:00
Skud
fbeafd4299
Improving test coverage for gardens
2014-08-30 11:28:52 +10:00
Skud
4ebc184188
Add finished planting data (and buttons) to plantings index
...
I also removed description from the table as it was getting way too full
2014-08-30 11:11:19 +10:00
Skud
46e20f0562
Add finished planting data (and buttons) to plantings index
2014-08-30 11:04:31 +10:00
Skud
af2d0e22ee
Automatically set plantings to finished when a garden is marked inactive
2014-08-30 10:51:33 +10:00
Skud
170d6b474e
Updated garden page with "finished" plantings
...
Also added a similar "mark as inactive" button for the garden itself
and rearranged some things on the page.
2014-08-30 10:42:16 +10:00
Taylor Griffin
480e67bf2f
add default id to hidden input in auto suggest view helper to make edit work
2014-08-30 10:20:29 +10:00
Skud
facba15154
Added a button on the planting details page to mark as finished
2014-08-30 10:14:11 +10:00
Skud
9f9ef10b6a
Added finished fields to planting form and display
2014-08-30 09:52:26 +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
