5794 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	b1d34a7fa2	Merge branch 'dev' into remove-mandrill	2019-01-24 15:52:58 +13:00
Brenda Wallace	60e222d9bb	Merge pull request #1796 from Br3nda/app-json-heroku ... Fixing the app.json for Bonsai	2019-01-24 15:52:38 +13:00
Brenda Wallace	e66f8298c8	Merge branch 'dev' into remove-mandrill	2019-01-24 12:20:39 +13:00
Brenda Wallace	9f3b757d2b	Merge branch 'dev' into app-json-heroku	2019-01-24 12:20:01 +13:00
Brenda Wallace	f6deaffb94	Fixed nested row on layout, that was breaking photo add page	2019-01-24 12:17:40 +13:00
Brenda Wallace	449e8da25a	Added missing translation for Edit profile button	2019-01-24 12:17:40 +13:00
Brenda Wallace	d73f8716c0	Include font awesome (so specs pass)	2019-01-24 12:17:40 +13:00
Brenda Wallace	e202c73584	Update buttons_helper.rb	2019-01-24 12:17:40 +13:00
Brenda Wallace	8bfe3278cc	Include icon helper from button helper	2019-01-24 12:17:40 +13:00
Brenda Wallace	a54db7d5ff	Tidied up the planting actions on gardens#index	2019-01-24 12:17:40 +13:00
Brenda Wallace	80e0d964e1	indentation clean up	2019-01-24 12:17:40 +13:00
Brenda Wallace	5218685bd9	Tidy up member edit buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	94a5411a79	Wider action bar	2019-01-24 12:17:40 +13:00
Brenda Wallace	88a277c6ed	Move consistent icons	2019-01-24 12:17:40 +13:00
Brenda Wallace	e912211cee	DRY the icons	2019-01-24 12:17:40 +13:00
Brenda Wallace	4e82584a0a	Fixed label on link in spec	2019-01-24 12:17:40 +13:00
Brenda Wallace	a09c6603e2	Fixed photo specs to find the button on the actions view	2019-01-24 12:17:40 +13:00
Brenda Wallace	2380d62258	Use new finish button on planting badges	2019-01-24 12:17:40 +13:00
Brenda Wallace	1460d4822a	Crop name is in button label - add to spec	2019-01-24 12:17:40 +13:00
Brenda Wallace	28422bfd1d	Seperate some specs	2019-01-24 12:17:40 +13:00
Brenda Wallace	81ee8ec56e	Add crop name to actions	2019-01-24 12:17:40 +13:00
Brenda Wallace	2a98cefedb	Copy finish planting from view to helper	2019-01-24 12:17:40 +13:00
Brenda Wallace	99fb21eebe	Find maze button in spec	2019-01-24 12:17:40 +13:00
Brenda Wallace	33ad133665	Revert modifications to menu	2019-01-24 12:17:40 +13:00
Brenda Wallace	ca75b1c852	Use button helper for crop wrangling	2019-01-24 12:17:40 +13:00
Brenda Wallace	c9be8be9e5	Remove new planting button spec ... because it's in the button bar now	2019-01-24 12:17:40 +13:00
Brenda Wallace	8023d71a21	Removed outdated spec	2019-01-24 12:17:40 +13:00
Brenda Wallace	6e433306f4	Capitalise some translations	2019-01-24 12:17:40 +13:00
Brenda Wallace	655efb26eb	Removing some unused translations	2019-01-24 12:17:40 +13:00
Brenda Wallace	97675868bd	Fixed button link, using translation that exists	2019-01-24 12:17:40 +13:00
Brenda Wallace	424866b733	Add "something" to global action labels	2019-01-24 12:17:40 +13:00
Brenda Wallace	c78b96b9d6	Update from should to expect syntax	2019-01-24 12:17:40 +13:00
Brenda Wallace	8ec35cc65c	Action specs for someone else's garden	2019-01-24 12:17:40 +13:00
Brenda Wallace	e6e582cb4a	Move some action button specs to feature specs ... because it's in a buttonbar, not the view now	2019-01-24 12:17:40 +13:00
Brenda Wallace	761a0b4142	Always use the helper for add_photo buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	9130b44fb9	Rubocop fixup	2019-01-24 12:17:40 +13:00
Brenda Wallace	8eb9487967	Move home page greeting test to features spec (from views)	2019-01-24 12:17:40 +13:00
Brenda Wallace	a6ac57f045	Tests for edit and add photo buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	a95c3a988c	DRY the add photo buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	a8547d6033	Update labels on button in crop detail spec	2019-01-24 12:17:40 +13:00
Brenda Wallace	22e50aa618	DRY the edit buttons	2019-01-24 12:17:40 +13:00
Brenda Wallace	ad001767e2	Move seed buttongs to buttons helper	2019-01-24 12:17:40 +13:00
Brenda Wallace	b58e0cf3ce	Moved garden actions code to top of view	2019-01-24 12:17:40 +13:00
Brenda Wallace	8ae062fe9b	Added missing harvest actions	2019-01-24 12:17:40 +13:00
Brenda Wallace	c811ab1f51	Moved harvest buttons to match other #show pages	2019-01-24 12:17:40 +13:00
Brenda Wallace	8270611f0c	Removed un-used viewss	2019-01-24 12:17:40 +13:00
Brenda Wallace	02d4d12582	suffix _button to button helpers	2019-01-24 12:17:40 +13:00
Brenda Wallace	8df90dacfc	Seperate specs	2019-01-24 12:17:40 +13:00
Brenda Wallace	6ced6c5c4e	Update link label in spec	2019-01-24 12:17:40 +13:00
Brenda Wallace	dfd7765c47	Rubocop fix ups	2019-01-24 12:17:40 +13:00