2561 Commits

Author	SHA1	Message	Date
Brenda Wallace	2217d87b5a	Added back the member's last login	2018-02-09 10:53:05 +13:00
Brenda Wallace	44b2251896	Re-instated the member-since text on profiles	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	88da0da616	Re-fetches from flickr	2018-02-05 12:52:59 +13:00
Meir Taffel	a69afd87e7	Add date_taken to photos	2018-02-05 12:52:59 +13:00
Brenda Wallace	7f87ee1018	Fixed default_photo for seeds - uses own photos, not the crop	2018-01-29 09:55:06 +13:00
Brenda Wallace	3453a648fa	Latest versions of bootstrap accessibility plugin	2018-01-23 09:00:34 +13:00
Brenda Wallace	3dc356eb29	order gardens by name on plantings form	2018-01-23 09:00:34 +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	625a035f44	Scope js variables so they are not global	2018-01-23 09:00:34 +13:00
Brenda Wallace	196d37dee9	Re-instated the extra fields on crop.json	2018-01-23 09:00:34 +13:00
Awesome Code	46267b2a1d	Auto corrected by following Style/MutableConstant	2018-01-23 09:00:34 +13:00
Brenda Wallace	9db4736229	Permissions (and specs) for charts json	2018-01-23 09:00:34 +13:00
Brenda Wallace	78b8be1fc2	Use .presence to find finished ts in timeline	2018-01-23 09:00:34 +13:00
Brenda Wallace	b6e9539127	Use predicted finish times to put current plantings on the timeline	2018-01-23 09:00:34 +13:00
Brenda Wallace	33276874a8	add google js to gardens#show	2018-01-23 09:00:34 +13:00
Awesome Code	3391f6c392	Auto corrected by following Style/RescueStandardError	2018-01-23 09:00:34 +13:00
Awesome Code	a13acbe087	Auto corrected by following Style/ParallelAssignment	2018-01-23 09:00:34 +13:00
Awesome Code	0c8240d4e8	Auto corrected by following Style/OrAssignment	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	4821bf3b07	Wrapped thre crops show js in a document.ready	2018-01-23 09:00:34 +13:00
Brenda Wallace	b83db1d4e7	Fix predictions, it wasn't showing nil	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	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	e6e88fa0c7	Fixed up tabulation	2018-01-23 09:00:34 +13:00
Brenda Wallace	308e834713	Wrap long line	2018-01-23 09:00:34 +13:00
Brenda Wallace	121deb4f48	Fix ordering of crops' parent on form	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
Shiny	9d47b2b029	Merge branch 'dev' into feature/admin-nicer	2017-12-18 15:10:36 +13:00
Brenda Wallace	4c35987cb7	Ignore long method in ability.rb	2017-12-17 17:57:19 +13:00
Brenda Wallace	54e0806f38	don't check role is there's no member	2017-12-17 17:55:14 +13:00
Brenda Wallace	99828c7c01	Updated spec for new admin#index	2017-12-17 17:54:13 +13:00
Brenda Wallace	25d2773464	Use nested module/class definitions instead of compact style.	2017-12-17 17:50:30 +13:00
Brenda Wallace	233a30a045	Haml code style fix up	2017-12-17 17:49:05 +13:00
Brenda Wallace	01a7463ae8	Split up ability.rb into methods	2017-12-17 12:47:41 +13:00