Commit Graph

  • 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
  • 45aa0f1c70 Fixed photo specs to find the button on the actions view Brenda Wallace 2019-01-23 16:49:06 +13:00
  • e116229b7b Use new finish button on planting badges Brenda Wallace 2019-01-23 16:35:12 +13:00
  • 6c04d26638 Crop name is in button label - add to spec Brenda Wallace 2019-01-23 16:31:44 +13:00
  • f39af27538 Seperate some specs Brenda Wallace 2019-01-23 16:25:01 +13:00
  • 045deb1ae4 Add crop name to actions Brenda Wallace 2019-01-23 16:19:08 +13:00
  • 9bb08e9dac Merge remote-tracking branch 'upstream/dev' into button-translate Brenda Wallace 2019-01-23 16:15:47 +13:00
  • 4d2936b68d Copy finish planting from view to helper Brenda Wallace 2019-01-23 16:15:09 +13:00
  • af7e59e45a Find maze button in spec Brenda Wallace 2019-01-23 16:14:22 +13:00
  • 0fa5513bf8 Revert modifications to menu Brenda Wallace 2019-01-23 15:49:13 +13:00
  • 4fcd892458 Use button helper for crop wrangling Brenda Wallace 2019-01-23 15:06:56 +13:00
  • 7779f7ec05 Remove new planting button spec Brenda Wallace 2019-01-23 15:01:34 +13:00
  • 066eaab1c2 Removed outdated spec Brenda Wallace 2019-01-23 14:54:43 +13:00
  • a323da6780 Capitalise some translations Brenda Wallace 2019-01-23 14:52:40 +13:00
  • 409dc1a276 Removing some unused translations Brenda Wallace 2019-01-23 14:52:17 +13:00
  • 79dfe2b84d Fixed button link, using translation that exists Brenda Wallace 2019-01-23 14:37:18 +13:00
  • 3965fa1934 Add "something" to global action labels Brenda Wallace 2019-01-23 14:37:00 +13:00
  • 14441b6238 Update from should to expect syntax Brenda Wallace 2019-01-23 14:36:48 +13:00
  • d980b9af4e Action specs for someone else's garden Brenda Wallace 2019-01-23 14:36:36 +13:00
  • e5bb6fa154 Move some action button specs to feature specs Brenda Wallace 2019-01-23 14:33:48 +13:00
  • a926b37ad9 Always use the helper for add_photo buttons Brenda Wallace 2019-01-23 14:07:39 +13:00
  • 887886ebae Rubocop fixup Brenda Wallace 2019-01-23 14:04:48 +13:00
  • c52e735a0b Move home page greeting test to features spec (from views) Brenda Wallace 2019-01-23 14:03:36 +13:00
  • 1ce0c840d2 Merge branch 'dev' into photos/seeds Brenda Wallace 2019-01-23 13:59:33 +13:00
  • 7acff05ccc Merge branch 'dev' into bb-track-types-of-gardens Brenda Wallace 2019-01-23 13:58:31 +13:00
  • 5a2f7dfe25 Merge branch 'dev' into routes-tidy-up Brenda Wallace 2019-01-23 13:58:01 +13:00
  • 4f4421cb38 enforce ssl for new relic apdarr 2019-01-22 16:59:38 -05:00
  • 58f8a88242 set newrelic to use ssl apdarr 2019-01-17 11:03:20 -05:00
  • 06eb01b7c5 Tests for edit and add photo buttons Brenda Wallace 2019-01-23 08:04:06 +13:00
  • a5d1303918 DRY the add photo buttons Brenda Wallace 2019-01-23 08:03:57 +13:00
  • f7eaf90b77 Update labels on button in crop detail spec Brenda Wallace 2019-01-22 17:20:52 +13:00
  • 0350d634c6 DRY the edit buttons Brenda Wallace 2019-01-22 17:20:34 +13:00
  • e1bc635b04 Move seed buttongs to buttons helper Brenda Wallace 2019-01-22 17:15:25 +13:00
  • a2b9a36615 Moved garden actions code to top of view Brenda Wallace 2019-01-22 17:11:50 +13:00
  • 01a7b7fd37 Added missing harvest actions Brenda Wallace 2019-01-22 17:11:30 +13:00
  • dc4292f948 Moved harvest buttons to match other #show pages Brenda Wallace 2019-01-22 17:11:22 +13:00
  • 431572a77a Removed un-used viewss Brenda Wallace 2019-01-22 17:03:34 +13:00
  • adf3853c09 suffix _button to button helpers Brenda Wallace 2019-01-22 16:58:13 +13:00
  • 1809ca2746 Seperate specs Brenda Wallace 2019-01-22 16:54:54 +13:00
  • 57bcac8b02 Update link label in spec Brenda Wallace 2019-01-22 16:54:25 +13:00
  • 72c957967d Rubocop fix ups Brenda Wallace 2019-01-22 16:48:57 +13:00
  • 8ead646bf9 Use same t() for the button for writing blog posts Brenda Wallace 2019-01-22 16:46:44 +13:00
  • 90b0d0956e Titles of pages consistent with buttons to pages Brenda Wallace 2019-01-22 15:55:41 +13:00
  • d418745e87 Moving buttons to the right of page (with translations) Brenda Wallace 2019-01-22 15:19:24 +13:00
  • 42d3db9ba4 More translations in garden actions Brenda Wallace 2019-01-21 18:43:37 +13:00
  • acab1db135 Move homepage title to the :title content Brenda Wallace 2019-01-21 18:43:25 +13:00
  • d6fa35099e Wrapping crop actions in btn-group Brenda Wallace 2019-01-21 18:43:07 +13:00
  • 207e962501 Fixed glyphicons Brenda Wallace 2019-01-21 18:42:52 +13:00
  • 9a6bd714cb Button for planting stuff Brenda Wallace 2019-01-21 18:42:44 +13:00
  • dcd6e3d27c Bigger buttons Brenda Wallace 2019-01-21 18:42:34 +13:00
  • f5a61ba486 More button label translations Brenda Wallace 2019-01-21 18:42:21 +13:00
  • f52bb9737d Moving garden actions to button bar Brenda Wallace 2019-01-21 18:42:13 +13:00
  • 9f61d7212c Moving actions to the button bar Brenda Wallace 2019-01-21 18:42:02 +13:00
  • fbc958b76a Moved global actions - only show if no buttonbar Brenda Wallace 2019-01-21 18:41:51 +13:00
  • bc359412af Adding missing translations for plantings Brenda Wallace 2019-01-21 14:19:40 +13:00
  • e8a4cc61ea Move global buttons and search Brenda Wallace 2019-01-21 14:13:36 +13:00
  • 73fa667c1d Dry the gglypicons Brenda Wallace 2019-01-21 14:13:12 +13:00
  • e6dea31935 Use buttons.* translations for glyphicons titles Brenda Wallace 2019-01-21 13:40:56 +13:00
  • 47e11c5b7c Put buttons translations under buttons namespace Brenda Wallace 2019-01-21 13:37:58 +13:00
  • 0914caae88 Move the action buttons to EVERY page Brenda Wallace 2019-01-21 11:47:25 +13:00
  • 24ead96a71 Call t() on button labels Brenda Wallace 2019-01-21 11:46:50 +13:00
  • e1fdc729db Merge branch 'dev' into bb-track-types-of-gardens Brenda Wallace 2019-01-21 11:36:46 +13:00
  • 2b20d32645 Merge branch 'dev' into routes-tidy-up Brenda Wallace 2019-01-21 11:36:25 +13:00
  • 2bf328be15 Merge branch 'dev' into app-json-heroku Brenda Wallace 2019-01-21 11:35:31 +13:00
  • 4825cb44ae Merge branch 'dev' into remove-mandrill Brenda Wallace 2019-01-21 11:35:22 +13:00
  • 2539899934 Fix notification specs Brenda Wallace 2019-01-21 10:50:22 +13:00
  • 31321fce17 Merge remote-tracking branch 'upstream/dev' into routes-tidy-up Brenda Wallace 2019-01-19 12:52:19 +13:00
  • f07dc1956b Merge branch 'dev' into app-json-heroku Brenda Wallace 2019-01-19 12:38:39 +13:00
  • 45793c1cec Merge branch 'dev' into routes-tidy-up Brenda Wallace 2019-01-19 12:37:53 +13:00
  • 5b732fedae Remove references to MANDRILL Brenda Wallace 2019-01-19 12:36:27 +13:00
  • f453682696 Fixing sendgrid Brenda Wallace 2019-01-19 12:33:58 +13:00
  • 6f23a203a2 Switch to SendGrid (remove sparkhost) Brenda Wallace 2019-01-18 14:13:11 +13:00
  • b28bddaf0c Merge branch 'dev' into app-json-heroku Brenda Wallace 2019-01-19 09:37:28 +13:00
  • b9471e3a6e Merge branch 'dev' into photos/seeds Brenda Wallace 2019-01-19 09:35:00 +13:00
  • 4be6169c93 Bump jsonapi-resources from 0.9.4 to 0.9.5 dependabot[bot] 2019-01-18 20:03:47 +00:00
  • 2bb80746e0 Merge branch 'dev' into routes-tidy-up Brenda Wallace 2019-01-19 09:32:48 +13:00
  • a690dc1479 Merge branch 'dev' into app-json-heroku Brenda Wallace 2019-01-19 09:04:04 +13:00
  • cab5986573 Merge branch 'dev' into bb-track-types-of-gardens Brenda Wallace 2019-01-19 09:00:57 +13:00
  • 2c48596de9 Merge branch 'master' into dev Brenda Wallace 2019-01-19 09:00:15 +13:00
  • e296f15981 Merge branch 'dev' into routes-tidy-up Brenda Wallace 2019-01-19 08:57:19 +13:00
  • 2b6645d3b5 Merge branch 'dev' into app-json-heroku Brenda Wallace 2019-01-19 08:56:57 +13:00
  • 36765808b9 Auto corrected by following Format Css Code Awesome Code 2019-01-18 01:21:48 +00:00
  • b6a7fa0efd Force to redirect to ssl Brenda Wallace 2019-01-18 14:41:57 +13:00
  • 83f3872488 Merge pull request #1761 from Growstuff/dev pozorvlak 2019-01-18 17:31:10 +00:00
  • b35d13d5e5 Update seeds_controller.rb Brenda Wallace 2019-01-18 20:05:41 +13:00
  • d1a3f41462 Throw if can't find the @crop Brenda Wallace 2019-01-18 20:04:19 +13:00
  • 3212f748b4 Update crops_controller.rb Brenda Wallace 2019-01-18 20:03:22 +13:00
  • cb6a06feb6 find by slug Brenda Wallace 2019-01-18 20:02:15 +13:00
  • e337fcb7f7 Put displayed member back to using member.slug Brenda Wallace 2019-01-18 20:00:59 +13:00
  • a06516b80f Put displayed link back to using login_name Brenda Wallace 2019-01-18 20:00:31 +13:00
  • a69f5bf65f Merge branch 'dev' into UTFGardenNames Brenda Wallace 2019-01-18 18:54:13 +13:00
  • 1fc70e5a2b Rubocop linting Brenda Wallace 2019-01-18 14:54:24 +13:00
  • 4ea9dda5e9 Merge branch 'fix/1792-sparkhost-deprecated' into app-json-heroku Brenda Wallace 2019-01-18 14:52:53 +13:00
  • 03c8d75899 Fixing the app.json for Bonsai Brenda Wallace 2019-01-18 14:48:04 +13:00
  • 6273fa684c Models (plot and container) need to sub class ApplicationRecord Brenda Wallace 2019-01-18 14:34:47 +13:00