mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-18 13:38:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,509 Commits 63 Branches 82 Tags
707dc2e15686ddc50bbffbdd7e03b3fb594d433b
Commit Graph

6509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
707dc2e156 Fix display of member menu 2019-05-17 11:54:49 +12:00
Brenda Wallace
0b9a0609bc Pretty shadows on photos 2019-05-17 11:54:39 +12:00
Brenda Wallace
83be516918 Align crop photos better 2019-05-17 11:54:12 +12:00
Brenda Wallace
d55af1b77d Fix droppdown/dropup menus 2019-05-17 11:53:32 +12:00
Brenda Wallace
8d451b9687 Only show tradeable badge is actually tradeable 2019-05-17 11:06:29 +12:00
Brenda Wallace
c5c7376759 Tidy up the small screen display of harvest and plantings on the homepage 2019-05-17 10:09:29 +12:00
Brenda Wallace
42764602ff Use flex instead of isotope 2019-05-17 09:50:25 +12:00
Brenda Wallace
4c0bca4b86 Removing isotope 
we don't need it anymore
 2019-05-17 09:49:57 +12:00
Brenda Wallace
e21e5d5960 Fixed padding on photos#show 2019-05-16 22:18:56 +12:00
Brenda Wallace
758bfacb4f Restore title on photos#show page 2019-05-16 22:16:58 +12:00
Brenda Wallace
a65d2ba7b5 Addings gardens#show to percy spec 2019-05-16 21:57:12 +12:00
Brenda Wallace
3deb01d983 Reduce max width 2019-05-16 21:53:55 +12:00
Brenda Wallace
2cfcfffccc tidy up sciname display on crops#show 2019-05-16 21:53:46 +12:00
Brenda Wallace
c999715ab0 Restoring the nav bar 2019-05-16 21:53:27 +12:00
Brenda Wallace
e26fff6d23 Add icon to find seeds 2019-05-16 21:50:03 +12:00
Brenda Wallace
b0de475cbe Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-05-16 19:58:52 +12:00
Brenda Wallace
599cc349b8 Home page tidy for plantings, harvests, and discussion 2019-05-16 19:58:37 +12:00
Brenda Wallace
5a804db769 Merge branch 'dev' into upgrade/bootstrap 2019-05-15 12:57:07 +12:00
Brenda Wallace
89ad44e5da Coloured button 2019-05-15 11:25:59 +12:00
Brenda Wallace
2ef7c7df19 tidy more crops#show 2019-05-15 11:25:39 +12:00
Brenda Wallace
0ee13c3320 Tidy up posts on crops#show 2019-05-15 09:32:27 +12:00
Brenda Wallace
569e2bb9a3 tidy up crops#show 2019-05-15 08:46:37 +12:00
Brenda Wallace
2165dc4e17 Tidy 2019-05-14 21:13:06 +12:00
Brenda Wallace
b5c88d8f33 set plant part in percy spec 2019-05-14 21:08:23 +12:00
Brenda Wallace
e9013a57dd more 2019-05-14 21:00:34 +12:00
Brenda Wallace
b7ac04fc45 Restory homepage text 2019-05-14 20:36:49 +12:00
Brenda Wallace
8db6d06283 Restoring colours 2019-05-14 20:36:20 +12:00
dependabot[bot]
e54b92e306 Bump rubocop from 0.68.1 to 0.69.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.1 to 0.69.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.68.1...v0.69.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 08:33:52 +00:00
dependabot[bot]
d25091eead Bump selenium-webdriver from 3.142.0 to 3.142.2 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.0 to 3.142.2.
- [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-14 08:17:26 +00:00
dependabot[bot]
ee6fee5299 Bump rubocop-rspec from 1.32.0 to 1.33.0 
Bumps [rubocop-rspec](https://github.com/rubocop-hq/rubocop-rspec) from 1.32.0 to 1.33.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rspec/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rspec/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rspec/compare/v1.32.0...v1.33.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-14 08:04:16 +00:00
dependabot[bot]
003df985af Bump capybara from 3.19.0 to 3.19.1 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.19.0 to 3.19.1.
- [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.19.0...3.19.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-13 10:06:41 +00:00
Brenda Wallace
e029425785 Lint 2019-05-13 07:58:05 +12:00
codefactor-io
69531f232d [CodeFactor] Apply fixes 2019-05-12 19:56:07 +00:00
Brenda Wallace
f47b22505c Comment out global actions until it is prettier 2019-05-13 07:53:08 +12:00
Brenda Wallace
ddaa4319ec Fix time freezer for percy specs 2019-05-13 07:52:52 +12:00
Brenda Wallace
f5d48d1b56 Removing bootstrap 3 - only bootstrap 4 
because both isn't particularly clever
 2019-05-13 07:52:38 +12:00
Brenda Wallace
4d513aaabd Merge branch 'dev' into upgrade/bootstrap 2019-05-11 07:58:57 +12:00
dependabot[bot]
5bae18ed6e Bump capybara from 3.18.0 to 3.19.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.18.0 to 3.19.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.18.0...3.19.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-10 07:42:15 +00:00
dependabot[bot]
9182846a93 Bump unicorn from 5.5.0 to 5.5.1 
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.5.0 to 5.5.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 18:49:37 +00:00
Brenda Wallace
76f7a8f5d0 Merge branch 'master' into dev 2019-05-06 22:20:31 +12:00
dependabot[bot]
b7d10b2660 Bump haml_lint from 0.29.0 to 0.30.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.29.0 to 0.30.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.29.0...v0.30.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-06 22:19:18 +12:00
dependabot[bot]
43c93bcd44 Bump selenium-webdriver from 3.141.0 to 3.142.0 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.141.0 to 3.142.0.
- [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-05 07:08:17 +12:00
dependabot[bot]
e7ade7605d Merge pull request #1948 from Growstuff/dependabot/bundler/haml_lint-0.29.0 2019-05-04 11:33:06 +00:00
dependabot[bot]
e2010d4900 Bump haml_lint from 0.28.0 to 0.29.0 
Bumps [haml_lint](https://github.com/sds/haml-lint) from 0.28.0 to 0.29.0.
- [Release notes](https://github.com/sds/haml-lint/releases)
- [Changelog](https://github.com/sds/haml-lint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sds/haml-lint/compare/v0.28.0...v0.29.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-03 07:39:06 +00:00
dependabot[bot]
2d3450f2a5 Bump newrelic_rpm from 6.2.0.354 to 6.3.0.355 
Bumps [newrelic_rpm](https://github.com/newrelic/rpm) from 6.2.0.354 to 6.3.0.355.
- [Release notes](https://github.com/newrelic/rpm/releases)
- [Changelog](https://github.com/newrelic/rpm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/newrelic/rpm/compare/6.2.0.354...6.3.0.355)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-01 21:41:42 +12:00
dependabot[bot]
3360977eb4 Bump rubocop from 0.68.0 to 0.68.1 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.68.0 to 0.68.1.
- [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.68.0...v0.68.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-01 20:45:11 +12:00
Awesome Code
82a35ac69b Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-04-30 11:30:34 +00:00
Brenda Wallace
8b6c3ef3fb Merge remote-tracking branch 'upstream/dev' into upgrade/bootstrap 
Conflicts:
	Gemfile.lock
 2019-04-30 19:51:09 +12:00
dependabot[bot]
b77422137f Bump rubocop from 0.67.2 to 0.68.0 
Bumps rubocop from 0.67.2 to 0.68.0.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-04-30 19:49:31 +12:00
Daniel O'Connor
7353ee111d Merge pull request #1944 from Growstuff/dependabot/bundler/paranoia-2.4.2 
Bump paranoia from 2.4.1 to 2.4.2
 2019-04-30 14:19:54 +09:30