mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-13 18:55:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,058 Commits 58 Branches 82 Tags
2b6bdeda1663c4faf9c4831bf62003f157cc6841
Commit Graph

321 Commits

Author SHA1 Message Date
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
Skud
610b100f7f seed page: cleaned up views/tests for location 2013-07-18 23:54:51 +10: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
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
Skud
8046790bc7 converted product description to text (not string) 2013-06-07 09:16:18 +10:00
Skud
4c2971f670 oops, fixed broken test for checkout button 2013-06-06 21:19:24 +10:00
Skud
6cf64694f4 added account status info in various places 2013-06-06 21:07:54 +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
Skud
629020237b Merge branch 'dev' into payments-new 2013-06-04 21:20:24 +10: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
43798231dd added crop photos and a new placeholder image 2013-06-04 12:22:31 +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
44a236d90d Display all photos on index page. 2013-05-31 12:05:09 +01:00
Miles Gould
20eeec43ca Merge branch 'dev' into photos 
Conflicts:
	db/schema.rb
 2013-05-31 11:24:19 +01:00
Skud
cbca8c19a5 added admin controller and index view 2013-05-31 10:23:06 +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
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