Commit Graph
13034 Commits
Author SHA1 Message Date
Brenda Wallace 1e03d15434 Move post actions to own file 2019-05-25 15:18:58 +12:00
Brenda Wallace b21aa50203 Tidy up seeds on homepage 2019-05-25 15:18:43 +12:00
Brenda Wallace 94aa920360 Fix button id 2019-05-25 15:14:02 +12:00
Brenda Wallace f822b32ac8 More Actions into drop down 2019-05-25 15:11:07 +12:00
Brenda Wallace e4be6feaed Tidy up forms form 2019-05-25 14:26:31 +12:00
Brenda Wallace 54f54f020a Make sure we precompile the assets before running percy 2019-05-25 10:31:26 +12:00
Brenda Wallace 4c92c97aaa Add names to admin pages in percy spec 2019-05-25 10:29:40 +12:00
Brenda Wallace 7ffefcf1b5 Add admin and crop wrangling to percy spec 2019-05-25 10:24:31 +12:00
Brenda Wallace 4caa30b2f5 button horizontal again 2019-05-25 10:22:57 +12:00
Brenda Wallace 6af086e94d Tidy up percy specs for major #new pages 2019-05-25 10:04:16 +12:00
Brenda Wallace ba000fd6ae Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-05-25 09:55:57 +12:00
Brenda Wallace c54da57b31 Merge branch 'dev' into upgrade/bootstrap 2019-05-24 23:05:36 +12:00
Brenda Wallace 3ad36c647b seed form 2019-05-24 21:15:45 +12:00
Brenda Wallace 5c544e3026 smaller planting cards 2019-05-24 21:15:36 +12:00
Brenda Wallace b07f5526f1 Vertical buttons 2019-05-24 20:50:17 +12:00
Brenda Wallace 3ec0294565 post body 2019-05-24 20:47:18 +12:00
Brenda Wallace 95ed451c21 post header 2019-05-24 20:46:54 +12:00
Brenda Wallace 334037ed1e form tidy 2019-05-24 20:43:00 +12:00
Brenda Wallace ca17e6a258 Starting to tidy the crops form 2019-05-24 20:37:56 +12:00
Brenda Wallace e4a375de79 Add missing translations 2019-05-24 20:37:32 +12:00
Brenda Wallace f711b7e3b7 Add crops new to the percy specs 2019-05-24 20:37:16 +12:00
Brenda Wallace c67adc1bd0 move global actions buttons 2019-05-24 20:37:06 +12:00
Brenda Wallace cb5c28f0a3 seeds forms 2019-05-24 20:36:57 +12:00
Brenda Wallace a2738aa99e Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-05-24 20:15:11 +12:00
Brenda Wallace a18f0f4d38 rubocop lint 2019-05-24 20:15:01 +12:00
Brenda Wallace b4b1a97a2a Tidy harvest#index 2019-05-24 20:14:47 +12:00
Brenda Wallace 20fbec96d4 Tidying up forms 2019-05-24 20:14:24 +12:00
codefactor-io 6e78c678d7 [CodeFactor] Apply fixes 2019-05-24 01:24:29 +00:00
Brenda Wallace c3ebdcb782 Merge pull request #1967 from Growstuff/dev-cf-autofix
Apply fixes from CodeFactor
2019-05-24 13:24:09 +12:00
codefactor-io b55e99a05e [CodeFactor] Apply fixes 2019-05-24 01:23:32 +00:00
codefactor-io 9fd2f34bf7 [CodeFactor] Apply fixes 2019-05-23 11:30:10 +00:00
Brenda Wallace 64c3d0ec3e Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-05-23 22:55:00 +12:00
Brenda Wallace 2f4a3fdcee tidy up seeds form 2019-05-23 22:54:38 +12:00
Brenda Wallace a43b2858d4 harvest form tidy up 2019-05-23 22:44:18 +12:00
Brenda Wallace 753814eb1d Merge branch 'dev' into upgrade/bootstrap 2019-05-23 20:19:38 +12:00
dependabot[bot] 8c3c554e7f Bump selenium-webdriver from 3.142.2 to 3.142.3
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.2 to 3.142.3.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-23 08:18:59 +00:00
Brenda Wallace 42c9879569 Merge pull request #1961 from Growstuff/dev
Production release
2019-05-23 11:41:09 +12:00
dependabot[bot] d155f92206 Bump haml-rails from 2.0.0 to 2.0.1
Bumps [haml-rails](https://github.com/indirect/haml-rails) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/indirect/haml-rails/releases)
- [Commits](https://github.com/indirect/haml-rails/compare/v2.0.0...v2.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-22 20:43:02 +00:00
dependabot[bot] 2a60435825 Bump rubocop from 0.69.0 to 0.70.0
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.69.0 to 0.70.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.69.0...v0.70.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-23 08:06:45 +12:00
Brenda Wallace 6216601d2a Tidy up plantings#new 2019-05-22 16:53:14 +12:00
Brenda Wallace 8e23f25ebb Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	Gemfile.lock
2019-05-22 07:51:12 +12:00
Brenda Wallace 7cb0002b37 Convert to scss 2019-05-21 14:04:23 +12:00
Brenda Wallace a8f1740584 Re-instate the buttons 2019-05-21 13:39:56 +12:00
Brenda Wallace c421eaaf4b Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-05-21 13:38:06 +12:00
Brenda Wallace 3559780fb4 Plant something button 2019-05-21 13:37:43 +12:00
Brenda Wallace d2e0331539 DRY the photos icon use 2019-05-21 13:37:31 +12:00
Brenda Wallace bd897efcce Addprogress back to plantings 2019-05-21 12:06:52 +12:00
Brenda Wallace d217282bf3 Add photos to activity 2019-05-21 12:06:22 +12:00
Brenda Wallace eb5195e80a Merge branch 'dev' into upgrade/bootstrap 2019-05-21 11:16:03 +12:00
dependabot[bot] c5c1bec5fb Bump jsonapi-resources from 0.9.6 to 0.9.7
Bumps [jsonapi-resources](https://github.com/cerebris/jsonapi-resources) from 0.9.6 to 0.9.7.
- [Release notes](https://github.com/cerebris/jsonapi-resources/releases)
- [Commits](https://github.com/cerebris/jsonapi-resources/compare/v0.9.6...v0.9.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-20 09:00:30 +00:00