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
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
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
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
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
Brenda Wallace
cd99769311
Wrapped a long line
2017-11-01 14:02:56 +13:00
Brenda Wallace
8e94ddb4bf
Moved planting predictions to crop
2017-11-01 13:57:49 +13:00
Brenda Wallace
0d8ca89b14
harvested_at and harvest_predicted_at added to plantings
2017-11-01 13:57:49 +13:00
Brenda Wallace
aee90268a5
Fixed old migration - to work under act_as_paranoid
2017-05-21 21:50:52 +12:00
Brenda Wallace
7d4c9011aa
Member.deleted_at column added
2017-05-21 11:31:53 +12:00
Brenda Wallace
18c02bf33b
Add deleted column to members table
2017-05-20 22:00:15 +12:00
Brenda Wallace
ac165ce0cd
Adding counter caches
2017-04-14 11:32:31 +12:00
Brenda Wallace
e229438997
rubocop fox for numeric literals
2017-03-01 17:46:12 +13:00
Brenda Wallace
6017c4ba23
Marked our one ReversibleMigration as okay
2017-02-16 12:32:37 +13:00
Brenda Wallace
ff50ec65d0
Merge remote-tracking branch 'upstream/dev' into HEAD
2017-01-22 18:26:29 +13:00
Brenda Wallace
283bb76a9e
Link a harvest to a planting, and display
2017-01-04 22:45:49 +13:00
Daniel O'Connor
fef272e30f
Merge remote-tracking branch 'upstream/dev' into likeable
2016-12-09 11:42:32 +10:30
Mackenzie Morgan
c2de65e515
Merge branch 'seed_photos' of gitmaco:maco/growstuff into seed_photos
2016-12-02 23:18:05 -05:00
Mackenzie Morgan
c201200e9b
correct schema and add index for photos_seeds
2016-12-02 23:17:01 -05:00
Shiny
7785a9d797
Merge branch 'dev' into seed_photos
2016-12-03 09:31:20 +13:00
Shiny
0c2a60ecc3
Reduce max AbcSize to 38 ( #1112 )
...
Reduce how complex methods are allowed to be, according to our code checker, so we're forced to write readable code
2016-12-02 08:06:53 -05:00
Mackenzie Morgan
a3c8bc0586
include the migration
2016-12-01 13:23:52 -05:00
Mackenzie Morgan
832719b01a
merge from upstream dev
2016-11-29 09:37:25 -05:00
Mackenzie Morgan
e1a2b168c9
rename scientific_names.scientific_name to scientific_names.name
...
this mirrors alternate_names.name and allows making code more DRY
2016-11-28 21:57:51 -05:00
Brenda Wallace
723ebff923
Spacing fixes
2016-11-26 12:13:17 +13:00
Brenda Wallace
62e7c716dd
Removed extra empty blank lines
2016-11-26 12:06:02 +13:00
