Brenda Wallace
3ad048b7e8
Fixed linter issue, empty line after guard clause
2018-09-13 23:10:43 +12:00
Brenda Wallace
3399a794b2
Ignore one non-ascii comment
2018-06-04 16:55:29 +12:00
Brenda Wallace
cf72bdc57d
Reinstate json response config
2018-06-04 16:49:41 +12:00
Brenda Wallace
1f6d76445e
Added back CMS initialiser
2018-06-04 16:49:00 +12:00
Brenda Wallace
fd405ccad0
Added back link to CMS
2018-06-04 16:37:57 +12:00
Brenda Wallace
4d937a1f91
Restoring Comfy mexican sofa
2018-06-04 16:29:38 +12:00
Brenda Wallace
05bfbda5f5
Rubocop style fix ups
2018-06-04 16:18:49 +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
d3faa75d1d
Merge branch 'dev' into feature/i18n
2018-04-26 17:26:55 +12:00
Brenda Wallace
85eea89792
i18n for plantings#index
2018-04-23 15:40:56 +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
78f021c2f2
style fix up
2018-04-21 16:26:40 +12:00
Brenda Wallace
34145f7b64
Translation of string in haml
2018-04-21 16:19:51 +12:00
Brenda Wallace
cdde3994b2
Revert "Auto corrected by following Style/ExpandPathArguments"
...
This reverts commit a5b84403bb
2018-04-21 10:35:28 +12:00
Awesome Code
a5b84403bb
Auto corrected by following Style/ExpandPathArguments
2018-04-20 22:19:28 +00:00
Brenda Wallace
a00237dfcb
Style fixes after rubocop upgrade
2018-04-02 15:48:16 +12:00
Brenda Wallace
41ea871c80
Comment out comfy admin for now
2018-04-02 11:20:28 +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
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
aab91e2fa9
Removed active merchant
2018-02-09 10:53:05 +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
16ad5384d1
Moved gardens chart to dedicated controller
2018-01-23 09:00:34 +13:00
Brenda Wallace
cf93489af7
Fixed crops chart permissions by moving to another controller
2018-01-23 09:00:34 +13:00
Brenda Wallace
86b9a3650b
Move application.js loading last again
2018-01-23 09:00:34 +13:00
Brenda Wallace
5ea7ae8af0
Added Harvested for chart
2018-01-23 09:00:34 +13:00
Brenda Wallace
eb1b890eec
Add planted_from chart
2018-01-23 09:00:34 +13:00
Brenda Wallace
b1096cd021
Moved chart includes to application.js, attempting to fix json parse error
2018-01-23 09:00:34 +13:00
Brenda Wallace
59c3edcf82
Add timeline to gardens
2018-01-23 09:00:34 +13:00
Brenda Wallace
1bf05f81ab
Convert to use chartkick gem
...
Conflicts:
Gemfile
Gemfile.lock
config/initializers/assets.rb
2018-01-23 09:00:34 +13:00
Brenda Wallace
350787d4e4
Merge branch 'charts' into upgrade/rails-5
2018-01-11 09:12:20 +13:00
Brenda Wallace
390282f9f2
Added Harvested for chart
2018-01-11 09:03:13 +13:00
Brenda Wallace
8e0b7d9ded
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/crops.js.erb
spec/controllers/comments_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/models/post_spec.rb
spec/views/home/_crops.html.haml_spec.rb
2018-01-11 08:34:20 +13:00
Brenda Wallace
ad6601b356
Add planted_from chart
2018-01-11 08:29:20 +13:00
Brenda Wallace
6d56f3f655
Merge branch 'charts' into upgrade/rails-5
...
Conflicts:
app/views/layouts/application.html.haml
2018-01-09 15:55:28 +13:00
Brenda Wallace
74ff648f90
Moved chart includes to application.js, attempting to fix json parse error
2018-01-09 12:51:21 +13:00
Brenda Wallace
34280123e5
Convert to use chartkick gem
...
Conflicts:
Gemfile
Gemfile.lock
config/initializers/assets.rb
2018-01-08 11:28:59 +13:00
Brenda Wallace
52e3f03bb5
Add timeline to gardens
2018-01-07 19:25:05 +13:00
Brenda Wallace
bf34feacba
Convert to use chartkick gem
2018-01-07 17:25:16 +13:00
Brenda Wallace
79cf7b452c
removing some cms stuff
2018-01-04 14:31:24 +13:00
Brenda Wallace
f4af682d45
Updated code for Rail 5
2018-01-03 17:12:17 +13:00
Brenda Wallace
f1c8743623
Config for rails 5
2018-01-03 17:10:50 +13:00
Brenda Wallace
8a446ecbfc
Member admin
2017-12-17 12:45:19 +13:00
Brenda Wallace
47e82eb0a7
Convert hashes in routes
2017-12-10 19:50:08 +13:00
Brenda Wallace
182c626226
Prefer if/unless modifier
2017-12-06 14:23:12 +13:00
Brenda Wallace
a6a7f789a3
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
Brenda Wallace
13e8d1f5a5
Merge remote-tracking branch 'upstream/dev' into api
2017-11-17 21:51:39 +13:00
Shiny
df7a9448b0
Underscore prefix on our last unused args ( #1442 )
2017-11-13 09:54:55 +00:00
