mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-06 21:13:01 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,317 Commits 66 Branches 92 Tags
7d5643e30df73fb91d0da52b94e00a3af769eb0e
Commit Graph
86 Commits
Author SHA1 Message Date
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 a5b2db3458 added creator to scientific names 2013-08-21 17:50:51 +10: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
Skud bdc267b044 added slug for seeds 2013-07-23 21:14:24 +10: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
Skud 91ea5146ac rails g scaffold seed... 2013-07-15 22:53:29 +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
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 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 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
Skud 1d54a63f5d Merge branch 'dev' into payments-new 2013-05-15 11:37:16 +10:00
Skud ebd2446a33 added crop hierarchy basics 2013-05-14 23:24:06 +10:00
Miles Gould 746386731a Add metadata to photos and display it on photos/show. 2013-05-09 14:51:38 +01:00
Skud 5ae5e0f959 rails g scaffold Photo... 2013-05-08 20:52:35 +10:00
Skud 2563787dc7 added Member.current_order method 2013-05-08 15:41:39 +10:00
Skud 42cfa17b7e order HABTM product 2013-05-07 22:10:23 +10:00
Skud 245115fd7f rails g scaffold Order... 2013-05-07 21:14:08 +10:00
Skud af38f8574e rails g scaffold Product... 2013-05-07 21:13:23 +10:00
gnattery 939a10d2f4 Post subjects cannot be nil 2013-04-30 12:20:26 +01:00
Miles Gould ff80b63743 Add a "name" column to authentications. 2013-04-09 17:23:59 +01:00
Miles Gould 5ea91bf56a Added an Authentications table. 
Connects users to remote web services, as recommended at
http://asciicasts.com/episodes/235-omniauth-part-1

In addition, we store "token" and "secret" fields.
 2013-04-09 16:39:09 +01:00
Skud 0e9b4caf58 added sunniness field to plantings 2013-03-29 16:33:37 +11:00
Miles Gould 91acf9f878 Only send email notifications to members who want them. 2013-03-27 12:17:46 +00:00
Skud 7b065a0092 fixed pozorvlak's date-picker branch 
- tweaked javascript to specify date format (this fixed the javascript
    problems)
- converted planted_at to a date field, rather than datetime
- made tests pass even in non-UTC timezones
 2013-03-26 20:54:12 +11:00
Miles Gould 16605b82b6 Merge branch "notifications". 2013-02-22 13:40:58 +00:00
Skud af9c1591ef added inbox link and count to nav 2013-02-22 17:20:25 +11:00