Skud
77bb008083
changed flickr_photo_id to string
...
... because integer worked fine in dev (on sqlite3) but broke on staging
(with postgres). Turns out flickr photo IDs are quite LARGE integers.
But really they could be anything, so string seems safest.
2013-06-01 11:21:17 +10:00
Skud
2667c4aa93
Merge pull request #210 from Skud/photos
...
Photos
2013-05-31 07:38:11 -07:00
Skud
cd111f4cc2
added alt tag
2013-05-31 23:37:48 +10:00
Skud
c63eb64565
photo and planting owners must match
2013-05-31 23:35:07 +10:00
Skud
cab7348a35
show plantings on photo page
2013-05-31 23:13:47 +10:00
Skud
d635d58bf1
show photos on planting page
2013-05-31 22:56:32 +10:00
Miles Gould
e072883bb9
Connect plantings to photos.
2013-05-31 13:10:54 +01:00
Miles Gould
c734f62189
Plantings HABTM photos.
2013-05-31 13:10:54 +01:00
Miles Gould
44a236d90d
Display all photos on index page.
2013-05-31 12:05:09 +01:00
Miles Gould
b2916e28f3
Don't recreate photos, but update metadata.
2013-05-31 11:48:24 +01:00
Miles Gould
b1b24c4323
Delete unused photos_helper.
2013-05-31 11:28:59 +01:00
Miles Gould
20eeec43ca
Merge branch 'dev' into photos
...
Conflicts:
db/schema.rb
2013-05-31 11:24:19 +01:00
Skud
f1b5741023
added doc/ to .gitignore
2013-05-31 12:55:39 +10:00
Skud
57289f5d99
Removed docs directory.
...
It's not doing anything useful for us, and accidentally running "rdoc"
with the wrong command line args (as I just did) dumps a bunch of stuff
in it, which then pollute further commits. I'm going to gitignore it,
too (see next commit).
2013-05-31 12:54:13 +10:00
Skud
08c3ec7dec
Vendored the activemerchant gem to help with testing
...
We needed a bogus paypal gateway as per
http://infotrope.net/2013/05/31/testing-paypal-express-with-activemerchants-bogusgateway-and-how-to-make-it-work/
Tests now pass usefully.
2013-05-31 12:15:23 +10:00
Skud
cbca8c19a5
added admin controller and index view
2013-05-31 10:23:06 +10:00
Skud
7a1eaeffee
added admin controller and index view
2013-05-29 14:37:42 +10:00
Skud
b60790c8ad
record paypal token/payer id on completion, for reference
2013-05-29 13:41:34 +10:00
Skud
5e678d1dbd
default test paypal gateway details to 'dummy' or it fails
2013-05-29 13:22:17 +10:00
Skud
89b62e18df
Roughly got Paypal working, after much messing around.
...
Still need more tests for the orders_controller, and to store the token
when it's returned.
2013-05-28 16:37:44 +10:00
Skud
c7c2a94078
pass validation errors through controller
2013-05-28 14:14:59 +10:00
Skud
dd556d8638
Merge branch 'dev' into payments-new
2013-05-28 14:07:53 +10:00
pozorvlak
ab951ab999
Merge pull request #209 from Skud/comments-rss
...
Comments rss
2013-05-24 04:09:23 -07:00
Skud
29cbd5d21e
added Craig to contributors list
2013-05-24 14:58:23 +10:00
Skud
5b2fe1b415
Merge branch 'dev' of https://github.com/Growstuff/growstuff into comments-rss
...
Conflicts:
db/schema.rb
2013-05-24 14:57:17 +10:00
Skud
078f89ecbe
Merge pull request #206 from Skud/contributors
...
Added list of contributors
2013-05-23 21:55:59 -07:00
Skud
18b92b133b
Added titles to comment items in RSS
2013-05-24 14:43:45 +10:00
Skud
e17dcf8671
Reordered comments: they are now DESC by default
...
Added scope "post_order" to order them ASC for display on post page.
Also tweaked post/comment views a bit.
2013-05-24 14:36:58 +10:00
Skud
425a2b03fd
Added RSS feed for comments on a single post
2013-05-24 13:43:06 +10:00
Skud
0d3588535e
Added RSS feed for all comments
2013-05-24 13:29:17 +10:00
Skud
57f8575ab9
removed unwanted @recent_comments, replaced w pagination
2013-05-24 12:54:57 +10:00
Craig Read
9437e65763
Replaced plantings RSS with HAML
...
Removed the redundant @recent_plantings variable and added pagination
2013-05-24 12:43:51 +10:00
Craig Read
d563f0ceae
Converting crops RSS to HAML
...
Added spec for crops RSS
Removed redundant @new_crops instance variable (not needed as we now
have pagination).
2013-05-24 12:22:41 +10:00
Craig Read
9c2fed461d
Removed redundant @recent_posts instance variable
...
Not required, as we have pagination by default
2013-05-24 12:05:47 +10:00
Craig Read
bc03a5c488
Converted Posts RSS to HAML
2013-05-24 11:58:40 +10:00
Ryan Clark
c6f04d78da
removed Pathogen from system
2013-05-21 22:48:08 -07:00
Ryan Clark
4ef2c3c6e6
Merge branch 'master' of https://github.com/IAMRYO/growstuff into dev
2013-05-21 22:42:36 -07:00
Skud
98beebd697
fixed bug with non-int prices
...
now if you choose to pay 33.33 it doesn't round to 33.00
also removed PUT and DELETE actions from order items
(we don't want them for now, can reinstate later if/when we do.)
2013-05-22 11:51:38 +10:00
Skud
257db239fd
remove unneeded edit/new actions from order_item
2013-05-22 11:25:48 +10:00
Skud
89069b4bd2
don't allow multiple order items per order
2013-05-22 11:22:10 +10:00
Skud
f955d14149
Don't display shop if they already have a paid account
...
This works fine in reality, but we can't figure out how to write tests
for it. For some reason the @member object, which passes a test for
is_paid?, doesn't get recognised as such when it's passed through to the
view itself. Help?
2013-05-22 10:57:20 +10:00
Skud
f138c99846
Merge branch 'dev' into payments-new
...
Conflicts:
db/schema.rb
2013-05-22 10:21:43 +10:00
Skud
1ad27fc885
Broke out "committers" and "contributors"
...
I figured this would make it easier to show who's a good person to ask
for help or information, while still crediting everyone who's
contributed.
2013-05-20 15:00:29 +10:00
Skud
e588b312f9
Added list of contributors
...
I know git(hub) gives us much of this, but it doesn't credit the
"copilot" from pairing, so this is a way to list *everyone* who's
contributed to our code, even if they didn't do the actual commit with
their own github account.
2013-05-20 14:56:53 +10:00
Skud
4515167f90
Merge pull request #203 from Skud/crop-hierarchy
...
added crop hierarchy basics
2013-05-19 20:31:19 -07:00
Skud
dad64d41fb
show account status/upgrade button in various places
2013-05-20 12:57:35 +10:00
Skud
d601396741
moved the update_order method from product to member
2013-05-20 11:35:10 +10:00
Skud
1b9b1875b8
Merge pull request #205 from pozorvlak/km_miles
...
Fix "km miles of" typo.
2013-05-19 18:16:08 -07:00
Skud
923e298e7b
Merge pull request #202 from Skud/social-icons
...
Added flickr icon, updated twitter icon
2013-05-19 18:15:56 -07:00
Skud
c644753a9b
Call update_account when you complete an order.
...
Also had to tweak product.update_account to actually save the account!
2013-05-18 11:32:14 +10:00
