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

330 Commits

Author SHA1 Message Date
Brenda Wallace
548bbf5e57 Merge remote-tracking branch 'upstream/dev' into renamed-photographings-associations 
Conflicts:
	db/schema.rb
 2019-07-16 12:12:16 +12:00
Brenda Wallace
acf58fc5e2 Choose crop photos by most liked 2019-07-15 11:58:46 +00:00
Brenda Wallace
e0e10c29dc Renaming photographings to photo associations 
now it matches the name of its controller, and it is clearer to understand
 2019-07-13 16:13:37 +12:00
Brenda Wallace
e7b0b6f18e Remove table display on plantings#show, replace with boxes 2019-03-27 21:04:56 +13:00
Brenda Wallace
2d2304d8c0 Rubocop lint 2019-03-26 22:07:54 +13:00
Brenda Wallace
5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace
02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens 2019-03-26 19:35:16 +13:00
Brenda Wallace
db5bdab055 Set planting.finished as a boolean 2019-03-20 09:43:01 +13:00
Brenda Wallace
0759ca9039 Schema update for crops added to photogaphings table 2019-02-04 20:53:04 +13:00
Brenda Wallace
e8ac207fa7 Save the crop on the photo association 2019-02-04 20:32:11 +13:00
Brenda Wallace
f7d989bb61 Squashed migrations and set as Rails4.2 2019-01-18 14:31:35 +13:00
Brandon Baker
a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-08 12:03:39 -05:00
Brenda Wallace
de8eba738e Fix modified schema deploy error 2019-01-05 19:44:40 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace
1574f4b90a Downgrade active_median gem until we upgrade postgresql. 
see #1757
 2018-12-30 14:39:30 +13:00
Brenda Wallace
ca28812d83 No longer need to create the active median function in a migration 2018-12-30 13:49:50 +13:00
Brandon Baker
178c6cd944 fixes bug in setting slug on container 2018-12-06 15:51:00 -07:00
Brandon Baker
bb97082868 adds friendly_id to containers 2018-12-01 19:46:49 -07:00
Brandon Baker
45ba5ff48a creates containers, plots, and associations among gardens, plots, and containers 2018-11-29 10:54:04 -07:00
Brenda Wallace
f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb
 2018-04-28 21:25:06 +12:00
Brenda Wallace
279c922b34 Rename update predictions methods to have ! 2018-04-19 13:45:29 +12:00
Brenda Wallace
2e339ce45d Adding rails version to new migrations 2018-04-02 11:04:31 +12:00
Brenda Wallace
fa32537c3b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	.rubocop_todo.yml
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/members.js.erb
	app/assets/stylesheets/predictions.sass
	app/controllers/crops_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/plantings_controller.rb
	app/models/account.rb
	app/models/account_type.rb
	app/models/member.rb
	app/models/order.rb
	app/models/order_item.rb
	app/models/product.rb
	app/views/gardens/show.html.haml
	app/views/layouts/application.html.haml
	config/initializers/assets.rb
	config/routes.rb
	db/schema.rb
	package-lock.json
	spec/controllers/account_types_controller_spec.rb
	spec/controllers/admin/orders_controller_spec.rb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/gardens_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/member_controller_spec.rb
	spec/controllers/order_items_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/controllers/photo_associations_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/controllers/seeds_controller_spec.rb
	spec/controllers/shop_controller_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/models/member_spec.rb
	spec/models/post_spec.rb
	spec/views/crops/_planting_advice.html.haml_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
	spec/views/orders/show.html.haml_spec.rb
	spec/views/posts/show.html.haml_spec.rb
	spec/views/shop/index_spec.rb
 2018-04-02 10:59:13 +12:00
Brenda Wallace
e3bb43477b Adding counter caches and ownable concern 2018-04-02 10:13:19 +12:00
Brenda Wallace
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550) 
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
 2018-03-12 08:39:32 +13:00
Brenda Wallace
83bba916a4 Don't update flickr photos in migration 2018-02-10 18:41:11 +13:00
Brenda Wallace
42de726405 Removing shop, products, accounts, orders 2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:58:47 +13:00
Awesome Code
ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Brenda Wallace
5cda14f87a Don't update flickr meta data on db rollback 2018-02-05 12:52:59 +13:00
Brenda Wallace
88da0da616 Re-fetches from flickr 2018-02-05 12:52:59 +13:00
Meir Taffel
a69afd87e7 Add date_taken to photos 2018-02-05 12:52:59 +13:00
Awesome Code
3391f6c392 Auto corrected by following Style/RescueStandardError 2018-01-23 09:00:34 +13:00
Brenda Wallace
f4e87a974d Merge remote-tracking branch 'origin/timeline' into upgrade/rails-5 
Conflicts:
	app/views/gardens/show.html.haml
	spec/controllers/photo_associations_controller_spec.rb
 2018-01-11 16:10:36 +13:00
Awesome Code
1a4e0bd48a Auto corrected by following Style/RescueStandardError 2018-01-10 20:18:17 +00:00
Brenda Wallace
2109ee1561 Migrations need to specify a version 2018-01-04 14:42:25 +13:00
Brenda Wallace
b6c9b13d4d Models inherit from application record 2018-01-03 17:16:14 +13:00
Brenda Wallace
f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +13:00
Brenda Wallace
14551b6ec8 Merge remote-tracking branch 'upstream/dev' into feature/photos-1457 
Conflicts:
	spec/models/crop_spec.rb
 2017-12-09 20:59:20 +13:00
Brenda Wallace
a6a7f789a3 Rubocop upgrade (and some style fixes) 2017-12-01 21:07:39 +13:00
Brenda Wallace
35ce8b84db Adding a unique index on the items <--> photos table 2017-11-30 09:56:47 +13:00
Brenda Wallace
12700d6268 Added polymorphic relationship to photos 2017-11-29 21:41:22 +13:00
Brenda Wallace
17fd6f61a5 Added polymorphic relationship to photos 2017-11-29 20:14:27 +13:00
Brenda Wallace
e4ab5114f7 Remove duplicate setting of medians in migration 2017-11-09 17:51:18 +13:00
Brenda Wallace
a5d43af899 Drop the plantings.days_before_maturity column 
it's not used anywhere
 2017-11-09 17:43:00 +13:00
Brenda Wallace
809dd81378 "Changed last_harvest" to "days_to_last_harvest" 2017-11-08 17:17:58 +13:00
Brenda Wallace
62beec23a1 "Changed first_harvest" to "days_to_first_harvest" 2017-11-08 17:17:15 +13:00
Brenda Wallace
996706ee78 Tests for planting lifespan predictions when there's no crop data 2017-11-05 17:29:42 +13:00
Brenda Wallace
b1684b0156 Set prediction data for existing planting and crops 2017-11-05 14:16:00 +13:00
Brenda Wallace
4cc0f77bd0 Predicting first harvest - updating medians 2017-11-05 13:42:30 +13:00