mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-07 13:37:15 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,058 Commits 66 Branches 92 Tags
2b6bdeda1663c4faf9c4831bf62003f157cc6841
Commit Graph
104 Commits
Author SHA1 Message Date
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 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
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
Lilly 14021a4fae Redirect to Garden after deleting planting 2013-05-09 13:39:31 +10:00
Skud 5ae5e0f959 rails g scaffold Photo... 2013-05-08 20:52:35 +10:00
pozorvlak 8daefa7b5e Merge pull request #197 from Skud/empty_subjects 
fixed linebreak causing syntax error
 2013-05-08 03:33:40 -07:00
Skud d4e5f0e32a fixed linebreak causing syntax error 2013-05-08 20:23:55 +10:00
pozorvlak 6df9d8b09a Merge pull request #194 from Skud/empty_subjects 
*crosses fingers*
 2013-05-08 03:21:57 -07:00
Skud 2563787dc7 added Member.current_order method 2013-05-08 15:41:39 +10:00
Skud ddfafa032a added completed_at field to Order 2013-05-08 15:11:20 +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
Skud 3eef44cce7 added products to seeds.rb in dev/test environments 2013-05-07 21:00:10 +10:00
Skud cad5f453fa rails g scaffold Product... 2013-05-07 20:56:10 +10:00
Skud 949821a947 create admin and wrangler users in dev environment 2013-05-02 11:18:46 +10:00
gnattery 939a10d2f4 Post subjects cannot be nil 2013-04-30 12:20:26 +01:00
Skud 2418be18d3 added connections to settings page, fixed tests 2013-04-18 23:41:04 +10:00
Miles Gould ff80b63743 Add a "name" column to authentications. 2013-04-09 17:23:59 +01:00