Skud
c12c0acc14
removed author fields from RSS
2013-08-05 12:23:36 +10:00
Skud
fa0d818fd9
added metadata to plantings RSS
2013-08-05 12:05:06 +10:00
Skud
128c76bca3
added RSS feed for seeds
2013-08-05 12:04:45 +10:00
Skud
e77c402ad9
Merge pull request #263 from Skud/crop_photos
...
Crop photos
2013-07-29 08:11:05 -07:00
Skud
8bc75a2276
Show photos on crop page
...
As a side effect of this, we moved a bunch of chunks of the crops page
out into partials. We also moved photo thumbnails (as formerly seen on
the plantings page) into a partial, and then used it to display photos
on the crops page as well.
2013-07-29 11:25:36 +10:00
Skud
a56af4e88f
removed test for member name in navbar
2013-07-27 14:55:06 +10:00
Skud
b8e0f135f0
rearranged navbar yet again
2013-07-26 15:45:13 +10:00
Skud
7c6d7ba3a9
rearranged routing to avoid ?owner_id=99
2013-07-26 15:29:30 +10:00
Skud
ebb8765583
make gardens page look like plantings/seeds
2013-07-26 14:48:55 +10:00
Skud
e2754a94d9
added pagination to seed and planting index pages
2013-07-26 14:36:12 +10:00
Skud
def6426e49
Fixed broken test for clicky analytics
2013-07-26 14:35:42 +10:00
Skud
1ac5683557
display plantings in table form, like seeds
2013-07-26 14:22:49 +10:00
Skud
955975a115
rearranged navbar to include Your Stuff
2013-07-26 14:16:30 +10:00
Skud
fd466e795b
Minor tweaks to seed trading:
...
- changed "Will trade to" to "Will trade" on seeds/show page
- on crop page, only list tradable seeds (not "nowhere" ones) -- did
this by adding a tradable scope to Crop
- on crop page, say "(location unknown)" where necessary
- change heading on crop page to "Find seeds"
- show "Find seeds" heading regardless of whether any are available, and
say there are none if there aren't any, along with a link to add some
- moved "sign in or sign up to add seeds" to under the Find seeds area
2013-07-24 11:20:47 +10:00
Miles Gould
b7cbadf84a
Merge branch 'dev' into seed_trade
...
Conflicts:
spec/views/crops/show.html.haml_spec.rb
2013-07-23 12:59:41 +01:00
Skud
292f5185ec
Merge pull request #256 from Skud/seed_trade
...
Seed trade
2013-07-23 04:47:51 -07:00
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
e17f5d6599
Merge pull request #255 from Skud/photo_set
...
Photo set
2013-07-23 03:47:36 -07: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
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
Ryan Clark
a87db0e406
Show list of seeds for trade on crop/show
2013-07-22 21:15:05 -07: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
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
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
106c3a74ba
Display a set dropdown on the new photo page.
2013-07-16 18:27:06 -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
91ea5146ac
rails g scaffold seed...
2013-07-15 22:53:29 +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
pozorvlak
f16999c3bd
Merge pull request #246 from Skud/older-photos
...
view/select older flickr photos
2013-07-05 08:52:25 -07:00
Skud
db16ad34f7
view/select older flickr photos
2013-07-05 22:07:55 +10:00
Skud
902b82a295
display planted_from on planting page
2013-07-05 21:09:21 +10:00
Skud
1689d7fdb1
added planted_from to planting form
2013-07-05 20:57:14 +10:00
Skud
e4dd0f98e8
Merge pull request #243 from lucymclaughlin/forex_link
...
Forex link
2013-07-04 01:28:40 -07:00
Lucy
778d7a68c3
Fix bug in order total; add conversion link to order show.
...
The old order total method did not account for quantities. The
view test for order totals was not catching this, so we've
strengthened it. We also added a conversion link to the order
summary page and created an additional test to check that orders
with more than one item were generating the correct total.
2013-07-03 14:10:37 +01:00
Lucy
e674a6572e
Added conversion links for recommended prices.
...
The paragraphs were getting a bit verbose so we shortened the link
text as well. Added an additional test to make sure the link is
working here too.
2013-07-03 13:22:07 +01:00
Lucy
5c92bb04d3
Updated the foreign exchange link to use configured currency.
2013-07-03 13:04:43 +01:00
Lucy
67c457dfcd
Modified the foreign exchange link to convert the right price.
...
Changed the forex site to Wolfram Alpha from XE, which allow us
to convert the right number of AUD with one click. Upated tests to
reflect this change.
2013-07-03 12:59:49 +01:00
Lucy
80ed2179e2
Proof of concept for adding a foreign exchange link to the shop.
...
Added a function that returns a link for a foreign exchange site
and showed it on the Shop page. Also included a test to make sure
it works.
2013-07-03 12:50:56 +01:00
Miles Gould
8dceb985a1
Fix pending tests in views/shop/index.
...
We needed to stub out current_member, not current_user.
2013-06-26 10:55:19 +01:00
Miles Gould
0a8aaf0ee6
Create free account type if it doesn't exist; fix tests.
2013-06-26 10:55:19 +01:00
Skud
2ecbd8315d
bugfix: don't say 'not yet set' in planting form
...
PT: https://www.pivotaltracker.com/story/show/51457917
Maco found this. The problem was that if you had a blank planting date,
and then re-edited the planting, it would say "not yet set" in the form
field, then die when it later tried to convert that to a date.
I replaced Miles's planted_at_string stuff in the model with a simpler
parse_date method in the application helper.
2013-06-11 16:08:02 +10:00
Skud
df60a7c4dc
display recommended price on product admin pages
2013-06-07 11:36:03 +10:00
Skud
cb3e0fb526
added optional recommended price to products
2013-06-07 09:53:40 +10:00
