mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-05 07:01:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,091 Commits 65 Branches 76 Tags
cc271b2cc35aede653ec113c593cd2c1bd7f9c8a
Commit Graph

7091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brenda Wallace
67239ec8b1 rubocop fixup 2019-07-02 04:52:39 +00:00
Brenda Wallace
fda4d88e5a Fix up locale spec 2019-07-02 04:52:39 +00:00
Brenda Wallace
b56771f9b7 specs for comments on profile pages 2019-07-02 04:52:39 +00:00
Brenda Wallace
4f59ef2e43 more profile page specs 2019-07-02 04:52:39 +00:00
Brenda Wallace
d37c4139a6 Fixes error displaying plantings with no planted_at date 2019-07-02 04:52:39 +00:00
Brenda Wallace
bf6cb5352d Test for displaying plantings on profile page 2019-07-02 04:52:39 +00:00
Brenda Wallace
97028bdf1d Refactoring member profile spec to use shared example 
so we can test the page both signed in and not signed in
 2019-07-02 04:52:39 +00:00
Brenda Wallace
ce60d6bb0c Remove stray \n in translation 2019-07-01 10:28:39 +00:00
dependabot-preview[bot]
0870342871 Bump capybara from 3.24.0 to 3.25.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.24.0 to 3.25.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.24.0...3.25.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-06-29 02:07:39 +00:00
Brenda Wallace
c4657f5972 Merge pull request #1942 from Br3nda/upgrade/bootstrap 
Upgrade to bootstrap 4
 2019-06-28 10:05:02 +12:00
Brenda Wallace
fec37368ae Remove pyenv 2019-06-28 09:53:23 +12:00
Brenda Wallace
8faa712e07 be_success -> be_successfull 
fixes a deprecation warning
 2019-06-27 22:26:15 +12:00
Brenda Wallace
b0a8288330 Merge branch 'dev' into upgrade/bootstrap 2019-06-27 22:18:06 +12:00
Brenda Wallace
6b7378c8f6 Merge branch 'master' into dev 2019-06-27 22:17:45 +12:00
Brenda Wallace
b65f2e858f update rubocop to match codeclimate settings 2019-06-27 22:14:48 +12:00
Brenda Wallace
fe7cb43c11 prettier links 2019-06-27 22:13:23 +12:00
Brenda Wallace
f1097e0f7c update photos spec 2019-06-27 22:13:09 +12:00
Brenda Wallace
66a0d8f2d0 only show info+pagination if there are results to show 2019-06-27 22:06:54 +12:00