mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-19 06:15:44 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,088 Commits 61 Branches 82 Tags
3ed173ebcd48450212fb41128914ecc4e4e798d6
Commit Graph

6088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
3ed173ebcd Material design changes 2019-02-17 21:33:36 +13:00
Brenda Wallace
3967e68038 More info on a crop's varieties, and parent 2019-02-15 09:13:08 +13:00
Brenda Wallace
cc218c367c Merge remote-tracking branch 'origin/photos/seeds' into photos/seeds 2019-02-15 08:48:51 +13:00
Brenda Wallace
1441850cd6 Merge branch 'dev' into photos/seeds 2019-02-13 13:59:14 +13:00
Brenda Wallace
c840b1bb16 Merge pull request #1829 from Br3nda/crops-show 
Crops show
 2019-02-13 09:26:21 +13:00
Brenda Wallace
3722672869 Merge branch 'dev' into photos/seeds 2019-02-13 09:06:42 +13:00
Brenda Wallace
fa00262f80 Merge branch 'dev' into crops-show 2019-02-13 09:04:51 +13:00
dependabot[bot]
c0dd3534d3 Merge pull request #1843 from Growstuff/dependabot/bundler/faker-1.9.2 2019-02-12 11:35:32 +00:00
dependabot[bot]
d0e46363b6 Bump faker from 1.9.1 to 1.9.2 
Bumps [faker](https://github.com/stympy/faker) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.9.1...v1.9.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-12 11:04:47 +00:00
dependabot[bot]
77f7c424d8 Merge pull request #1800 from Growstuff/dependabot/bundler/rspec-rails-3.8.2 2019-02-12 11:01:58 +00:00
dependabot[bot]
1d96b11c79 Bump rspec-rails from 3.8.1 to 3.8.2 
Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases)
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md)
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-12 10:42:40 +00:00
dependabot[bot]
9fe660ab46 Merge pull request #1841 from Growstuff/dependabot/bundler/rubocop-0.64.0 2019-02-12 10:40:04 +00:00
dependabot[bot]
e9c2454799 Bump rubocop from 0.61.1 to 0.64.0 
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.1 to 0.64.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.61.1...v0.64.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-12 10:22:19 +00:00
Cesy
f1eeeb6d6a Merge pull request #1804 from Br3nda/garden-overview 
Tidy up display on gardens#index
 2019-02-12 10:19:19 +00:00
Brenda Wallace
bd86f7372e Merge branch 'dev' into garden-overview 2019-02-12 21:50:51 +13:00
Brenda Wallace
f57a423c29 Merge branch 'dev' into crops-show 2019-02-12 21:50:05 +13:00
Brenda Wallace
5930334bd6 Merge branch 'dev' into photos/seeds 2019-02-12 21:49:43 +13:00
ImgBotApp
94403ab5a6 [ImgBot] Optimize images 
*Total -- 299.13kb -> 245.06kb (18.08%)

/app/assets/images/sunniness_shade.png -- 9.28kb -> 4.27kb (53.98%)
/app/assets/images/blog_32.png -- 5.04kb -> 2.45kb (51.35%)
/app/assets/images/sunniness_semi-shade.png -- 14.52kb -> 7.43kb (48.84%)
/app/assets/images/sunniness_not specified.png -- 15.76kb -> 8.17kb (48.16%)
/app/assets/images/sunniness_sun.png -- 5.77kb -> 3.59kb (37.69%)
/app/assets/images/placeholder_150.png -- 2.44kb -> 1.52kb (37.62%)
/app/assets/images/growstuff-brand.png -- 8.05kb -> 6.45kb (19.94%)
/app/assets/images/flickr_32.png -- 2.47kb -> 2.04kb (17.37%)
/app/assets/images/location-not-set.en.png -- 22.23kb -> 19.55kb (12.04%)
/app/assets/images/facebook-login-splash.png -- 176.17kb -> 155.21kb (11.9%)
/app/assets/images/email_32.png -- 1.07kb -> 0.94kb (11.55%)
/app/assets/images/facebook-thumbnail.png -- 19.48kb -> 17.48kb (10.26%)
/app/assets/images/growstuff-apple-touch-icon-precomposed.png -- 10.37kb -> 9.48kb (8.62%)
/app/assets/images/rails.png -- 6.49kb -> 6.47kb (0.33%)
 2019-02-12 21:49:11 +13:00
dependabot[bot]
f37a3669b1 Bump devise from 4.6.0 to 4.6.1 
Bumps [devise](https://github.com/plataformatec/devise) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.6.0...v4.6.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-12 21:30:47 +13:00
Brenda Wallace
c298a1763f Merge branch 'dev' into photos/seeds 2019-02-12 16:21:51 +13:00
Brenda Wallace
80f0f41026 removed commented out code 2019-02-12 11:51:16 +13:00
Brenda Wallace
56168576f1 Merge branch 'dev' into garden-overview 2019-02-12 11:49:29 +13:00
Brenda Wallace
73234a1dc3 Merge remote-tracking branch 'origin/crops-show' into crops-show 2019-02-12 11:42:08 +13:00
Brenda Wallace
1dfad812a1 Javascript lint 2019-02-12 11:41:40 +13:00
Brenda Wallace
7a4121bf3f Added missing semicolon 2019-02-12 11:41:33 +13:00
Brenda Wallace
aa21b000d7 Merge branch 'dev' into crops-show 2019-02-12 11:38:41 +13:00
dependabot[bot]
c8b18cd9b2 Merge pull request #1809 from Growstuff/dependabot/bundler/capybara-3.13.2 2019-02-11 22:31:15 +00:00
Brenda Wallace
2f5de1f98e Merge branch 'dev' into garden-overview 2019-02-12 11:28:45 +13:00
dependabot[bot]
0a1206b692 Bump capybara from 3.13.0 to 3.13.2 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.13.0 to 3.13.2.
- [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.13.0...3.13.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-11 10:45:16 +00:00
pozorvlak
378dd52b1f Merge pull request #1818 from Br3nda/contributors-bots 
Fixes checking for github bots in contributors
 2019-02-11 10:38:47 +00:00
pozorvlak
f83b8e71f1 Merge branch 'dev' into contributors-bots 2019-02-11 10:17:09 +00:00
Awesome Code
3efc0caaf7 Auto corrected by following Lint Ruby EmptyLine 2019-02-11 11:02:33 +13:00
Awesome Code
689baa85a3 Auto corrected by following Lint Ruby RSpec/ExampleWording 2019-02-11 10:17:54 +13:00
Awesome Code
29ee362bfa Auto corrected by following Lint Ruby Space 2019-02-11 09:28:43 +13:00
Awesome Code
490db7b342 Auto corrected by following Lint Ruby RSpec/HookArgument 2019-02-11 09:00:34 +13:00
Brenda Wallace
463e0d919c Merge branch 'dev' into crops-show 2019-02-11 08:17:44 +13:00
Brenda Wallace
a320826abd Merge pull request #1834 from Growstuff/awesomecode-lint-ruby-rspec-returnfromstub-28915 
Auto corrected by following Lint Ruby RSpec/ReturnFromStub
 2019-02-11 08:02:53 +13:00
Brenda Wallace
db58abc520 Merge branch 'dev' into awesomecode-lint-ruby-rspec-returnfromstub-28915 2019-02-11 07:37:21 +13:00
Brenda Wallace
37b1c17ca9 Merge pull request #1835 from Growstuff/awesomecode-lint-ruby-rspec-sharedcontext-28915 
Auto corrected by following Lint Ruby RSpec/SharedContext
 2019-02-11 07:36:55 +13:00
Brenda Wallace
380b0ffa6c Merge branch 'dev' into awesomecode-lint-ruby-rspec-sharedcontext-28915 2019-02-11 00:24:20 +13:00
Brenda Wallace
4be359c2b9 Merge branch 'dev' into crops-show 2019-02-10 22:24:40 +13:00
Awesome Code
bbd34c5e7b Auto corrected by following Lint Ruby RSpec/SharedContext 2019-02-10 09:24:19 +00:00
Awesome Code
54798190a7 Auto corrected by following Lint Ruby RSpec/ReturnFromStub 2019-02-10 09:24:07 +00:00
Awesome Code
49eed9b208 Auto corrected by following Lint Ruby RSpec/LetBeforeExamples 2019-02-10 09:24:00 +00:00
Awesome Code
e32a8bd6ac Auto corrected by following Lint Ruby RSpec/HooksBeforeExamples 2019-02-10 09:23:43 +00:00
Brenda Wallace
0507f337aa Merge branch 'dev' into crops-show 2019-02-10 21:52:51 +13:00
Brenda Wallace
fb6a270fa6 Tidy up crop predictions display 2019-02-10 21:51:06 +13:00
Brenda Wallace
e9d81f7f32 Merge branch 'dev' into garden-overview 2019-02-09 19:13:46 +13:00
Brenda Wallace
29da3f7ff1 Merge branch 'dev' into contributors-bots 2019-02-09 19:13:26 +13:00
Brenda Wallace
3f68131ed1 Merge pull request #1820 from Growstuff/dependabot/bundler/devise-4.6.0 
Bump devise from 4.5.0 to 4.6.0
 2019-02-09 19:13:05 +13:00