Brenda Wallace
3c7688d2ed
Merge branch 'dev' into Br3nda-patch-1
2018-04-09 09:57:24 +12:00
Brenda Wallace
ef20d1a333
Merge pull request #1613 from jenkr55/OnlyShowPlantingSuggestionIfMatch
...
Only show planting suggestion if there's a match
2018-04-09 09:57:04 +12:00
jenkr55
9c0ddb61e7
Prevent error when @matching_plantings is nil
2018-04-08 10:17:06 -05:00
Jennifer Kruse
19acb238fd
Merge branch 'dev' into OnlyShowPlantingSuggestionIfMatch
2018-04-08 09:49:29 -05:00
jenkr55
d38167fd14
Only show planting suggestion if theres a match
2018-04-08 09:47:15 -05:00
Brenda Wallace
6b68e9ee4d
Style fix
2018-04-08 10:04:43 +12:00
Brenda Wallace
3e2b4f4183
Pick the first photo
2018-04-08 09:56:19 +12:00
Brenda Wallace
65bb523d16
Merge pull request #1609 from jenkr55/FixVariousWrappingIssues
...
Fix various wrapping issues
2018-04-08 09:03:26 +12:00
jenkr55
efa8c513ea
Adding myself as a contributor
2018-04-07 14:59:14 -05:00
jenkr55
43813d1318
Fixing various wrapping issues
2018-04-07 14:58:07 -05:00
Cesy
7e2aec9ec3
Merge pull request #1608 from Growstuff/dev
...
Release 44
2018-04-06 07:23:07 +01:00
Brenda Wallace
952224b2e1
Merge branch 'master' into dev
2018-04-03 17:46:37 +12:00
Brenda Wallace
26b1a3a6ca
Merge pull request #1605 from Br3nda/feature/ownable
...
Adding counter caches and ownable concern
2018-04-03 08:54:15 +12:00
Brenda Wallace
03c9151ecd
Merge branch 'dev' into feature/ownable
2018-04-03 08:46:34 +12:00
pozorvlak
1dd3d658eb
Merge pull request #1606 from Br3nda/fix/dependents
...
Set the behaviour of dependent models when crops are deleted from the database:
- plantings, seeds and harvests are deleted
- child crops are orphaned.
2018-04-02 15:52:10 +01:00
pozorvlak
c3b694ea7d
Merge branch 'dev' into fix/dependents
2018-04-02 15:39:16 +01:00
pozorvlak
a3e2b892d1
Merge pull request #1596 from Br3nda/fix/coverage
...
Adding codeclimate coverage
2018-04-02 15:36:48 +01:00
pozorvlak
d0f6d63d36
Merge branch 'dev' into fix/dependents
2018-04-02 15:26:07 +01:00
pozorvlak
879ce26de7
Merge branch 'dev' into fix/coverage
2018-04-02 15:21:51 +01:00
pozorvlak
98e27b5af4
Merge pull request #1602 from Br3nda/fix/ordering
...
Fix ordering of recent plantings on crops#show
2018-04-02 15:21:29 +01:00
pozorvlak
a7cfecf82c
Merge branch 'dev' into feature/ownable
2018-04-02 14:47:48 +01:00
pozorvlak
d0f28d4bef
Merge branch 'dev' into fix/ordering
2018-04-02 14:43:40 +01:00
pozorvlak
2c090757cc
Merge pull request #1601 from Br3nda/feature/fluid-layout
...
Feature/fluid layout
2018-04-02 14:40:44 +01:00
Brenda Wallace
af0c9a490b
Redirect :back deprecated. updating follows controller
2018-04-02 16:28:34 +12:00
Brenda Wallace
59cca1b8cb
Upgraded controller specs for rails 5
2018-04-02 16:18:46 +12:00
Brenda Wallace
75e401162e
More dependent declared on relationships
2018-04-02 16:12:40 +12:00
Brenda Wallace
7f8bdfe48f
Updated rubocop todo
2018-04-02 16:09:41 +12:00
Brenda Wallace
c967f7432e
Seed's parent planting is optional
2018-04-02 16:04:52 +12:00
Brenda Wallace
5dbb3a1487
Mark cms specs as pending
2018-04-02 15:59:38 +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
11fd95e2b8
Upgrading rubocop and haml_lint to match hound
2018-04-02 15:45:06 +12:00
Brenda Wallace
91ee0150f1
Adding dependent clauses to models
2018-04-02 15:37:51 +12:00
Brenda Wallace
d19c9ab669
Remove duplicate scripts yield in layout
2018-04-02 15:31:20 +12:00
Brenda Wallace
5683f1939d
Fixed up planting model, parent is not required
2018-04-02 15:17:28 +12:00
Brenda Wallace
6149d20390
Ignore highcharts.js
2018-04-02 15:09:02 +12:00
Brenda Wallace
e43740bd3d
Two more application name renames
2018-04-02 15:05:46 +12:00
Brenda Wallace
84e47b721b
removed duplicate crop chart methods
2018-04-02 11:36:16 +12:00
Brenda Wallace
f061a1d9c7
Allow planting to have null parent_seed
2018-04-02 11:33:43 +12:00
Brenda Wallace
41ea871c80
Comment out comfy admin for now
2018-04-02 11:20:28 +12:00
Brenda Wallace
49d3f24ac8
[Corrected] Use the -> { ... } lambda literal syntax for single line lambdas.
2018-04-02 11:19:40 +12:00
Brenda Wallace
4d21e132b9
Timeline is in a different controller now
2018-04-02 11:18:56 +12:00
Brenda Wallace
7cda0aacc5
Passing class_name as string in members.requested_crops
2018-04-02 11:16:50 +12:00
Brenda Wallace
2e339ce45d
Adding rails version to new migrations
2018-04-02 11:04:31 +12:00
Brenda Wallace
700073e893
Removed duplicate gardens/timeline code
2018-04-02 11:02:22 +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
8521047803
Merge branch 'dev' into feature/ownable
2018-04-02 10:23:07 +12:00
Brenda Wallace
e173d0c130
Merge branch 'dev' into fix/ordering
2018-04-02 10:22:20 +12:00
Brenda Wallace
53197f27eb
Merge branch 'dev' into feature/fluid-layout
2018-04-02 10:22:03 +12:00
Brenda Wallace