mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-13 02:35:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,125 Commits 57 Branches 82 Tags
2cd298fbde7d00a7f49b8e130ca6262e1b2c2532
Commit Graph

229 Commits

Author SHA1 Message Date
Skud
2cd298fbde refactored 'interesting plantings' 2013-08-07 13:21:26 +10:00
Skud
4bcc408236 added recent scope for crops 2013-08-07 13:21:26 +10:00
Skud
82da4a09f0 added default sort (created at desc) to seeds 2013-07-26 14:37:12 +10:00
Skud
fd466e795b Minor tweaks to seed trading: 
- changed "Will trade to" to "Will trade" on seeds/show page
- on crop page, only list tradable seeds (not "nowhere" ones) -- did
this by adding a tradable scope to Crop
- on crop page, say "(location unknown)" where necessary
- change heading on crop page to "Find seeds"
- show "Find seeds" heading regardless of whether any are available, and
say there are none if there aren't any, along with a link to add some
- moved "sign in or sign up to add seeds" to under the Find seeds area
 2013-07-24 11:20:47 +10:00
Miles Gould
b7cbadf84a Merge branch 'dev' into seed_trade 
Conflicts:
	spec/views/crops/show.html.haml_spec.rb
 2013-07-23 12:59:41 +01:00
Skud
292f5185ec Merge pull request #256 from Skud/seed_trade 
Seed trade
 2013-07-23 04:47:51 -07:00
Miles Gould
da15994a46 Merge branch 'dev' into seed_trade 
Conflicts:
	spec/views/crops/show.html.haml_spec.rb
 2013-07-23 12:32:21 +01:00
Skud
470f8f2f22 allow nil/blank qtys for plantings/seeds 2013-07-23 21:19:21 +10:00
Skud
bdc267b044 added slug for seeds 2013-07-23 21:14:24 +10:00
Skud
e17f5d6599 Merge pull request #255 from Skud/photo_set 
Photo set
 2013-07-23 03:47:36 -07:00
Skud
2185f257c0 set 'nowhere' as default seed.tradable_to 2013-07-23 20:43:13 +10:00
Skud
d227da891e Merge branch 'dev' into seed_trade 2013-07-23 20:21:58 +10:00
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
Ryan Clark
a87db0e406 Show list of seeds for trade on crop/show 2013-07-22 21:15:05 -07:00
Skud
52a00c5ed4 added numeric validation to qty for planting/seed 2013-07-22 16:40:42 +10:00
Skud
3a96cd96df removed tradable boolean field 
we're now relying just on the "tradable_to" field, which is clearer.
 2013-07-22 15:47:25 +10:00
Skud
8d9fc66cd5 cleaned up member.flickr_photos based on flickraw author's advice 2013-07-19 00:17:43 +10:00
Miles Gould
2b863cd62e Fix problem adding photos from photosets. 
When we fetched photos from a photoset, the response object didn't
respond to to_a, breaking our controller code. This turned out to be due
to weirdness in FlickRaw's API:
https://github.com/hanklords/flickraw/issues/58
 2013-07-18 14:16:22 +01:00
Miles Gould
8b3c1e9c1d Typo fix. 2013-07-18 12:41:59 +01:00
Ryan Clark
e9dd18d977 Added tradable and tradable_to to seeds 2013-07-17 18:25:55 -07:00
Ryan Clark
973567bfdc Remane use_by to plant_before to humor Skud 2013-07-17 18:24:12 -07:00
Ryan Clark
6729a8a28c Pass set to member.flickr_photos - broken\! 2013-07-16 18:52:13 -07:00
Ryan Clark
106c3a74ba Display a set dropdown on the new photo page. 2013-07-16 18:27:06 -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
Skud
ece34149a2 need to test sunniness/planted_from.blank? 2013-07-11 22:15:56 +10: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
fbc64a1ee2 Crop: method to return hash of sunniness values. 2013-07-11 12:13:38 +01:00
Skud
7801a7ec09 Merge branch 'dev' into staff 2013-07-09 10:05:37 +10:00
Skud
ec80b01c7a cleaning up tests on postgres 
- still trying to make sure we explicitly use a real member, not just
assume there's one with id = 1

- also it looks like the tests for post activity are passing for obscure
reasons on sqlite when they shouldn't be. this is a known bug
(https://www.pivotaltracker.com/story/show/51280861) apparently
invisible to us under sqlite.
 2013-07-08 12:18:51 +10:00
Skud
878af07419 gave up on not_staff, shuffling interesting members instead 2013-07-08 11:54:55 +10: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
b71ac3decb added planted_from (eg seed, seedling) 2013-07-05 20:53:11 +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
650f24099d Added default account type of "Free" in config/applications.rb 2013-07-03 11:04:42 +01:00
Miles Gould
5bcd4c2edd Use ActiveRecord methods for not_staff join code. 
- set member.account_type directly in tests, because changes to
   member.account.account_type weren't being persisted.
 2013-06-26 10:55:19 +01:00
Miles Gould
f6073ab01c Remove "if account_type" checks in Account. 
- remove account_type_string method
 - simplify paid_until_string.
 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
Lucy
6ccf8f397f Give new users a free account. 2013-06-26 10:55:18 +01:00
Miles Gould
c6eb835771 Tests and sketch implementation of not_staff scope. 
It doesn't work and we don't yet know why :-(
 2013-06-26 10:55:18 +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
903f0c808c cache recent_posts and recent_plantings partials 2013-06-07 17:52:31 +10:00
Skud
cb3e0fb526 added optional recommended price to products 2013-06-07 09:53:40 +10:00
Skud
6cf64694f4 added account status info in various places 2013-06-06 21:07:54 +10: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
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