mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-06 23:27:28 -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
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
Brenda Wallace
572af9d135 Merge branch 'dev' into photos/seeds 2019-02-09 17:00:58 +13:00
Brenda Wallace
9be4bf2685 Merge branch 'dev' into garden-overview 2019-02-09 17:00:07 +13:00
Brenda Wallace
68d9b9c50c Merge branch 'dev' into contributors-bots 2019-02-09 16:59:45 +13:00
Awesome Code
284bb81bbf Auto corrected by following Lint Ruby RSpecEmptyLine 2019-02-09 03:05:40 +00:00
Brenda Wallace
93835b3ee6 Javascript lint 2019-02-09 15:21:30 +13:00
Brenda Wallace
67b23d8e2c Merge branch 'dev' into garden-overview 2019-02-09 15:17:09 +13:00
Brenda Wallace
63b8554435 Added missing semicolon 2019-02-09 15:16:53 +13:00
dependabot[bot]
228253113f Bump devise from 4.5.0 to 4.6.0 
Bumps [devise](https://github.com/plataformatec/devise) from 4.5.0 to 4.6.0.
- [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.5.0...v4.6.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-09 01:28:51 +00:00
Brenda Wallace
6902f30bb8 Merge branch 'dev' into contributors-bots 2019-02-09 14:26:53 +13:00
Brenda Wallace
ac577486e1 Merge branch 'master' into dev 2019-02-09 14:26:26 +13:00
Brenda Wallace
6e1972717f Merge pull request #1826 from Growstuff/awesomecode-lint-ruby-emptyline-28892 
Auto corrected by following Lint Ruby EmptyLine
 2019-02-09 14:26:11 +13:00
Brenda Wallace
18d7ae2953 Further tidy up of the planting quick action buttons 2019-02-09 14:24:51 +13:00
Brenda Wallace
95db0f7297 Shortened the text on the badges 2019-02-09 14:18:15 +13:00
Brenda Wallace
ec4b443d8c Tool tips 2019-02-09 14:13:07 +13:00
Brenda Wallace
50751611fa Tidy up where badges appear 2019-02-09 14:12:45 +13:00
Brenda Wallace
fc95a3c4e1 Moved planting css to own file 2019-02-09 14:12:30 +13:00