mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-07 05:32:49 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 108 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
13034 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace 3d9791cb96 update spec, now that resolve_model has moved 2019-07-08 10:10:01 +12:00
Brenda Wallace e080407deb update spec to not have links to plantings with not dates 2019-07-08 10:08:26 +12:00
Brenda Wallace 5c6e65cd01 remove quotes in haml 2019-07-08 10:05:53 +12:00
Brenda Wallace 013b388beb remove quotes in haml 2019-07-08 10:05:36 +12:00
Brenda Wallace 07945e9f69 remove quotes in haml 2019-07-08 10:05:13 +12:00
Brenda Wallace e6a60e93c9 remove quotes in haml 2019-07-08 10:04:56 +12:00
Brenda Wallace 3859122fa5 tidy 2019-07-08 10:04:08 +12:00
Brenda Wallace c61f13625c Moved html into haml instead of html_safe in helper 2019-07-08 09:52:33 +12:00
Brenda Wallace 1c50d9e50d rename blog_icon to post_icon 2019-07-08 09:42:06 +12:00
Brenda Wallace b1edf8542e Removed slug from query 2019-07-08 09:40:21 +12:00
Brenda Wallace 81723d99d9 make comment icon match other icons 2019-07-08 09:36:47 +12:00
Brenda Wallace b1fdb5242a simplifying resolving models 2019-07-08 09:34:48 +12:00
Brenda Wallace e26c6d52a4 Further DRYing 2019-07-08 09:31:50 +12:00
Brenda Wallace 933c78b4e5 DRY members#show view 2019-07-08 09:19:44 +12:00
Brenda Wallace 7a4312f41e Dry up timeline code 2019-07-08 09:19:26 +12:00
Brenda Wallace 03dfcdcc57 rubocop lint fix ups 2019-07-08 09:04:58 +12:00
Brenda Wallace fe81923ae1 DRY timeline view 2019-07-08 09:04:19 +12:00
Brenda Wallace ca281b84cb Merge remote-tracking branch 'upstream/dev' into following-page 2019-07-07 22:09:39 +12:00
Brenda Wallace 528e4c2c85 button to get to timeline 2019-07-07 22:08:42 +12:00
Brenda Wallace 050dfda77e Timeline 2019-07-07 22:03:15 +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
Brenda Wallace 7266f6b590 include some interesting members in percy spec 
so they show on the home page
 2019-07-06 12:08:34 +12:00
Brenda Wallace f8aff32168 Back out the max homepage items change 2019-07-06 11:04:10 +12:00
Brenda Wallace 1281f78d40 truncate long locations 2019-07-06 11:04:10 +12:00
Brenda Wallace 997a30d1bc Layout fix up on hompage for large screens 2019-07-06 11:04:10 +12: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 5e7445f770 Merge branch 'dev' into UTFGardenNames 2019-07-04 10:56:46 +12: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