mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-02 11:14:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 96 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud 266575252f minor improvement to paypal API env var checks 2013-06-04 21:44:32 +10: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 36a959c92e Give Skud a staff account as part of oneoff shop setup 2013-06-04 20:35:50 +10:00
pozorvlak fd3aeb8f59 Merge pull request #218 from Skud/crop-photos 
added crop photos and a new placeholder image
 2013-06-04 03:34:18 -07:00
Skud 39d1a74745 misc tidying up 2013-06-04 20:27:56 +10:00
Skud 660d70645e Added oneoff task to set up shop/products/etc 2013-06-04 20:21:59 +10:00
Skud 4919bc9670 added reminder to deploy tasks to set paypal details 2013-06-04 19:44:23 +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 d66c85ff75 Merge pull request #215 from Growstuff/dev 
Production push: photos, crop wrangling, rss
 2013-06-02 21:43:46 -07:00
Skud e9a78140d3 Merge pull request #214 from Skud/deploy-tasks 
added deploy tasks script
 2013-06-02 21:35:01 -07:00
Skud 5ba023ad01 added deploy tasks script 2013-06-03 14:34:29 +10:00
Skud b2fc3c7e71 Merge pull request #213 from Skud/fix-photos-again 
Reverted uniqueness limits for photo/planting association
 2013-05-31 19:28:32 -07: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 29c505eb18 Merge pull request #212 from Skud/photos-view-tweak 
Photos view tweak
 2013-05-31 19:10:25 -07: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 f7ae13d5fa Merge pull request #211 from Skud/photos-fix 
changed flickr_photo_id to string
 2013-05-31 18:23:04 -07:00
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