Brenda Wallace
e9ead68e94
Revert "Auto corrected by following Format Javascript Code"
...
This reverts commit 334b33c555
2019-01-04 18:17:27 +13:00
Awesome Code
334b33c555
Auto corrected by following Format Javascript Code
2019-01-04 05:15:13 +00:00
Brenda Wallace
4218688d8e
Revert "Auto corrected by following Format Javascript Code"
...
This reverts commit f83a2b6397
2019-01-04 18:14:36 +13:00
Awesome Code
f83a2b6397
Auto corrected by following Format Javascript Code
2019-01-03 10:00:13 +00:00
Brenda Wallace
e43740bd3d
Two more application name renames
2018-04-02 15:05:46 +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
3453a648fa
Latest versions of bootstrap accessibility plugin
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
625a035f44
Scope js variables so they are not global
2018-01-23 09:00:34 +13:00
Brenda Wallace
4821bf3b07
Wrapped thre crops show js in a document.ready
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
1f8413bf3e
Remove highcharts.js, we're not using it
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
e6e88fa0c7
Fixed up tabulation
2018-01-23 09:00:34 +13:00
Brenda Wallace
87708f1765
Tabulation and jsdoc fixes
2018-01-23 09:00:34 +13:00
Brenda Wallace
a4c06207e3
more JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
580fac6aa1
removed 2 unused variable in js
2018-01-23 09:00:34 +13:00
Brenda Wallace
4a696af9ba
Fix up JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
d2a060ad49
added JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
d898f926d5
added JSDoc
2018-01-23 09:00:34 +13:00
Brenda Wallace
a4c7de381e
converted variable to camel case
2018-01-23 09:00:34 +13:00
Brenda Wallace
61408d7e4e
Some js cleanups
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
Brenda Wallace
8cdefb6fcc
Scope js variables so they are not global
2018-01-21 18:39:00 +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
15594c0209
Wrapped thre crops show js in a document.ready
2018-01-11 08:26:59 +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
d8cce280e2
Remove highcharts.js, we're not using it
2018-01-08 18:03:20 +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
bf34feacba
Convert to use chartkick gem
2018-01-07 17:25:16 +13:00
Brenda Wallace
641d227a87
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
...
Conflicts:
app/assets/javascripts/application.js
package-lock.json
2018-01-06 08:46:52 +13:00
Brenda Wallace
53c9f89bc1
Fixed up tabulation
2018-01-04 15:11:36 +13:00
Brenda Wallace
2fd13e9b7c
Updated new path to jquery autocomplete
2018-01-04 14:44:52 +13:00
Brenda Wallace
f4af682d45
Updated code for Rail 5
2018-01-03 17:12:17 +13:00
Brenda Wallace
0a71bfe99f
Tabulation and jsdoc fixes
2018-01-03 14:40:22 +13:00
Brenda Wallace
978317f47a
more JSDoc
2018-01-03 14:20:01 +13:00
Brenda Wallace
4570fda384
removed 2 unused variable in js
2018-01-03 13:03:10 +13:00
Brenda Wallace
122a7f17e2
Fix up JSDoc
2018-01-03 13:01:48 +13:00
Brenda Wallace
591c95dca2
added JSDoc
2018-01-03 12:56:52 +13:00
Brenda Wallace
e910bfd50f
added JSDoc
2018-01-03 12:54:33 +13:00
Brenda Wallace
0db2d6b346
converted variable to camel case
2018-01-03 12:42:20 +13:00
Brenda Wallace
5584da02c3
Some js cleanups
2018-01-03 12:35:30 +13:00
Brenda Wallace
1e0ccd72a2
Added missing semicolons to js files
2017-03-04 17:06:29 +13:00
Brenda Wallace
dd710860de
Run the linters etc from overcommit
2017-03-01 20:48:15 +00:00
Brenda Wallace
a507eb47bf
Removed trailing white space
2017-02-12 17:26:34 +13:00
Daniel O'Connor
15106a051c
Merge branch 'dev' into likeable
2017-01-27 12:05:13 +10:30
Miles Gould
7fa0d22583
Graph real crop sunninesses from server
...
Works for me in superficial manual testing, but needs automated tests.
Also currently does two server round trips (one for planting locations
and one for sunninesses); it would be better to combine these into one,
or alternatively to create a "crop stats" API endpoint and calculate
sunniness stats in SQL.
2017-01-09 15:13:55 +00:00
Miles Gould
8083ae9052
Remove duplicate getBarValues() methods
...
I've replaced one with a getMaxValue() function, which is what we
actually want, and deleted the other.
2017-01-05 11:18:51 +00:00
