jenkr55
f67e8ceb95
Dont allow newlines
2018-05-28 12:29:44 -05:00
jenkr55
a973485c4b
Allow ascii
2018-05-28 12:04:44 -05:00
jenkr55
f1a4bd19aa
New slug regex
2018-05-27 13:06:32 -05:00
jenkr55
2f5fa635c8
Validate for non-blank garden name
2018-05-20 14:57:57 -05:00
jenkr55
303e259fd4
Dont allow nil or blank names
2018-05-20 14:56:11 -05:00
jenkr55
3b5c953c57
Remove regex not letting utf-8 garden names save
2018-05-20 13:34:38 -05:00
Brenda Wallace
90f8b9e042
Fixed last crop spec for rails5 ugprade
2018-04-28 21:30:08 +12: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
fc46685ab9
Renamed should_be_finshed? to late?
2018-04-23 13:44:53 +12:00
Brenda Wallace
db0c60be0d
Rename zombie to super_late
2018-04-23 13:33:38 +12:00
Brenda Wallace
6677f8641f
If not crop lifespan data, use parent data
2018-04-21 17:40:22 +12:00
Brenda Wallace
e103e6be35
Reducing complexity in planting predictions code
2018-04-21 15:32:04 +12:00
Brenda Wallace
4ad4dd0c7f
Style fix up
2018-04-21 15:17:51 +12:00
Brenda Wallace
a8509acd49
Zombie status needs 90 days
2018-04-21 13:02:51 +12:00
Brenda Wallace
4fe8cd566b
USe finished not finished?
...
because some plants have finished_at in the past but haven't had their .finished set to true yet
2018-04-21 12:37:00 +12:00
Brenda Wallace
f8b76e9c84
Reducing complexity in planting predictions
2018-04-21 11:12:25 +12:00
Brenda Wallace
b7d4781aef
Split the planting&harvest predictions into files
2018-04-21 10:18:18 +12:00
Brenda Wallace
7a112aeecf
Grammar correction in method name
2018-04-19 13:49:54 +12:00
Brenda Wallace
279c922b34
Rename update predictions methods to have !
2018-04-19 13:45:29 +12:00
Brenda Wallace
3ed90b8d04
Moving predictions to own file
2018-04-19 13:44:39 +12:00
Brenda Wallace
d1603a6e7f
Badges showing finished and harvest status
2018-04-16 21:06:20 +12:00
Brenda Wallace
03c9151ecd
Merge branch 'dev' into feature/ownable
2018-04-03 08:46:34 +12:00
pozorvlak
d0f6d63d36
Merge branch 'dev' into fix/dependents
2018-04-02 15:26:07 +01:00
pozorvlak
a7cfecf82c
Merge branch 'dev' into feature/ownable
2018-04-02 14:47:48 +01:00
Brenda Wallace
75e401162e
More dependent declared on relationships
2018-04-02 16:12:40 +12:00
Brenda Wallace
c967f7432e
Seed's parent planting is optional
2018-04-02 16:04:52 +12:00
Brenda Wallace
0235690f82
More dependent declared on relationships
2018-04-02 15:58:36 +12:00
Brenda Wallace
a00237dfcb
Style fixes after rubocop upgrade
2018-04-02 15:48:16 +12:00
Brenda Wallace
91ee0150f1
Adding dependent clauses to models
2018-04-02 15:37:51 +12:00
Brenda Wallace
5683f1939d
Fixed up planting model, parent is not required
2018-04-02 15:17:28 +12:00
Brenda Wallace
f061a1d9c7
Allow planting to have null parent_seed
2018-04-02 11:33:43 +12:00
Brenda Wallace
7cda0aacc5
Passing class_name as string in members.requested_crops
2018-04-02 11:16:50 +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
106d187e67
Add dependent clauses on crop model
2018-04-02 10:29:10 +12:00
Brenda Wallace
e3bb43477b
Adding counter caches and ownable concern
2018-04-02 10:13:19 +12:00
Brenda Wallace
f1afe1ca79
Expanding layout to use full screen
2018-04-01 12:44:59 +12:00
Brenda Wallace
8941c577e4
Specs for photos helper
2018-03-14 22:25:30 +13: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
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
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
7f87ee1018
Fixed default_photo for seeds - uses own photos, not the crop
2018-01-29 09:55:06 +13:00
Awesome Code
46267b2a1d
Auto corrected by following Style/MutableConstant
2018-01-23 09:00:34 +13:00
Brenda Wallace
9db4736229
Permissions (and specs) for charts json
2018-01-23 09:00:34 +13:00
Awesome Code
3391f6c392
Auto corrected by following Style/RescueStandardError
2018-01-23 09:00:34 +13:00
Awesome Code
0c8240d4e8
Auto corrected by following Style/OrAssignment
2018-01-23 09:00:34 +13:00
Brenda Wallace
d9bdc46099
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/members.js.erb
2018-01-21 21:20:43 +13:00
Shiny
16c54d1c61
Merge branch 'dev' into awesomecode-style/mutableconstant-7391
2018-01-15 14:25:05 +13:00
jenkr55