mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-06 15:17:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
83038fc4f3 More rounded photos 2019-04-26 22:03:56 +12:00
Brenda Wallace
9524899f78 tidy up harvests #index 2019-04-26 22:03:49 +12:00
Brenda Wallace
2db8dcf7c1 Pretty rounded images 2019-04-26 22:03:30 +12:00
Brenda Wallace
31bcb35fb4 Don't turn crop images into circles 2019-04-26 22:03:20 +12:00
Brenda Wallace
f96b2ca661 Tidy columns on crops index card 2019-04-26 21:41:30 +12:00
Brenda Wallace
548e15a866 Tidy up Photos#show 2019-04-26 21:38:34 +12:00
Brenda Wallace
83668c4890 Add photos#show to percy 2019-04-26 21:30:09 +12:00
Brenda Wallace
7c51d94dc0 More crops#show tidy up 2019-04-26 21:27:46 +12:00
Brenda Wallace
0871620c55 Tidy up finding seeds from crops#show 2019-04-26 21:27:35 +12:00
dependabot[bot]
81a3c7bfbc Bump paranoia from 2.4.1 to 2.4.2 
Bumps [paranoia](https://github.com/rubysherpas/paranoia) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubysherpas/paranoia/releases)
- [Changelog](https://github.com/rubysherpas/paranoia/blob/core/CHANGELOG.md)
- [Commits](https://github.com/rubysherpas/paranoia/compare/v2.4.1...v2.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-26 07:33:13 +00:00
Brenda Wallace
6d8a9c3579 Move global actions 2019-04-26 17:54:52 +12:00
Brenda Wallace
4196ce9e6b Fix search 2019-04-26 17:35:22 +12:00
Brenda Wallace
b82c3b5b76 Tidy up seeds 2019-04-26 17:34:55 +12:00
Brenda Wallace
30b4485727 adding mdbootstrap 2019-04-26 16:36:54 +12:00
Brenda Wallace
de3aeaf823 add base branch to percy 2019-04-26 16:34:04 +12:00
Brenda Wallace
662160306d add #new to percy tests 2019-04-26 16:34:00 +12:00
Brenda Wallace
088dd29fac Add an avatar to all members 2019-04-26 16:26:22 +12:00
dependabot[bot]
7bb1424f0c Bump bullet from 5.9.0 to 6.0.0 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.9.0 to 6.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/5.9.0...6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-26 00:45:04 +12:00
Brenda Wallace
71cf334e03 Add back the link to crop seeds 2019-04-26 00:18:04 +12:00
Brenda Wallace
b9ae3a4ab4 Add harvests to the homepage in percy specs 2019-04-26 00:01:54 +12:00
Brenda Wallace
cf3477e333 Use full size image 2019-04-26 00:01:38 +12:00
Brenda Wallace
d5d9c805ad Shadows on the homepage 2019-04-25 23:51:53 +12:00
Brenda Wallace
3316514a7a More material bits 2019-04-25 23:41:34 +12:00
Brenda Wallace
bff809f482 Removed extra graphs on crops#show 2019-04-25 23:33:49 +12:00
Brenda Wallace
4918d0c950 Tidy up homepage 2019-04-25 23:28:41 +12:00
Brenda Wallace
7dd3f169ee Fixed haml error 2019-04-25 12:49:23 +12:00
Brenda Wallace
ab7eb913de removed git conflict marker 2019-04-25 12:47:24 +12:00
Brenda Wallace
5534438843 Add percy to travis 2019-04-25 12:45:44 +12:00
Brenda Wallace
724adcb183 Merge remote-tracking branch 'upstream/dev' into material-merge 2019-04-25 12:36:12 +12:00
Brenda Wallace
5ad741ad7b Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	app/views/members/_avatar.html.haml
 2019-04-25 12:36:01 +12:00
dependabot[bot]
bba9e43b77 Bump coffee-rails from 4.2.2 to 5.0.0 
Bumps [coffee-rails](https://github.com/rails/coffee-rails) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/rails/coffee-rails/releases)
- [Changelog](https://github.com/rails/coffee-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/coffee-rails/compare/v4.2.2...v5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-24 22:37:30 +12:00
dependabot[bot]
9c7564c3b2 Bump sidekiq from 5.2.6 to 5.2.7 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v5.2.6...v5.2.7)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-24 20:10:12 +12:00
dependabot[bot]
45fd123525 Merge pull request #1938 from Growstuff/dependabot/bundler/capybara-3.18.0 2019-04-24 06:57:20 +00:00
dependabot[bot]
bc33bf3084 Bump capybara from 3.17.0 to 3.18.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.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.17.0...3.18.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-24 01:36:20 +00:00
Brenda Wallace
85e7454d16 Removed irc link 2019-04-24 12:07:41 +12:00
pozorvlak
242059adf8 Merge pull request #1937 from Br3nda/percy 
Add percy - visual difference detection
 2019-04-23 17:34:37 +01:00
Brenda Wallace
3c53a8464d Freeze time 2019-04-23 13:47:36 +12:00
Brenda Wallace
09db299416 Create less members per run 2019-04-23 13:12:13 +12:00
Brenda Wallace
c3d52e0b71 signin/signup pages 2019-04-23 13:04:24 +12:00
Brenda Wallace
21ba03fc7f One run self data viewing when logged in 2019-04-23 10:52:27 +12:00
Brenda Wallace
e9cbda13b3 Adding viewing own data 2019-04-23 10:44:36 +12:00
Brenda Wallace
03acf35e73 Set the gravatar, so percy doesn't alert on every snapshot 2019-04-23 10:32:01 +12:00
Brenda Wallace
ba62208dd1 Add percy 2019-04-23 10:21:07 +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
f7e1cb6508 Merge pull request #1934 from Growstuff/dependabot/bundler/nokogiri-1.10.3 
[Security] Bump nokogiri from 1.10.2 to 1.10.3
 2019-04-23 08:44:44 +12:00
dependabot[bot]
eb428e7741 [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-22 18:06:31 +00: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
Brenda Wallace
64877fe2ac more tidy up of password reset form 2019-04-21 19:07:33 +12:00
Brenda Wallace
9dfe4d5b2d More form tidy up 2019-04-21 15:24:45 +12:00