Commit Graph

  • 6484e4e6e5 Merge branch 'dev' into fix/recent-harvests Brenda Wallace 2019-01-27 18:25:22 +13:00
  • 10beb65e1a Feature spec to check most recently planted/harvested on crops#show Brenda Wallace 2019-01-27 18:23:15 +13:00
  • ea35816654 Fix ordering of recent harvests Brenda Wallace 2019-01-27 18:12:37 +13:00
  • 9c13064191 Bump newrelic_rpm from 5.6.0.349 to 5.7.0.350 dependabot[bot] 2019-01-26 22:56:56 +00:00
  • 0664324d29 Merge pull request #1798 from Br3nda/remove-mandrill pozorvlak 2019-01-26 22:54:32 +00:00
  • bc576ccc44 Merge branch 'dev' into bb-track-types-of-gardens Brenda Wallace 2019-01-27 11:43:49 +13:00
  • 7f8ae04520 Merge branch 'dev' into remove-mandrill Brenda Wallace 2019-01-27 11:43:33 +13:00
  • 2057aef0ea Merge pull request #1802 from Growstuff/dependabot/bundler/capybara-3.13.0 Brenda Wallace 2019-01-27 11:42:13 +13:00
  • 02d96bcc51 Removed another mandril reference Brenda Wallace 2019-01-26 14:02:50 +13:00
  • 80b0cc973d Merge pull request #1797 from Growstuff/dev pozorvlak 2019-01-24 17:33:09 +00:00
  • 5323558204 Bump capybara from 3.12.0 to 3.13.0 dependabot[bot] 2019-01-24 07:34:02 +00:00
  • b892548b12 Merge branch 'dev' into routes-tidy-up Brenda Wallace 2019-01-24 16:09:39 +13:00
  • b1d34a7fa2 Merge branch 'dev' into remove-mandrill Brenda Wallace 2019-01-24 15:52:58 +13:00
  • 60e222d9bb Merge pull request #1796 from Br3nda/app-json-heroku Brenda Wallace 2019-01-24 15:52:38 +13:00
  • 32b2cbd921 Merge branch 'button-translate' into routes-tidy-up Brenda Wallace 2019-01-24 13:49:53 +13:00
  • 986bca44f7 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up Brenda Wallace 2019-01-24 13:48:36 +13:00
  • 45890fec59 Merge remote-tracking branch 'origin/routes-tidy-up' into routes-tidy-up Brenda Wallace 2019-01-24 13:47:17 +13:00
  • fc6183eb52 DRY actions more Brenda Wallace 2019-01-24 13:46:35 +13:00
  • e66f8298c8 Merge branch 'dev' into remove-mandrill Brenda Wallace 2019-01-24 12:20:39 +13:00
  • e17e5c9297 Merge branch 'dev' into bb-track-types-of-gardens Brenda Wallace 2019-01-24 12:20:26 +13:00
  • 9f3b757d2b Merge branch 'dev' into app-json-heroku Brenda Wallace 2019-01-24 12:20:01 +13:00
  • f6deaffb94 Fixed nested row on layout, that was breaking photo add page Brenda Wallace 2019-01-24 11:58:58 +13:00
  • 449e8da25a Added missing translation for Edit profile button Brenda Wallace 2019-01-24 11:54:55 +13:00
  • d73f8716c0 Include font awesome (so specs pass) Brenda Wallace 2019-01-24 11:51:48 +13:00
  • e202c73584 Update buttons_helper.rb Brenda Wallace 2019-01-24 09:18:46 +13:00
  • 8bfe3278cc Include icon helper from button helper Brenda Wallace 2019-01-24 09:17:13 +13:00
  • a54db7d5ff Tidied up the planting actions on gardens#index Brenda Wallace 2019-01-23 22:30:44 +13:00
  • 80e0d964e1 indentation clean up Brenda Wallace 2019-01-23 21:59:06 +13:00
  • 5218685bd9 Tidy up member edit buttons Brenda Wallace 2019-01-23 21:57:21 +13:00
  • 94a5411a79 Wider action bar Brenda Wallace 2019-01-23 21:49:17 +13:00
  • 88a277c6ed Move consistent icons Brenda Wallace 2019-01-23 21:49:11 +13:00
  • e912211cee DRY the icons Brenda Wallace 2019-01-23 17:34:32 +13:00
  • 4e82584a0a Fixed label on link in spec Brenda Wallace 2019-01-23 16:54:07 +13:00
  • a09c6603e2 Fixed photo specs to find the button on the actions view Brenda Wallace 2019-01-23 16:49:06 +13:00
  • 2380d62258 Use new finish button on planting badges Brenda Wallace 2019-01-23 16:35:12 +13:00
  • 1460d4822a Crop name is in button label - add to spec Brenda Wallace 2019-01-23 16:31:44 +13:00
  • 28422bfd1d Seperate some specs Brenda Wallace 2019-01-23 16:25:01 +13:00
  • 81ee8ec56e Add crop name to actions Brenda Wallace 2019-01-23 16:19:08 +13:00
  • 2a98cefedb Copy finish planting from view to helper Brenda Wallace 2019-01-23 16:15:09 +13:00
  • 99fb21eebe Find maze button in spec Brenda Wallace 2019-01-23 16:14:22 +13:00
  • 33ad133665 Revert modifications to menu Brenda Wallace 2019-01-23 15:49:13 +13:00
  • ca75b1c852 Use button helper for crop wrangling Brenda Wallace 2019-01-23 15:06:56 +13:00
  • c9be8be9e5 Remove new planting button spec Brenda Wallace 2019-01-23 15:01:34 +13:00
  • 8023d71a21 Removed outdated spec Brenda Wallace 2019-01-23 14:54:43 +13:00
  • 6e433306f4 Capitalise some translations Brenda Wallace 2019-01-23 14:52:40 +13:00
  • 655efb26eb Removing some unused translations Brenda Wallace 2019-01-23 14:52:17 +13:00
  • 97675868bd Fixed button link, using translation that exists Brenda Wallace 2019-01-23 14:37:18 +13:00
  • 424866b733 Add "something" to global action labels Brenda Wallace 2019-01-23 14:37:00 +13:00
  • c78b96b9d6 Update from should to expect syntax Brenda Wallace 2019-01-23 14:36:48 +13:00
  • 8ec35cc65c Action specs for someone else's garden Brenda Wallace 2019-01-23 14:36:36 +13:00
  • e6e582cb4a Move some action button specs to feature specs Brenda Wallace 2019-01-23 14:33:48 +13:00
  • 761a0b4142 Always use the helper for add_photo buttons Brenda Wallace 2019-01-23 14:07:39 +13:00
  • 9130b44fb9 Rubocop fixup Brenda Wallace 2019-01-23 14:04:48 +13:00
  • 8eb9487967 Move home page greeting test to features spec (from views) Brenda Wallace 2019-01-23 14:03:36 +13:00
  • a6ac57f045 Tests for edit and add photo buttons Brenda Wallace 2019-01-23 08:04:06 +13:00
  • a95c3a988c DRY the add photo buttons Brenda Wallace 2019-01-23 08:03:57 +13:00
  • a8547d6033 Update labels on button in crop detail spec Brenda Wallace 2019-01-22 17:20:52 +13:00
  • 22e50aa618 DRY the edit buttons Brenda Wallace 2019-01-22 17:20:34 +13:00
  • ad001767e2 Move seed buttongs to buttons helper Brenda Wallace 2019-01-22 17:15:25 +13:00
  • b58e0cf3ce Moved garden actions code to top of view Brenda Wallace 2019-01-22 17:11:50 +13:00
  • 8ae062fe9b Added missing harvest actions Brenda Wallace 2019-01-22 17:11:30 +13:00
  • c811ab1f51 Moved harvest buttons to match other #show pages Brenda Wallace 2019-01-22 17:11:22 +13:00
  • 8270611f0c Removed un-used viewss Brenda Wallace 2019-01-22 17:03:34 +13:00
  • 02d4d12582 suffix _button to button helpers Brenda Wallace 2019-01-22 16:58:13 +13:00
  • 8df90dacfc Seperate specs Brenda Wallace 2019-01-22 16:54:54 +13:00
  • 6ced6c5c4e Update link label in spec Brenda Wallace 2019-01-22 16:54:25 +13:00
  • dfd7765c47 Rubocop fix ups Brenda Wallace 2019-01-22 16:48:57 +13:00
  • e2a0278e40 Use same t() for the button for writing blog posts Brenda Wallace 2019-01-22 16:46:44 +13:00
  • 313a18db08 Titles of pages consistent with buttons to pages Brenda Wallace 2019-01-22 15:55:41 +13:00
  • 67e58fe901 Moving buttons to the right of page (with translations) Brenda Wallace 2019-01-22 15:19:24 +13:00
  • b86e6e6dab More translations in garden actions Brenda Wallace 2019-01-21 18:43:37 +13:00
  • de3c7fb1c5 Move homepage title to the :title content Brenda Wallace 2019-01-21 18:43:25 +13:00
  • ba38637392 Wrapping crop actions in btn-group Brenda Wallace 2019-01-21 18:43:07 +13:00
  • d1c367e3d9 Fixed glyphicons Brenda Wallace 2019-01-21 18:42:52 +13:00
  • fcfe7f196e Button for planting stuff Brenda Wallace 2019-01-21 18:42:44 +13:00
  • 614eff06b9 Bigger buttons Brenda Wallace 2019-01-21 18:42:34 +13:00
  • a4f20bff77 More button label translations Brenda Wallace 2019-01-21 18:42:21 +13:00
  • f5a63d770c Moving garden actions to button bar Brenda Wallace 2019-01-21 18:42:13 +13:00
  • 279ce38c86 Moving actions to the button bar Brenda Wallace 2019-01-21 18:42:02 +13:00
  • 6eebc7480c Moved global actions - only show if no buttonbar Brenda Wallace 2019-01-21 18:41:51 +13:00
  • acc100f744 Adding missing translations for plantings Brenda Wallace 2019-01-21 14:19:40 +13:00
  • 2f271da909 Move global buttons and search Brenda Wallace 2019-01-21 14:13:36 +13:00
  • 6c16dca9b4 Dry the gglypicons Brenda Wallace 2019-01-21 14:13:12 +13:00
  • 30255a24d2 Use buttons.* translations for glyphicons titles Brenda Wallace 2019-01-21 13:40:56 +13:00
  • e886929af5 Put buttons translations under buttons namespace Brenda Wallace 2019-01-21 13:37:58 +13:00
  • 7169b624b0 Move the action buttons to EVERY page Brenda Wallace 2019-01-21 11:47:25 +13:00
  • a3f32aba9b Call t() on button labels Brenda Wallace 2019-01-21 11:46:50 +13:00
  • 79c22308df Fixed nested row on layout, that was breaking photo add page Brenda Wallace 2019-01-24 11:58:58 +13:00
  • 87c7596ab7 Added missing translation for Edit profile button Brenda Wallace 2019-01-24 11:54:55 +13:00
  • 251365654f Include font awesome (so specs pass) Brenda Wallace 2019-01-24 11:51:48 +13:00
  • 943a5df870 Merge remote-tracking branch 'origin/button-translate' into button-translate Brenda Wallace 2019-01-24 10:40:24 +13:00
  • 8586d7c73d Update buttons_helper.rb Brenda Wallace 2019-01-24 09:18:46 +13:00
  • a8b9d0d5ff Include icon helper from button helper Brenda Wallace 2019-01-24 09:17:13 +13:00
  • d270be83d0 Tidied up the planting actions on gardens#index Brenda Wallace 2019-01-23 22:30:44 +13:00
  • 09230fe4e7 indentation clean up Brenda Wallace 2019-01-23 21:59:06 +13:00
  • de01cc9c00 Tidy up member edit buttons Brenda Wallace 2019-01-23 21:57:21 +13:00
  • 2d68aa2082 Wider action bar Brenda Wallace 2019-01-23 21:49:17 +13:00
  • e78180dc3a Move consistent icons Brenda Wallace 2019-01-23 21:49:11 +13:00
  • 001c0251b2 DRY the icons Brenda Wallace 2019-01-23 17:34:32 +13:00
  • a1b576aab4 Fixed label on link in spec Brenda Wallace 2019-01-23 16:54:07 +13:00