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
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
Daniel O'Connor
fef272e30f
Merge remote-tracking branch 'upstream/dev' into likeable
2016-12-09 11:42:32 +10:30
Brenda Wallace
d4a496eb1c
Removed duplicate variable assignment
2016-12-07 12:26:12 +13:00
Brenda Wallace
a23e241480
Eslint clean ups
2016-12-07 12:22:33 +13:00
Brenda Wallace
6e0e7e4de1
Merge remote-tracking branch 'upstream/dev' into bw/bar_graphs
...
Conflicts:
CONTRIBUTORS.md
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/crops.js.erb
app/views/crops/show.html.haml
2016-12-07 11:17:30 +13:00
Brenda Wallace
bdb057ca0f
Removed all trailing white space
2016-11-14 15:05:32 +13:00
Cesy
40cf5ba63a
Merge pull request #1030 from CloCkWeRX/fix_998
...
Ensure we look at the current control, not the entire collection when marking planting finished
2016-08-16 08:50:30 +01:00
Daniel O'Connor
90a88cf69d
Fixes #998 Ensure we look at the current control, not the entire collection
2016-08-16 10:33:23 +09:30
Daniel O'Connor
e38321aa33
#981 Add mapbox access token (on my free 50k views account) and update to v4
2016-07-28 14:27:49 +09:30
Daniel O'Connor
04074ff372
Reimplement ajax like/unlike behaviour
2016-07-09 21:53:33 +09:30
Mackenzie Morgan
03c74dae03
Capture originalText from the button that's been clicked, not from the array of all possible date-picker buttons.
...
Fixes #906
2016-05-26 23:55:49 -04:00
pozorvlak
8bea05a77b
Merge pull request #803 from cesy/issue734bootstrapaccessibility
...
Bootstrap accessibility
2016-05-22 17:19:55 +01:00
Mackenzie Morgan
8659ebca2d
switch from less to sass
...
* dependency hell + bit rot on upstream libraries prevents installation on OS X
2016-05-19 15:52:54 -04:00
Cesy
e8266480e5
Adding bootstrap-accessibility plugin
2015-08-12 14:17:41 +00:00
Miles Gould
40b5a47aae
Remove trailing whitespace
2015-07-23 23:22:45 +01:00
AELOGICA
7b3aefacd3
Hidden the +/- buttons by dby default, making them visible via JavaScript code.
2015-07-17 07:55:03 +08:00
AELOGICA
12d151b68c
Added multiple forms for scientific and alternate names on crop creation
2015-07-17 07:31:51 +08:00
AELOGICA
472acd0e81
Polished UI of added forms for alternate names
2015-07-17 07:31:51 +08:00
AELOGICA
7f88b167b4
Added dynamic adding and removing additional scientific names
2015-07-17 07:31:51 +08:00
Shiho Takagi
c253c86787
minor improvements
2015-03-17 11:40:32 +11:00
Shiho Takagi
0c6b6e0e0e
added show all/less toggle button
2015-03-12 13:49:37 +11:00
Marlena Compton
71c0bff3e0
add comments explaining each file per pull request
2015-03-06 07:03:06 -08:00
Marlena Compton
c7a71381b7
write test for tooltips
2015-03-03 06:49:16 -08:00
Marlena Compton
5a1fd19abc
move bar color into the data
2015-03-03 05:49:13 -08:00
Marlena Compton
a48a6da494
refactored graph scale into width scale and height scale
2015-02-28 15:50:27 -08:00
Marlena Compton
66b0f139a9
add tooltip to show data values
2015-02-26 06:07:23 -08:00
Marlena Compton
39feeb94d0
merge in changes from dev branch
2015-02-10 06:28:47 -08:00
Mackenzie Morgan
6aa37e6e26
adding CMS via comfortable mexican sofa gem
2015-02-01 00:27:04 -05:00
