mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-02 13:16:35 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 62 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud
9f8919e180 Merge pull request #230 from Skud/recommended-price 
Production push: longer product description, recommended price
 2013-06-06 18:45:07 -07:00
Skud
20d58f1365 Merge pull request #229 from Skud/recommended-price 
display recommended price on product admin pages
 2013-06-06 18:37:29 -07:00
Skud
df60a7c4dc display recommended price on product admin pages 2013-06-07 11:36:03 +10:00
Skud
11b17b7a17 Merge pull request #228 from Skud/recommended-price 
added optional recommended price to products
 2013-06-06 18:06:40 -07:00
Skud
cb3e0fb526 added optional recommended price to products 2013-06-07 09:53:40 +10:00
Skud
747c8e4e33 Merge pull request #227 from Skud/product-desc 
converted product description to text (not string)
 2013-06-06 16:27:24 -07:00
Skud
8046790bc7 converted product description to text (not string) 2013-06-07 09:16:18 +10:00
Skud
8383e9b691 Merge pull request #226 from Growstuff/dev 
Production push: crop photos, payments, homepage improvements, rss bugfix
 2013-06-06 05:43:57 -07: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
pozorvlak
8da2000f36 Merge pull request #224 from Skud/launch-tweaks 
Launch tweaks
 2013-06-06 04:33:52 -07:00
Skud
4c2971f670 oops, fixed broken test for checkout button 2013-06-06 21:19:24 +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
170315e4bd added test for default_photo ordering 2013-06-06 20:28:33 +10:00
Skud
2901e0cb11 tweaked wording on photos/index 2013-06-06 20:17:32 +10:00
Skud
dd51cf669b Merge pull request #221 from pozorvlak/logged-out 
Show community features on logged-in homepage.
 2013-06-04 05:56:03 -07: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
pozorvlak
8fadbf11d1 Merge pull request #223 from pozorvlak/fixup_deploy 
Fix to deploy-tasks bash script.
 2013-06-04 05:39:32 -07:00
Miles Gould
5e271e6279 Fix to deploy-tasks bash script. 2013-06-04 13:37:54 +01:00
pozorvlak
a19596cf2f Merge pull request #222 from pozorvlak/fixup_migration 
Fix string/integer conversions in migrations.
 2013-06-04 05:27:04 -07:00
Miles Gould
9d624902e8 Fix string/integer conversions in migrations. 2013-06-04 13:25:23 +01:00
pozorvlak
7d2bf2e454 Merge pull request #220 from Skud/payments-new 
Payments
 2013-06-04 05:02:39 -07: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
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