Skud
a3e02a3e61
Actually delete Crop.random, don't just comment it out
2014-10-15 16:47:43 +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
Skud
694bc56f68
Merge pull request #427 from oshiho3/PT60321968_corps_posts
...
Added crops-posts association as well as updated GUI for crop show
2014-10-15 12:18:54 +01: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
pozorvlak
14cf82f1d2
Merge pull request #426 from maco/dev
...
Put back oshiho3's fix, modified for new parameters
2014-10-02 17:04:03 +01:00
Mackenzie Morgan
a2f2508f0d
don't lose the thing we're attaching the photo to when we change sets. This is a modification of oshiho3's previous fix.
2014-10-02 09:38:02 -04:00
pozorvlak
494a600766
Merge pull request #423 from Skud/removebrokentest
...
Removing tests for migrations
2014-10-02 13:42:07 +01:00
Skud
45d34f7f79
Merge pull request #424 from wsmoak/testing
...
Rename Sign in tests and add Sign up tests.
2014-10-02 17:53:22 +10:00
Skud
9b43bdd29b
Merge pull request #425 from Skud/removeunusephotos
...
added deploy task to remove unused photos
2014-10-02 17:48:44 +10:00
Skud
e002cb2d35
added deploy task to remove unused photos
2014-10-02 17:48:19 +10: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
57abfa04b3
fix whitespace
2014-10-01 21:46:15 -04:00
Wendy Smoak
557d07d2f1
Rename Sign in tests and add Sign up tests.
2014-10-01 20:24:15 -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
a29d11a07c
refactor error handling on photo upload to be easier to read
2014-10-01 20:17:11 -04:00
Mackenzie Morgan
0ad217c9a2
add index to harvest_photo
2014-10-01 20:16:53 -04:00
Mackenzie
271d178cc8
Merge pull request #1 from Skud/maco-harvestphotos
...
Delete unused photos
2014-10-01 20:14:23 -04:00
Skud
9a9eeecb46
Removing tests for migrations
...
These were never run anyway (they don't have _spec.rb in their names)
and were obviously written when we had no idea what we were doing.
They're full of syntax errors and all sorts of stuff that just won't
work. The best thing is to remove them so they don't confuse people!
2014-10-02 10:09:21 +10:00
pozorvlak
41a4de7e74
Merge pull request #422 from Skud/crophierarchycache
...
Clear crop hierarchy view cache after uploading crops
2014-09-30 17:43:06 +01:00
Skud
8497782847
Clear crop hierarchy view cache after uploading crops
...
The crop_sweeper only acts in response to things that happen in the
controller. Since this works directly with the model, we need to clear
the cache fragment manually.
2014-09-30 23:02:09 +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
pozorvlak
dbfa080609
Merge pull request #421 from tygriffin/customize-generators
...
stop generating helpers, constroller specs, view specs, and javascripts
2014-09-28 23:06:41 +01:00
Taylor Griffin
87b6780220
stop generating helpers, constroller specs, view specs, and javascripts
2014-09-28 21:57:05 +10:00
pozorvlak
a34a54d995
Merge pull request #419 from Skud/tomatoes
...
Upload tomato varieties to crop database
2014-09-28 11:22:44 +01:00
Skud
25abcdc923
Upload tomato varieties to crop database
2014-09-28 13:50:55 +10:00
pozorvlak
126cb1d191
Merge pull request #418 from wsmoak/dev
...
Renamed gardens.rb to gardens_spec.rb so that these tests will run.
2014-09-26 20:12:39 +01:00
Wendy Smoak
8ab4f885f1
Renamed gardens.rb to gardens_spec.rb so that these tests will run.
2014-09-26 10:32:06 -04:00
pozorvlak
6efeb04449
Merge pull request #416 from oshiho3/bugfix_markdown
...
updated regex for crop in markdown
2014-09-19 23:45:16 +01:00
pozorvlak
52b4e27d8c
Merge pull request #415 from oshiho3/bugfix_plantphoto
...
added planting_id param to Flickr set search (new_photo_path form).
2014-09-19 16:42:49 +01:00
Shiho Takagi
60354264d6
Included PT bug# to its test description. Test using the case from the bug
2014-09-19 16:00:25 +10:00
Shiho Takagi
87643c3d1a
Merge branch 'bugfix_plantphoto' of https://github.com/oshiho3/growstuff into bugfix_plantphoto
2014-09-19 15:33:35 +10:00
Shiho Takagi
aa028db2dc
added planting_id param to Flickr set search (new_photo_path form).
2014-09-19 15:29:12 +10:00
Shiho Takagi
dd75f2aef9
updated regex for crop in markdown
2014-09-18 14:18:18 +10:00
Shiho Takagi
eeb2bf9938
added planting_id param to Flickr set search (new_photo_path form).
2014-09-17 21:38:43 +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
Mackenzie Morgan
550f3c5326
removing unneeded photo-related files
2014-09-09 22:18:43 -04:00
