Commit Graph

11959 Commits

Author SHA1 Message Date
Brenda Wallace
ad67b66313 buttons on homepage blurb 2019-06-15 08:25:11 +12:00
Brenda Wallace
9e7e1adfd3 Merge branch 'dev' into upgrade/bootstrap 2019-06-15 08:23:26 +12:00
Brenda Wallace
71af9c7b76 Merge pull request #1991 from Growstuff/dev
Production release
2019-06-15 08:10:52 +12:00
Brenda Wallace
d4c328a8b0 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-15 08:08:27 +12:00
Brenda Wallace
45ba712eb7 Fix database connection to share with capybara
and the database cleaner to use transactions, not truncation
2019-06-15 08:06:54 +12:00
dependabot-preview[bot]
2917be8158 Bump capybara from 3.23.0 to 3.24.0
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.23.0 to 3.24.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.23.0...3.24.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-14 19:06:31 +00:00
dependabot-preview[bot]
4c2fb13eaa Bump jquery-rails from 4.3.3 to 4.3.5
Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 4.3.3 to 4.3.5.
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v4.3.3...v4.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-06-14 18:48:55 +00:00
Brenda Wallace
44fbae6776 Use comments for blog icon
So it doesn't look like an edit button
2019-06-14 21:30:04 +12:00
Brenda Wallace
cb1dcc9f8f variables for scss 2019-06-14 21:10:02 +12:00
Brenda Wallace
43fea8f905 style the navbar search 2019-06-14 21:09:46 +12:00
Brenda Wallace
d93fdd02e3 get specs for browsing crops working 2019-06-14 20:39:42 +12:00
Brenda Wallace
6259d72ce0 delete link on drops needs href 2019-06-14 20:32:38 +12:00
Brenda Wallace
4fa4286670 dismiss the alert when deleting crops 2019-06-14 20:32:12 +12:00
Brenda Wallace
e46becac10 give link a href so capybara can find it 2019-06-14 20:22:35 +12:00
Brenda Wallace
40c75e0109 Delete needs confirmations in the specs 2019-06-14 18:12:33 +12:00
Brenda Wallace
f73b260212 replace existing database cleaner
the old one doesn't play nice with capybara
2019-06-14 18:06:41 +12:00
Brenda Wallace
5816b6c64c Removed comment show spec. Page doesn't exist now 2019-06-14 17:10:03 +12:00
Brenda Wallace
551d6f9aa3 Bump up line length 2019-06-14 16:43:25 +12:00
Brenda Wallace
7564a87232 Bring back rails rubocops 2019-06-14 16:42:09 +12:00
Brenda Wallace
ad6ec0473c Sort gems 2019-06-14 16:39:59 +12:00
Brenda Wallace
b9e2154edb rubocop lint 2019-06-14 16:39:25 +12:00
Brenda Wallace
2fc3c33520 rubocop lint 2019-06-14 16:38:49 +12:00
Brenda Wallace
f98c33e688 wrap long line 2019-06-14 16:38:20 +12:00
Brenda Wallace
8eb299c146 only show actions menu if you can do the actions 2019-06-14 16:36:04 +12:00
Brenda Wallace
115b0925cd Sorting css 2019-06-14 16:32:16 +12:00
Brenda Wallace
cfb1cd798f Removing un-used css 2019-06-14 16:31:43 +12:00
Brenda Wallace
b259ac5b43 New line at end of file 2019-06-14 16:31:20 +12:00
Brenda Wallace
3ae8900b05 Sorting css 2019-06-14 16:31:01 +12:00
Brenda Wallace
27b1b5e8db prefer single quotes 2019-06-14 16:30:26 +12:00
Brenda Wallace
dc0607c42a Remove duplicated translations 2019-06-14 16:28:13 +12:00
Brenda Wallace
d98cb87d95 Wrapped long line 2019-06-14 16:27:28 +12:00
Brenda Wallace
43d300820c indentation fix 2019-06-14 16:26:31 +12:00
Brenda Wallace
dea14ff0ff Add new line at end of file 2019-06-14 16:26:06 +12:00
Brenda Wallace
6143d88576 Remove trailing whitespace 2019-06-14 16:24:51 +12:00
Brenda Wallace
5cedea9da8 removing trailing whitespace 2019-06-14 16:23:31 +12:00
Brenda Wallace
19350e7aa0 Removing phantom 2019-06-14 16:15:49 +12:00
Brenda Wallace
0d252bf3d3 Add chrome, from apt, on travis-ci 2019-06-14 16:14:59 +12:00
Brenda Wallace
d98e94bd21 Switch from poltergeist to selenium chrome headless 2019-06-14 16:13:53 +12:00
Brenda Wallace
58ffcb281f Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-14 16:06:44 +12:00
Brenda Wallace
19eae7d259 crop search form on white background
for readability
2019-06-14 16:06:32 +12:00
Daniel O'Connor
28f68717f5 Address code climate concerns by extracting query methods 2019-06-14 13:36:20 +09:30
Brenda Wallace
d7b973e684 Add harvest predictions to homepage blurb 2019-06-14 15:58:27 +12:00
Brenda Wallace
465c7c7b6d Move crop form error messages to alert 2019-06-14 15:54:04 +12:00
Brenda Wallace
6c23302435 Fix duplicate labels on crop form 2019-06-14 15:52:05 +12:00
Brenda Wallace
feb11811a5 badges were overlapping the menu 2019-06-14 15:35:22 +12:00
Brenda Wallace
f2e87c9863 elipsis when photo title is too long 2019-06-14 15:31:16 +12:00
Brenda Wallace
6d18400a8b turn off all link hover underlines 2019-06-14 15:22:53 +12:00
Brenda Wallace
c5988ded4e tidy up badges and progress bar 2019-06-14 15:21:06 +12:00
Brenda Wallace
533c9aefdb push the link to bottom of member cards 2019-06-14 15:14:22 +12:00
Brenda Wallace
5ec29b40d0 tidy up sci name action menu 2019-06-14 15:08:01 +12:00