Commit Graph

309 Commits

Author SHA1 Message Date
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
91e851c802 Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-23 13:00:53 +12:00
jenkr55
fa28fe25b6 Fixing responsive design issues 2018-04-21 21:43:19 -05:00
jenkr55
7be10957ec WIP different profile page 2018-04-21 21:05:58 -05:00
jenkr55
e767ea6b38 Fixing planting wrapping issue 2018-04-21 10:36:33 -05:00
jenkr55
585e45487a Fixing button layout issue 2018-04-21 09:16:17 -05:00
Brenda Wallace
2e4378f025 Add css class to show finished/zombie/harvesting etc 2018-04-21 14:17:50 +12:00
Brenda Wallace
1b3e00fba0 Colours for badges on plantings 2018-04-21 13:00:24 +12:00
Brenda Wallace
935aebcb0d Tidy up visual link between planting thumbnail and crop name 2018-04-21 12:38:32 +12:00
Brenda Wallace
a2f2e24aa1 Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-21 09:07:10 +12:00
jenkr55
4120069e4c Fixing trailing whitespace 2018-04-19 12:17:36 -05:00
jenkr55
18a7306fd0 Merge branch 'SecondCommentButton' of github.com:jenkr55/growstuff into SecondCommentButton 2018-04-19 12:11:03 -05:00
jenkr55
b3962bc9bc Comment button same style 2018-04-19 12:10:19 -05:00
Brenda Wallace
d1603a6e7f Badges showing finished and harvest status 2018-04-16 21:06:20 +12:00
jenkr55
43813d1318 Fixing various wrapping issues 2018-04-07 14:58:07 -05:00
Brenda Wallace
b64a294245 Removed duplicate margins in css 2018-04-01 18:45:35 +12:00
Brenda Wallace
f1afe1ca79 Expanding layout to use full screen 2018-04-01 12:44:59 +12:00
Brenda Wallace
2f81d6c78d Layout fixes for mobile and smaller screens 2018-03-15 23:01:51 +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
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
070a4605d0 Add a green border around predictions boxes 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
c154a9b845 Upgraded leaflet maskercluster 2017-11-25 19:34:05 +13:00
Brenda Wallace
e3113fd53d Re-work gardens#index to show planting progress 2017-10-21 22:48:37 +01:00
Brenda Wallace
26c17ea19c Plantings Thumbnails, fit to box 2017-04-25 10:58:17 +12:00
Brenda Wallace
17236a4a8a Garden thumbnail display cleanup 2017-04-16 13:48:22 +12: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
Shiny
b80e7f677c Merge branch 'dev' into likeable 2017-01-24 19:44:42 +13:00
Shiny
76af02f2a5 Merge branch 'dev' into bw/bar_graphs 2017-01-23 20:18:19 +13:00
Brenda Wallace
08d407f041 Fix display of gardens on smaller screens 2017-01-22 20:33:37 +13:00
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
b0c132c28f Replace literal RGB with variable in graph.css 2017-01-05 11:38:55 +00:00