Miles Gould
d57d233e52
Fix broken test.
2013-07-23 12:42:10 +01:00
Miles Gould
da15994a46
Merge branch 'dev' into seed_trade
...
Conflicts:
spec/views/crops/show.html.haml_spec.rb
2013-07-23 12:32:21 +01:00
Skud
470f8f2f22
allow nil/blank qtys for plantings/seeds
2013-07-23 21:19:21 +10:00
Skud
bdc267b044
added slug for seeds
2013-07-23 21:14:24 +10:00
Skud
adceb61679
fixed javascript datepicker for seeds
2013-07-23 20:55:54 +10:00
Skud
e17f5d6599
Merge pull request #255 from Skud/photo_set
...
Photo set
2013-07-23 03:47:36 -07:00
Skud
6c8b959120
rake task to set seed.tradable_to to nowhere
2013-07-23 20:47:06 +10:00
Skud
2185f257c0
set 'nowhere' as default seed.tradable_to
2013-07-23 20:43:13 +10:00
Skud
6c49c80931
test cleanups (no idea how they got into that state)
2013-07-23 20:28:14 +10:00
Skud
d227da891e
Merge branch 'dev' into seed_trade
2013-07-23 20:21:58 +10:00
Skud
be208f82d1
Merge branch 'contrib-guidelines' of https://github.com/Skud/growstuff into Skud-contrib-guidelines
2013-07-23 20:12:23 +10:00
Skud
2b6bdeda16
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
...
Conflicts:
spec/views/crops/show.html.haml_spec.rb
2013-07-23 19:35:31 +10:00
Skud
1867f8b07f
minor wording changes
2013-07-23 19:33:02 +10:00
Ryan Clark
a87db0e406
Show list of seeds for trade on crop/show
2013-07-22 21:15:05 -07:00
Skud
091a2dc366
tidying up/bugfixing seed display
2013-07-22 16:41:06 +10:00
Skud
52a00c5ed4
added numeric validation to qty for planting/seed
2013-07-22 16:40:42 +10:00
Skud
3a96cd96df
removed tradable boolean field
...
we're now relying just on the "tradable_to" field, which is clearer.
2013-07-22 15:47:25 +10:00
Skud
8d9fc66cd5
cleaned up member.flickr_photos based on flickraw author's advice
2013-07-19 00:17:43 +10:00
pozorvlak
2950da9900
Merge pull request #254 from Skud/seed_trade
...
Seed trade
2013-07-18 07:11:19 -07:00
Skud
a035e70db6
show the name of the selected set
2013-07-19 00:05:20 +10:00
Skud
610b100f7f
seed page: cleaned up views/tests for location
2013-07-18 23:54:51 +10:00
Miles Gould
96e66cd9bb
New photo: show an h2 with the name of the current set
...
Also don't show a sets dropdown if the user has no sets.
2013-07-18 14:45:36 +01:00
Miles Gould
2b863cd62e
Fix problem adding photos from photosets.
...
When we fetched photos from a photoset, the response object didn't
respond to to_a, breaking our controller code. This turned out to be due
to weirdness in FlickRaw's API:
https://github.com/hanklords/flickraw/issues/58
2013-07-18 14:16:22 +01:00
Miles Gould
c977709235
Stop controller tests from connecting to Flickr
...
... by stubbing out Member#flickr_sets in a photo_controller test. I
looked at the flickrmocks gem, but it doesn't seem very helpful - it
still requires you to connect to Flickr.
2013-07-18 13:18:01 +01:00
Miles Gould
8b3c1e9c1d
Typo fix.
2013-07-18 12:41:59 +01:00
Ryan Clark
269162c759
Tidied up seed views and added location stuff
2013-07-17 19:37:35 -07:00
Ryan Clark
21a0590114
Add tradable attributes to seed views
2013-07-17 18:59:32 -07:00
Ryan Clark
e9dd18d977
Added tradable and tradable_to to seeds
2013-07-17 18:25:55 -07:00
Ryan Clark
973567bfdc
Remane use_by to plant_before to humor Skud
2013-07-17 18:24:12 -07:00
Ryan Clark
454e7ceb3d
merging dev
2013-07-17 17:51:08 -07:00
Skud
1083763fbd
Merge branch 'sun_shade_metadata' of https://github.com/Skud/growstuff into Skud-sun_shade_metadata
2013-07-18 10:21:11 +10:00
Skud
a259b60c2d
Merge pull request #252 from Skud/seeds
...
Seeds
2013-07-17 17:20:15 -07:00
Ryan Clark
6729a8a28c
Pass set to member.flickr_photos - broken\!
2013-07-16 18:52:13 -07:00
Ryan Clark
106c3a74ba
Display a set dropdown on the new photo page.
2013-07-16 18:27:06 -07:00
Ryan Clark
7f82e481ec
Merging dev
2013-07-16 17:23:15 -07:00
Skud
491e97c997
connected seeds into other parts of the site
2013-07-15 23:29:14 +10:00
Skud
cc711a0a48
prettified seed-related views
2013-07-15 22:53:30 +10:00
Skud
b27e1d4db3
let's not use nested resources (yet)
2013-07-15 22:53:30 +10:00
Skud
91ea5146ac
rails g scaffold seed...
2013-07-15 22:53:29 +10:00
Skud
626d6e2f94
Merge pull request #251 from Growstuff/dev
...
Production push: fix CSS bug hiding headings under navbar
2013-07-14 17:37:07 -07:00
Skud
334ca315b2
Merge pull request #250 from Skud/hidden-headings
...
fixed broken CSS that was hiding headings
2013-07-14 17:32:19 -07:00
Skud
b9a3dec6cc
fixed broken CSS that was hiding headings
2013-07-15 10:27:54 +10:00
Joseph Caudle
b6ad0fedca
Merge pull request #249 from Growstuff/dev
...
Production push: homepage member display, older photos, planted from, forex, error messages, firefox links, planted_at bugfix
2013-07-11 19:50:09 -07:00
Skud
ece34149a2
need to test sunniness/planted_from.blank?
2013-07-11 22:15:56 +10:00
Miles Gould
c4f4f4f7ef
Show planted_from frequencies on crop page.
2013-07-11 13:08:01 +01:00
Miles Gould
4d9ddd2707
Crop: method to return hash of planted_from frequencies
...
Also tidied up tests which relied on the default planting factory having
a planted_from value set.
2013-07-11 13:01:52 +01:00
Miles Gould
744b526dd1
Show sunniness frequencies on crop page
...
Also cleaned up tests that were relying on the default planting factory
to have a sunniness value set.
2013-07-11 12:41:22 +01:00
Miles Gould
fbc64a1ee2
Crop: method to return hash of sunniness values.
2013-07-11 12:13:38 +01:00
pozorvlak
7209eb41bf
Merge pull request #247 from Skud/staff
...
Lots of stuff, including staff on homepage, testing on postgres, and various others
2013-07-09 04:05:12 -07:00
Skud
e3cddf183e
Cleaned up seeds.rb, added methods etc.
...
Also ensured that things that are needed in production are created in
production: staff and free account types, admin and wrangler roles.
2013-07-09 21:02:01 +10:00
Miles Gould