11959 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brenda Wallace	2f271da909	Move global buttons and search	2019-01-24 12:17:40 +13:00
Brenda Wallace	6c16dca9b4	Dry the gglypicons	2019-01-24 12:17:40 +13:00
Brenda Wallace	30255a24d2	Use buttons.* translations for glyphicons titles	2019-01-24 12:17:40 +13:00
Brenda Wallace	e886929af5	Put buttons translations under buttons namespace	2019-01-24 12:17:40 +13:00
Brenda Wallace	7169b624b0	Move the action buttons to EVERY page	2019-01-24 12:17:40 +13:00
Brenda Wallace	a3f32aba9b	Call t() on button labels	2019-01-24 12:17:40 +13:00
Brenda Wallace	79c22308df	Fixed nested row on layout, that was breaking photo add page	2019-01-24 11:58:58 +13:00
Brenda Wallace	87c7596ab7	Added missing translation for Edit profile button	2019-01-24 11:54:55 +13:00
Brenda Wallace	251365654f	Include font awesome (so specs pass)	2019-01-24 11:51:48 +13:00
Brenda Wallace	943a5df870	Merge remote-tracking branch 'origin/button-translate' into button-translate	2019-01-24 10:40:24 +13:00
Brenda Wallace	8586d7c73d	Update buttons_helper.rb	2019-01-24 09:18:46 +13:00
Brenda Wallace	a8b9d0d5ff	Include icon helper from button helper	2019-01-24 09:17:13 +13:00
Brenda Wallace	d270be83d0	Tidied up the planting actions on gardens#index	2019-01-23 22:30:44 +13:00
Brenda Wallace	09230fe4e7	indentation clean up	2019-01-23 21:59:06 +13:00
Brenda Wallace	de01cc9c00	Tidy up member edit buttons	2019-01-23 21:57:21 +13:00
Brenda Wallace	2d68aa2082	Wider action bar	2019-01-23 21:49:17 +13:00
Brenda Wallace	e78180dc3a	Move consistent icons	2019-01-23 21:49:11 +13:00
Brenda Wallace	001c0251b2	DRY the icons	2019-01-23 17:34:32 +13:00
Brenda Wallace	a1b576aab4	Fixed label on link in spec	2019-01-23 16:54:07 +13:00
Brenda Wallace	45aa0f1c70	Fixed photo specs to find the button on the actions view	2019-01-23 16:49:06 +13:00
Brenda Wallace	e116229b7b	Use new finish button on planting badges	2019-01-23 16:35:12 +13:00
Brenda Wallace	6c04d26638	Crop name is in button label - add to spec	2019-01-23 16:31:44 +13:00
Brenda Wallace	f39af27538	Seperate some specs	2019-01-23 16:25:01 +13:00
Brenda Wallace	045deb1ae4	Add crop name to actions	2019-01-23 16:19:08 +13:00
Brenda Wallace	9bb08e9dac	Merge remote-tracking branch 'upstream/dev' into button-translate	2019-01-23 16:15:47 +13:00
Brenda Wallace	4d2936b68d	Copy finish planting from view to helper	2019-01-23 16:15:09 +13:00
Brenda Wallace	af7e59e45a	Find maze button in spec	2019-01-23 16:14:22 +13:00
Brenda Wallace	0fa5513bf8	Revert modifications to menu	2019-01-23 15:49:13 +13:00
Brenda Wallace	4fcd892458	Use button helper for crop wrangling	2019-01-23 15:06:56 +13:00
Brenda Wallace	7779f7ec05	Remove new planting button spec ... because it's in the button bar now	2019-01-23 15:01:34 +13:00
Brenda Wallace	066eaab1c2	Removed outdated spec	2019-01-23 14:54:43 +13:00
Brenda Wallace	a323da6780	Capitalise some translations	2019-01-23 14:52:40 +13:00
Brenda Wallace	409dc1a276	Removing some unused translations	2019-01-23 14:52:17 +13:00
Brenda Wallace	79dfe2b84d	Fixed button link, using translation that exists	2019-01-23 14:37:18 +13:00
Brenda Wallace	3965fa1934	Add "something" to global action labels	2019-01-23 14:37:00 +13:00
Brenda Wallace	14441b6238	Update from should to expect syntax	2019-01-23 14:36:48 +13:00
Brenda Wallace	d980b9af4e	Action specs for someone else's garden	2019-01-23 14:36:36 +13:00
Brenda Wallace	e5bb6fa154	Move some action button specs to feature specs ... because it's in a buttonbar, not the view now	2019-01-23 14:33:48 +13:00
Brenda Wallace	a926b37ad9	Always use the helper for add_photo buttons	2019-01-23 14:07:39 +13:00
Brenda Wallace	887886ebae	Rubocop fixup	2019-01-23 14:04:48 +13:00
Brenda Wallace	c52e735a0b	Move home page greeting test to features spec (from views)	2019-01-23 14:03:36 +13:00
Brenda Wallace	1ce0c840d2	Merge branch 'dev' into photos/seeds	2019-01-23 13:59:33 +13:00
Brenda Wallace	7acff05ccc	Merge branch 'dev' into bb-track-types-of-gardens	2019-01-23 13:58:31 +13:00
Brenda Wallace	5a2f7dfe25	Merge branch 'dev' into routes-tidy-up	2019-01-23 13:58:01 +13:00
apdarr	4f4421cb38	enforce ssl for new relic	2019-01-23 13:57:32 +13:00
apdarr	58f8a88242	set newrelic to use ssl	2019-01-23 13:57:32 +13:00
Brenda Wallace	06eb01b7c5	Tests for edit and add photo buttons	2019-01-23 08:04:06 +13:00
Brenda Wallace	a5d1303918	DRY the add photo buttons	2019-01-23 08:03:57 +13:00
Brenda Wallace	f7eaf90b77	Update labels on button in crop detail spec	2019-01-22 17:20:52 +13:00
Brenda Wallace	0350d634c6	DRY the edit buttons	2019-01-22 17:20:34 +13:00