mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-06 21:22:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 102 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 7f8ae04520 Merge branch 'dev' into remove-mandrill 2019-01-27 11:43:33 +13:00
Brenda Wallace 2057aef0ea Merge pull request #1802 from Growstuff/dependabot/bundler/capybara-3.13.0 
Bump capybara from 3.12.0 to 3.13.0
 2019-01-27 11:42:13 +13:00
Brenda Wallace 02d96bcc51 Removed another mandril reference 2019-01-26 14:02:50 +13:00
pozorvlak 80b0cc973d Merge pull request #1797 from Growstuff/dev 
Release 51
 2019-01-24 17:33:09 +00:00
dependabot[bot] 5323558204 Bump capybara from 3.12.0 to 3.13.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.12.0...3.13.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-24 07:34:02 +00:00
Brenda Wallace b892548b12 Merge branch 'dev' into routes-tidy-up 2019-01-24 16:09:39 +13:00
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 32b2cbd921 Merge branch 'button-translate' into routes-tidy-up 
Conflicts:
	app/views/crops/_search_bar.haml
	app/views/layouts/application.html.haml
 2019-01-24 13:49:53 +13:00
Brenda Wallace 986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up 
Conflicts:
	app/views/layouts/_header.html.haml
	spec/features/gardens/actions_spec.rb
 2019-01-24 13:48:36 +13:00
Brenda Wallace 45890fec59 Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up 2019-01-24 13:47:17 +13:00
Brenda Wallace fc6183eb52 DRY actions more 2019-01-24 13:46:35 +13:00
Brenda Wallace e66f8298c8 Merge branch 'dev' into remove-mandrill 2019-01-24 12:20:39 +13:00
Brenda Wallace e17e5c9297 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-24 12:20:26 +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