mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-11 17:24:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
975 Commits 61 Branches 82 Tags
3ce246ef5adfbb4097c51d29cda93e4abe891721
Commit Graph

568 Commits

Author SHA1 Message Date
pozorvlak
5748c0989e Merge pull request #233 from Skud/planted-at-bug 
Planted at bug
 2013-06-23 07:43:52 -07:00
Skud
a70a19871a Use github version of twitter-bootstrap-rails to fix firefox new tab problem 2013-06-12 09:07:41 +10: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
903f0c808c cache recent_posts and recent_plantings partials 2013-06-07 17:52:31 +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
Skud
8046790bc7 converted product description to text (not string) 2013-06-07 09:16:18 +10:00
pozorvlak
d1ddf9a8d2 Merge pull request #225 from Skud/paypal-purchase 
We have to actually complete the purchase!
 2013-06-06 05:35:13 -07:00
Skud
786bf1547f We have to actually complete the purchase! 2013-06-06 22:21:07 +10:00
Skud
b85b533afa updated wording in support/faq 2013-06-06 21:16:46 +10:00
Skud
6cf64694f4 added account status info in various places 2013-06-06 21:07:54 +10:00
Skud
4332628d6f improved wording on shop homepage 2013-06-06 20:36:35 +10:00
Skud
2901e0cb11 tweaked wording on photos/index 2013-06-06 20:17:32 +10:00
Miles Gould
cebd6e05ac Merge branch 'dev' into logged-out 
Conflicts:
	spec/views/home/index_spec.rb
 2013-06-04 13:54:49 +01:00
Miles Gould
a0c91ee884 Changes to homepage 
- only show interesting members if logged out
 - don't show your recent posts/plantings
 - change limits on posts/plantings for better visual balance.
 2013-06-04 12:59:37 +01:00
Miles Gould
6fed41351b Show community features on logged-in homepage. 
Don't show interesting members if there are none
 2013-06-04 12:38:09 +01:00
Skud
629020237b Merge branch 'dev' into payments-new 2013-06-04 21:20:24 +10:00
Skud
6c8f2b477f minor tweakage to admin/order/search 2013-06-04 21:15:29 +10:00
Skud
a5729976c6 Merge pull request #219 from pozorvlak/delete_photos 
Delete photos
 2013-06-04 04:07:39 -07:00
pozorvlak
a5d750f9fd Merge pull request #217 from Skud/rss-bug 
Fixed RSS bug where comments were showing up as "edited"
 2013-06-04 04:04:42 -07:00
Miles Gould
a5d14321b5 Merge branch 'dev' into delete_photos 
Conflicts:
	spec/models/planting_spec.rb
 2013-06-04 11:45:44 +01:00
Skud
39d1a74745 misc tidying up 2013-06-04 20:27:56 +10:00
Skud
89a5a777e6 Merge branch 'dev' into payments-new 
Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb
 2013-06-04 19:42:00 +10:00
Skud
a3d0f15fd5 Delete photo from photos/show page 2013-06-04 13:02:29 +10:00
Skud
2839d6bf66 Fixed RSS bug where comments were showing up as "edited" 
Tried many ways to test this (assert_select, response.has_tag, etc), but
couldn't get it to work.  Have tested manually and it looks good.
 2013-06-04 12:24:53 +10:00
Skud
43798231dd added crop photos and a new placeholder image 2013-06-04 12:22:31 +10:00
Skud
2a301d352b Reverted uniqueness limits for photo/planting association 
It seems this interacts badly with the default_scope on postgres (but
    not on sqlite3).  Error message from the logs:

2013-06-01T02:21:05.312099+00:00 app[web.1]: ActiveRecord::StatementInvalid (PG::Error: ERROR:  for SELECT DISTINCT, ORDER BY expressions must appear in select list
2013-06-01T02:21:05.312099+00:00 app[web.1]: LINE 1: ...photo_id" = 2 AND "plantings"."id" = 181 ORDER BY created_at...
2013-06-01T02:21:05.312099+00:00 app[web.1]:   app/controllers/photos_controller.rb:59:in `create'
2013-06-01T02:21:05.312099+00:00 app[web.1]:                                                              ^
2013-06-01T02:21:05.312099+00:00 app[web.1]: : SELECT  DISTINCT 1 AS one FROM "plantings" INNER JOIN "photos_plantings" ON "plantings"."id" = "photos_plantings"."planting_id" WHERE "photos_plantings"."photo_id" = 2 AND "plantings"."id" = 181 ORDER BY created_at desc LIMIT 1):

For now, we'll just have to rely on the controller (which adds the
association) to keep things unique.
 2013-06-01 12:25:43 +10:00
Skud
6ecbf749eb Avoid duplicate photos on plantings (or vice versa) 
Strictly speaking this doesn't prevent you adding them if you really
try, but the validation for that was beyond what I could figure out (the
docs don't help, and all SO/blog posts are outdated and didn't
work).

However, if you do somehow manage to add dups, you will never see them
again thanks to the :uniq => true in the model.  That's good enough for
me.
 2013-06-01 12:07:17 +10:00
Skud
10fdabfe37 rearranged notes/pics on plantings page 2013-06-01 11:32:49 +10: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
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
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
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
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