mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-31 21:23:17 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,109 Commits 55 Branches 76 Tags
036010bb39b4cc215eeae397af3c829f0bbfc8a2
Commit Graph

7109 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot-preview[bot]
036010bb39 Bump coveralls from 0.7.1 to 0.8.19 
Bumps [coveralls](https://coveralls.io) from 0.7.1 to 0.8.19.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 10:16:42 +00:00
dependabot-preview[bot]
d09ac4b6d7 Bump rubocop-rails from 2.1.0 to 2.2.0 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.1.0...v2.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 09:38:32 +00:00
Brenda Wallace
3b9aee3f67 Merge pull request #2041 from Br3nda/post-photos 
Adding photos directly to a post
 2019-07-08 20:02:29 +12:00
Brenda Wallace
4845211429 Merge branch 'dev' into post-photos 2019-07-08 17:07:45 +12:00
Brenda Wallace
72cf7365a2 Merge branch 'master' into dev 2019-07-08 17:07:19 +12:00
Brenda Wallace
bda0712234 Merge pull request #2047 from Growstuff/imgbot 
[ImgBot] Optimize images
 2019-07-08 17:06:42 +12:00
Brenda Wallace
680111add7 Merge branch 'dev' into post-photos 2019-07-08 17:06:04 +12:00
ImgBotApp
770c6f45fd [ImgBot] Optimize images 
/app/assets/images/placeholder_600.png -- 31.66kb -> 29.12kb (8.03%)
 2019-07-08 04:43:51 +00:00
Brenda Wallace
e7cfe0b5c4 Update spec to look for placeholder_600 2019-07-08 04:43:03 +00:00
Brenda Wallace
6d7b990797 Remove unused rails.png 2019-07-08 04:43:03 +00:00
Brenda Wallace
f7af2bf816 Higher res photo placeholder 2019-07-08 04:43:03 +00:00
Daniel O'Connor
cf0d648b31 Merge branch 'dev' into post-photos 2019-07-08 13:45:26 +09:30
Daniel O'Connor
76c18014e2 Merge pull request #2042 from Br3nda/active-gardens 
only show active gardens on planting form
 2019-07-08 13:40:08 +09:30
Brenda Wallace
0a030c56bb files should end with a new line 2019-07-08 04:08:58 +00:00
Brenda Wallace
bbd43f57bc Prevent post images going off screen 2019-07-08 04:08:58 +00:00
Brenda Wallace
9c25fd043f only show active gardens on planting form 2019-07-08 13:24:27 +12:00
Brenda Wallace
5cef4d728c Adding photos directly to a post 2019-07-08 13:20:57 +12:00
Brenda Wallace
d40c985d49 Merge pull request #2006 from Growstuff/dev 
Release 55
 2019-07-07 08:38:57 +12:00
Brenda Wallace
cc271b2cc3 Back out the max homepage items change 2019-07-06 11:16:21 +00:00
Brenda Wallace
eda77365a5 truncate long locations 2019-07-06 11:16:21 +00:00
Brenda Wallace
8528f80678 Layout fix up on hompage for large screens 2019-07-06 11:16:21 +00:00
Miles Gould
ba1512a85a Delete duplicate percentage_grown attribute 
Fixes #2031
 2019-07-05 10:49:29 +00:00
dependabot-preview[bot]
b483c47258 Bump faker from 1.9.4 to 1.9.5 
Bumps [faker](https://github.com/stympy/faker) from 1.9.4 to 1.9.5.
- [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/1.9.4...v.1.9.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-05 07:33:07 +00:00
Brenda Wallace
77f309c083 Merge pull request #2017 from Br3nda/upgrade/bootstrap-43 
Upgrade boostrap gem
 2019-07-05 10:18:33 +12:00
Brenda Wallace
cdc3be0414 Merge branch 'dev' into upgrade/bootstrap-43 2019-07-05 10:05:44 +12:00
Brenda Wallace
136aff87ac Removign empty class in scss 2019-07-04 10:36:25 +00:00
Brenda Wallace
826c8845a2 Removing commented out cruft 2019-07-04 10:36:25 +00:00
Brenda Wallace
a880aae748 Merge branch 'dev' into upgrade/bootstrap-43 2019-07-04 08:07:29 +12:00
Brenda Wallace
5cb220caeb Merge pull request #2025 from Growstuff/dependabot/npm_and_yarn/js-yaml-3.13.1 
Bump js-yaml from 3.12.1 to 3.13.1
 2019-07-04 07:27:10 +12:00
dependabot[bot]
0fa6fa9e5a Bump js-yaml from 3.12.1 to 3.13.1 
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.1 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.1...3.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-07-03 10:51:41 +00:00
Brenda Wallace
904e30c9dd Merge branch 'dev' into upgrade/bootstrap-43 2019-07-03 22:47:20 +12:00
Brenda Wallace
d53393b0ca Fix downcase 2019-07-03 09:39:32 +00:00
Brenda Wallace
ea18c722ef lower caseon pluralizing 2019-07-03 09:39:32 +00:00
Brenda Wallace
ac91450827 Fixes count on members'cards 2019-07-03 09:39:32 +00:00
dependabot-preview[bot]
b0a47f1319 Bump webdrivers from 4.0.1 to 4.1.0 
Bumps [webdrivers](https://github.com/titusfortner/webdrivers) from 4.0.1 to 4.1.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases)
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md)
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.0.1...v4.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-03 08:28:06 +00:00
Brenda Wallace
bd1f8e1e05 Merge branch 'upgrade/bootstrap-43' of github.com:br3nda/growstuff into upgrade/bootstrap-43 2019-07-03 12:04:23 +12:00
Brenda Wallace
52b6ab3931 Output and stop on error 2019-07-03 12:04:13 +12:00
Brenda Wallace
8b22004066 Merge branch 'dev' into upgrade/bootstrap-43 2019-07-03 09:58:04 +12:00
Miles Gould
a18ff03599 Fix remaining uses of devise_error_messages! 2019-07-02 21:57:43 +00:00
Brenda Wallace
9e1415dedd fixes flex/wrap on home page members 2019-07-03 08:54:08 +12:00
Brenda Wallace
4495d03899 Move percy specs to static check run 2019-07-03 08:48:35 +12:00
Brenda Wallace
cc7ebf086f Merge remote-tracking branch 'origin/upgrade/bootstrap-43' into upgrade/bootstrap-43 2019-07-03 08:41:34 +12:00
Brenda Wallace
50945c6f75 Files should end with a trailing newline 2019-07-03 08:41:23 +12:00
Brenda Wallace
c791b21c47 Merge branch 'dev' into upgrade/bootstrap-43 2019-07-03 08:41:01 +12:00
Brenda Wallace
8c02ea943a Tidy up photo display (line up) 2019-07-03 08:25:23 +12:00
Brenda Wallace
b90f6d5ff6 Tidy up facts on plantings#show 2019-07-03 08:20:58 +12:00
Brenda Wallace
036fea1c03 Fix scss compile error, by using our own variable 2019-07-03 08:16:46 +12:00
Brenda Wallace
13450f64ed Squish a devise deprecation warning 2019-07-02 09:41:40 +00:00
Brenda Wallace
ad888575a5 Upgrade boostrap gem 2019-07-02 16:55:15 +12:00
Brenda Wallace
5ad298e43a TYPO! 2019-07-02 04:52:39 +00:00