mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-19 14:26:14 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,128 Commits 60 Branches 82 Tags
253c0cb93982a1b95fbf00a409998083a99cdc5b
Commit Graph

7128 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
253c0cb939 Merge branch 'dev' into following-page 2019-07-08 16:44:03 +12: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
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
4acf165f24 specs for event_helper 2019-07-08 12:44:26 +12:00
Brenda Wallace
acad29dab0 Feature spec for timeline/activity page 2019-07-08 12:26:11 +12:00
Brenda Wallace
1427441163 No link to the planting with no date 2019-07-08 11:49:13 +12:00
Brenda Wallace
7054787870 fix up members#show spec 2019-07-08 11:04:23 +12:00
Brenda Wallace
029beab1dd timeline service specs 2019-07-08 10:39:46 +12:00
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
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
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