Commit Graph

6392 Commits

Author SHA1 Message Date
Brenda Wallace
61b3c7880c Freeze time 2019-05-12 22:29:35 +12:00
Brenda Wallace
89fa4743b8 Create less members per run 2019-05-12 22:29:35 +12:00
Brenda Wallace
4ec9630267 signin/signup pages 2019-05-12 22:29:35 +12:00
Brenda Wallace
559ca226d5 One run self data viewing when logged in 2019-05-12 22:29:35 +12:00
Brenda Wallace
3a2662b488 Adding viewing own data 2019-05-12 22:29:35 +12:00
Brenda Wallace
75a03ab18e Set the gravatar, so percy doesn't alert on every snapshot 2019-05-12 22:29:35 +12:00
Brenda Wallace
3ebd7ede87 Add percy 2019-05-12 22:29:35 +12:00
dependabot[bot]
2b4d0fecf4 [Security] Bump nokogiri from 1.10.2 to 1.10.3
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **This update includes security fixes.**
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-23 08:47:13 +12:00
Brenda Wallace
0491820a35 Only show planted_at if it is set 2019-04-21 22:31:54 +12:00
Brenda Wallace
e327e6fd11 Merge pull request #1918 from Growstuff/dev
Release 51
2019-04-21 22:00:39 +12:00
Awesome Code
78c8fdb743 Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-04-20 09:44:42 +00:00
Awesome Code
4e07b0d620 Auto corrected by following Lint Ruby RSpec/LeadingSubject 2019-04-20 09:42:28 +00:00
Brenda Wallace
5480fbb427 Merge pull request #1927 from Br3nda/reindex-rake
Reindex in batches
2019-04-20 20:16:49 +12:00
Brenda Wallace
1ebaf88092 Merge pull request #1889 from Br3nda/plantings-show
Remove table display on plantings#show, replace with boxes
2019-04-20 20:16:13 +12:00
Brenda Wallace
4312ef0047 FIX typo in view 2019-04-20 20:07:19 +12:00
Brenda Wallace
9ee3f514cd Adding trailing comma
because codeclimate likes them
2019-04-20 20:01:34 +12:00
Brenda Wallace
3371353db8 Revert spec
less to update
2019-04-20 19:57:45 +12:00
Brenda Wallace
a2f9f2f6df Replace (revert back) to simple image_tag in photos#show
so i don't need to update specs
2019-04-20 19:56:23 +12:00
Brenda Wallace
10a7689b05 Lint 2019-04-20 19:30:09 +12:00
Brenda Wallace
e2f3723777 Remove 2019-04-20 15:14:43 +12:00
Brenda Wallace
fa9205a94e Remove ooops icons 2019-04-20 15:12:07 +12:00
Brenda Wallace
f86177e78f lint 2019-04-20 15:10:08 +12:00
Brenda Wallace
33460bb171 Update spec 2019-04-20 15:09:24 +12:00
Brenda Wallace
e41bc6c6f1 8 members 2019-04-20 15:06:59 +12:00
Brenda Wallace
9c01ef94ac Revert to previous code
So i don't need to update lotsa specs
2019-04-20 15:05:03 +12:00
Brenda Wallace
bf4c8a83e1 Update some planting show specs 2019-04-20 14:31:02 +12:00
Brenda Wallace
3e91d3e982 Merge branch 'dev' into plantings-show 2019-04-20 14:13:45 +12:00
dependabot[bot]
4842d31ea6 Merge pull request #1930 from Growstuff/dependabot/bundler/capybara-3.17.0 2019-04-20 01:33:14 +00:00
Brenda Wallace
570c53318d Consistently using h3 2019-04-20 13:25:47 +12:00
Brenda Wallace
bf2bc6302a Merge remote-tracking branch 'origin/plantings-show' into plantings-show 2019-04-20 13:22:21 +12:00
Brenda Wallace
b9267336b4 Merge branch 'dev' into plantings-show 2019-04-20 13:22:18 +12:00
Brenda Wallace
5484664716 Update spec 2019-04-20 12:16:58 +12:00
dependabot[bot]
41cee3b416 Bump capybara from 3.16.2 to 3.17.0
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.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.16.2...3.17.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-20 00:13:35 +00:00
dependabot[bot]
7b08ad6091 Merge pull request #1929 from Growstuff/dependabot/bundler/oj-3.7.12 2019-04-20 00:12:09 +00:00
Brenda Wallace
7c113f0e1c Back to using thumbnails 2019-04-20 10:01:18 +12:00
Brenda Wallace
e899634696 lint 2019-04-20 09:54:21 +12:00
Brenda Wallace
7ea13c40ed Isotope not needed for photo thumbnails 2019-04-20 09:54:02 +12:00
Brenda Wallace
01beb6ac7e Merge remote-tracking branch 'origin/plantings-show' into plantings-show 2019-04-20 09:47:32 +12:00
Brenda Wallace
54146a3a9f javascript lint 2019-04-20 09:47:19 +12:00
Brenda Wallace
9da4ccd6de Merge branch 'dev' into plantings-show 2019-04-20 09:46:14 +12:00
dependabot[bot]
63788e4844 Bump oj from 3.7.11 to 3.7.12
Bumps [oj](https://github.com/ohler55/oj) from 3.7.11 to 3.7.12.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.11...v3.7.12)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-19 21:45:27 +00:00
Brenda Wallace
91b7f58e9d No longer have 100% on plantings that are finished 2019-04-20 09:45:06 +12:00
Brenda Wallace
a8009c49e8 Merge pull request #1931 from Growstuff/dependabot/bundler/searchkick-4.0.0
Bump searchkick from 3.1.2 to 4.0.0
2019-04-20 09:43:57 +12:00
Brenda Wallace
b71df87ac3 better use of fullsize crop image 2019-04-20 09:40:31 +12:00
Brenda Wallace
03bdb45b2d Higher res photo, so it doesn't look pixelated 2019-04-20 09:36:18 +12:00
Brenda Wallace
94a2127c04 Tidy up small screen display 2019-04-20 09:35:59 +12:00
Brenda Wallace
837111f6dc Checks we have a planted_from before we pluralize it 2019-04-20 09:27:07 +12:00
Brenda Wallace
c66ee04690 Only suggest recording harvests if they planting isn't finished 2019-04-20 09:19:13 +12:00
Brenda Wallace
31c628e950 Put back our own progress bar 2019-04-20 09:18:52 +12:00
Brenda Wallace
27d12bf07e Isotope making nice layout on plantings#show 2019-04-20 09:09:07 +12:00