mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-26 02:33:03 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,311 Commits 64 Branches 76 Tags
67ed1e2170e7e7ee252c6510e85f475360466a20
Commit Graph

123 Commits

Author SHA1 Message Date
Lilly
5c4ee581cc Added 'bulb' as a 'planted_from' option. 2013-08-30 15:08:23 +10:00
Skud
b73c4db17a Merge branch 'newsletter' of https://github.com/Skud/growstuff into Skud-newsletter 
Conflicts:
	db/schema.rb
	spec/models/member_spec.rb
 2013-08-29 00:06:44 +10:00
Skud
290535b557 Add newsletter subscription checkbox 2013-08-27 21:22:35 +10:00
Skud
99bfc704dc Added plantings_count (i.e. counter_cache) to Member 
Also removed the superfluous .plantings_count method on Crop, which was
causing some confusion.

A thing we learned today: we should use .size to find the size of
ActiveRecord collections, not .count, because .count doesn't use the
cache (while .size does).
 2013-08-26 13:54:09 +10:00
Skud
1ad416269d Added owner to planting 
Previously we got the owner indirectly, through the garden in which the
planting was planted.  Now we're directly specifying an owner.  This
allows us to let people plant things in each other's gardens.

Tests are probably broken at this point; we're about to refactor ALL THE
THINGS.
 2013-08-26 12:17:06 +10:00
Skud
9df8ec15ba Merge branch 'dev' of https://github.com/Growstuff/growstuff into member-bio 
Conflicts:
	db/schema.rb
 2013-08-22 13:15:02 +10:00
Skud
183acff5f4 populate scientific names creator field 2013-08-21 17:52:33 +10:00
Skud
a5b2db3458 added creator to scientific names 2013-08-21 17:50:51 +10:00
martyhines
eaa8ca0084 set default crop creator (rake task, deploy script, seeds) 2013-08-20 22:30:08 -04:00
martyhines
e77f7fdf31 Added creator field to crops 2013-08-20 21:22:02 -04:00
Skud
f0e3c88bd8 Break out interesting? into its own method 2013-08-19 18:09:39 +10:00
martyhines
0d5b2bbcce Added bio to member model 2013-08-08 21:38:01 -04: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
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
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
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
106c3a74ba Display a set dropdown on the new photo page. 2013-07-16 18:27:06 -07:00
Skud
91ea5146ac rails g scaffold seed... 2013-07-15 22:53:29 +10:00
Skud
e3cddf183e Cleaned up seeds.rb, added methods etc. 
Also ensured that things that are needed in production are created in
production: staff and free account types, admin and wrangler roles.
 2013-07-09 21:02:01 +10:00
Skud
9df5feaf1c Removed test user seeding from test/travis envs 
We don't actually use these for testing (and shouldn't).
 2013-07-09 20:41:05 +10:00
Skud
7801a7ec09 Merge branch 'dev' into staff 2013-07-09 10:05:37 +10:00
Skud
706881dbdb set up test users in travis environment 2013-07-08 11:30:17 +10:00
Skud
b71ac3decb added planted_from (eg seed, seedling) 2013-07-05 20:53:11 +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
Miles Gould
9d624902e8 Fix string/integer conversions in migrations. 2013-06-04 13:25:23 +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
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
d635d58bf1 show photos on planting page 2013-05-31 22:56:32 +10:00
Miles Gould
c734f62189 Plantings HABTM photos. 2013-05-31 13:10:54 +01:00
Miles Gould
20eeec43ca Merge branch 'dev' into photos 
Conflicts:
	db/schema.rb
 2013-05-31 11:24:19 +01:00
Skud
b60790c8ad record paypal token/payer id on completion, for reference 2013-05-29 13:41:34 +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
Craig Read
bc03a5c488 Converted Posts RSS to HAML 2013-05-24 11:58:40 +10:00
Skud
f138c99846 Merge branch 'dev' into payments-new 
Conflicts:
	db/schema.rb
 2013-05-22 10:21:43 +10:00
Skud
3aaf344951 rename account details to just account 2013-05-18 10:50:36 +10:00
Skud
8b7f8faae6 added account type and paid months columns to product 2013-05-18 10:27:08 +10:00
Skud
daa46d7acb seed account types; require name too 2013-05-18 09:49:00 +10:00
Skud
c595b2181d added account_types, fixed a bunch of tests 2013-05-17 16:07:46 +10:00
Skud
df5ee9cf4b give each member an account_detail entry 2013-05-17 15:28:22 +10:00
Skud
0157229936 added account_details table, set up abilities 
also tweaked some order/order_item related abilities
 2013-05-17 13:05:46 +10:00
Skud
561dc837a7 modify seeds.rb to use integer prices 2013-05-17 10:28:55 +10:00
Skud
65431ed41f some improvements to the HAML RSS 2013-05-16 21:39:17 +10:00
Skud
abcba35a71 Converted prices to integers/cents to avoid floating point trouble 2013-05-15 23:09:35 +10:00
Skud
8626702544 Fixed type for member_id (should be integer) 2013-05-15 15:51:20 +10:00
Skud
7d74203735 rails g scaffold OrderItem... 2013-05-15 13:47:16 +10:00