5759 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	fb02c187ab	Merge remote-tracking branch 'upstream/dev' into routes-tidy-up ... Conflicts: .gitignore	2019-01-08 10:33:50 +13:00
Daniel O'Connor	ea2653ecfc	Merge pull request #1779 from Br3nda/ignore-extra-files ... Switch to yarn && Ignore extra files	2019-01-06 15:41:51 +10:30
Brenda Wallace	99ac99b399	Can't update pip on travis, so don't	2019-01-06 16:19:58 +13:00
Brenda Wallace	97b377cf83	Add --no-document to install of linters ... as suggested in https://github.com/brigade/overcommit/issues/610	2019-01-06 16:17:34 +13:00
Brenda Wallace	7c354c9872	Re-enable linters on Travis	2019-01-06 09:53:47 +13:00
Brenda Wallace	88ccdadeb1	Tidy up .gitignore	2019-01-06 09:53:47 +13:00
Brenda Wallace	798b4a8b47	Switching to yarn	2019-01-06 09:53:47 +13:00
Brenda Wallace	8cb9361462	only look up member/crop if an slug is passed	2019-01-06 08:45:42 +13:00
Brenda Wallace	c0e957b051	Places params is :place	2019-01-06 08:45:42 +13:00
Brenda Wallace	1660629cf9	DRY crop.interesting?	2019-01-06 08:45:42 +13:00
Brenda Wallace	4587dc711f	Use to_param to make parts of the csv filename	2019-01-06 08:45:42 +13:00
Brenda Wallace	061bd31220	Use owner param in filename	2019-01-06 08:45:42 +13:00
Brenda Wallace	df7a59c629	Use slug in filename, not name/login_name	2019-01-06 08:45:42 +13:00
Brenda Wallace	90386221bc	Update notification reply url in helper spec	2019-01-06 08:45:42 +13:00
Brenda Wallace	8846627096	Update notification controller spec to send notification_id	2019-01-06 08:45:42 +13:00
Brenda Wallace	106497c841	Rubocop fix ups	2019-01-06 08:45:42 +13:00
Brenda Wallace	fb5c631ec9	Fixed notification url in helper	2019-01-06 08:45:42 +13:00
Brenda Wallace	1e6c204df2	Rubcop fix up	2019-01-06 08:45:42 +13:00
Brenda Wallace	62a8f6b8d3	Fixed look up of reply notification	2019-01-06 08:45:42 +13:00
Brenda Wallace	0e0bf98c37	Specs for admin routing	2019-01-06 08:45:42 +13:00
Brenda Wallace	c2bcae47d2	Use the admin/members controller	2019-01-06 08:45:42 +13:00
Brenda Wallace	74e30aeb1d	move cms into admin scope	2019-01-06 08:45:42 +13:00
Brenda Wallace	bf6dd049ae	Fixed up admin routes	2019-01-06 08:45:42 +13:00
Brenda Wallace	f8921d3ded	Update reply notifications	2019-01-06 08:45:42 +13:00
Brenda Wallace	f638b9a5da	Update path to member gardens in spec	2019-01-06 08:45:42 +13:00
Brenda Wallace	5528d9b5e9	Fix authors rss of posts link	2019-01-06 08:45:42 +13:00
Brenda Wallace	8b179ca2de	Add new routes to spec	2019-01-06 08:45:42 +13:00
Brenda Wallace	453bc0c6b4	Update crop route specs	2019-01-06 08:45:42 +13:00
Brenda Wallace	f008270ba2	Update spec for finding your own seeds	2019-01-06 08:45:42 +13:00
Brenda Wallace	e8d2226ac6	Look up crop by slug	2019-01-06 08:45:42 +13:00
Brenda Wallace	1381b619be	on collection, routes for notification	2019-01-06 08:45:42 +13:00
Brenda Wallace	71ac88789d	notification stays as member id	2019-01-06 08:45:42 +13:00
Brenda Wallace	686b7f27d0	Fixed paths in gardens feature spec	2019-01-06 08:45:42 +13:00
Brenda Wallace	dcbfc4f9fa	Fixed spec to look for new DRY header template in gardens	2019-01-06 08:45:42 +13:00
Brenda Wallace	b44b7fdd2e	Move follows from members controller to follows controller	2019-01-06 08:45:42 +13:00
Brenda Wallace	59bc036565	Follow/Unfollow updated for routes	2019-01-06 08:45:42 +13:00
Brenda Wallace	9760c02b77	User owner's slug to filter seeds	2019-01-06 08:45:42 +13:00
Brenda Wallace	bbb403be49	Use slug to find a member	2019-01-06 08:45:42 +13:00
Brenda Wallace	0b11641003	Update params in charts/crops controller specs	2019-01-06 08:45:42 +13:00
Brenda Wallace	b92c2f9bae	Use slugs for look up in spec	2019-01-06 08:45:42 +13:00
Brenda Wallace	a219cc4f67	Update harvests controller spec for new routes	2019-01-06 08:45:42 +13:00
Brenda Wallace	07f06705af	Fixed pi charts path	2019-01-06 08:45:42 +13:00
Brenda Wallace	ffb87a4432	Validators of garden name uniquness, and slug name	2019-01-06 08:45:42 +13:00
Brenda Wallace	32e7016b5b	Fixed link to your own seeds	2019-01-06 08:45:42 +13:00
Brenda Wallace	c969a9f830	Use slug, not member name, for urls to members	2019-01-06 08:45:42 +13:00
Brenda Wallace	b85a8551b5	Don't duplicate seed availability info on page	2019-01-06 08:45:42 +13:00
Brenda Wallace	42156dc9e9	Links to data by crop	2019-01-06 08:45:42 +13:00
Brenda Wallace	0a7137cae2	Fixed link to crop harvests	2019-01-06 08:45:42 +13:00
Brenda Wallace	abc796605d	Tidier path the member data	2019-01-06 08:45:42 +13:00
Brenda Wallace	b2bceb5873	Fixed planting display by crop	2019-01-06 08:45:42 +13:00