mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-05 15:11:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,516 Commits 65 Branches 76 Tags
b489fda18e84b2ba6c330cbfccf8ba13824d3713
Commit Graph

141 Commits

Author SHA1 Message Date
Miles Gould
79f96f5ef4 Insist that crops created by db:seed are new. 
This shaves 2s off the 22s runtime of `rake db:seed` on my machine.
 2014-01-10 18:11:27 +00:00
Miles Gould
c50f345f1c Wrap rake db:seed in a transaction. 
This gives about a 30% speedup on my machine (from 30s to 20s). See
http://stackoverflow.com/questions/1711631/how-do-i-improve-the-performance-of-sqlite
 2014-01-10 14:10:27 +00:00
Miles Gould
084bdc4f40 Add friendly URLs to plant parts. 2013-10-31 00:19:48 +00:00
Miles Gould
f723fea4e2 Load plant parts in db:seed and rake task. 2013-10-30 23:49:34 +00:00
Miles Gould
e9a3c0f4ee rails g scaffold PlantPart... 
Also migration to remove the string plant_part.
 2013-10-30 23:32:20 +00:00
Skud
f89c5e5b86 Added plant_part attribute to harvest 2013-10-29 17:00:32 +11:00
Skud
803f8244c9 Added various fields to garden 
- active (default: true)
- location, latitude and longitude (because when you move house, you
    don't take your garden with you)
- area and area units (square feet or metres)
 2013-10-25 21:54:13 +11:00
Skud
a25ba32476 Merge branch 'system_name_to_name' of https://github.com/pozorvlak/growstuff into pozorvlak-system_name_to_name 
Conflicts:
	db/seeds.rb
 2013-10-25 12:14:01 +11:00
Miles Gould
9c5b6f6192 Rename Crop.system_name to Crop.name 2013-10-18 11:52:05 +01:00
Skud
c46e19e43e Load multiple crop CSV files from seeds.rb 
We factored out a Crop.create_from_csv method to avoid duplicated code.

Note: naming convention with db/seeds/crop*.csv is to use a 2-digit
number for ordering.  00 and 10 chosen (with a gap in between) because I
learned to program in BASIC and it seemed like a good idea just in case.
 2013-10-17 22:45:09 +11:00
Skud
a98cb31161 Added rake task to import new crops from CSV 2013-10-17 22:08:54 +11:00
Skud
c5e8e4298f Separated informal/human units from measured weights 2013-09-25 15:39:17 +10:00
Skud
9667f43874 Added friendly urls to harvests 2013-09-17 18:02:48 +10:00
Skud
40ce4ab77b Validate units (must be one of individual/bunches/kg/lb) 
Also changed "units" attribute to "unit". Oops, we weren't following the
Rails naming convention.
 2013-09-17 17:26:18 +10:00
Skud
ccb0e42c95 Prettified harvest form 
Also renamed "notes" to "description" in database
 2013-09-17 16:08:41 +10:00
Skud
37383ba451 rails g scaffold Harvest... 2013-09-17 15:39:25 +10:00
Skud
a250bc162f Fixed up db/schema to remove spurious payments table 2013-09-16 10:22:42 +10:00
Skud
2422182aa8 Added referral_code to Order 
Also added validation (alphanumeric), but we're fairly lax about
whitespace and case, and clean up for them if they make minor errors.
 2013-09-13 12:14:17 +10:00
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