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 7749b2daaf Merge branch 'dev' into fix-1989 2019-07-09 00:29:07 +12:00
Brenda Wallace 4ea9e17e09 Merge branch 'dev' into tidy-member-edit 2019-07-08 23:32:18 +12:00
Brenda Wallaceandpozorvlak 43ba345f4d Update app/views/devise/registrations/_edit_apps.html.haml 
Co-Authored-By: pozorvlak <miles@assyrian.org.uk>
 2019-07-08 23:32:02 +12:00
dependabot-preview[bot] 17708a8122 Bump faker from 1.9.5 to 1.9.6 
Bumps [faker](https://github.com/stympy/faker) from 1.9.5 to 1.9.6.
- [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/v.1.9.5...1.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-08 10:57:02 +00:00
Brenda Wallace 9f9bf5012a Make headers consistent 
fixes #2011
 2019-07-08 22:27:33 +12:00
Brenda Wallace 46a7e3fb42 Merge branch 'dev' into fix-1989 2019-07-08 22:21:54 +12:00
Brenda Wallace bd9a6f7620 Merge branch 'dev' into likeable-photos 2019-07-08 22:20:41 +12:00
Brenda Wallace 4f43f2e998 Merge branch 'dev' into following-page 2019-07-08 22:20:26 +12:00
Brenda Wallace d23a94c691 Move open service badge into asset pipeline 2019-07-08 22:19:16 +12:00
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
Brenda Wallace 80a1066efe Added alt tag 2019-07-08 22:15:53 +12:00
Brenda Wallace bdbb44e4a3 fix mix content warnings 
closes #2043
 2019-07-08 22:14:58 +12:00
Brenda Wallace 2c7183c097 Merge branch 'dev' into likeable-photos 2019-07-08 22:04:02 +12:00
Brenda Wallace 6ad694cf30 Tidy up member edit 2019-07-08 21:56:37 +12: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 def17e020e New line at end of file 2019-07-08 21:28:39 +12:00
Brenda Wallace 05ed9de8b6 Add leaflet initializer 2019-07-08 20:51:14 +12:00
codefactor-io 5d07a30d17 [CodeFactor] Apply fixes 2019-07-08 08:16:24 +00:00
Brenda Wallace dd6446b195 fix icon method name 2019-07-08 20:13:21 +12:00
Brenda Wallace e40a2c3176 remove debugger 2019-07-08 20:12:42 +12:00
Brenda Wallace cfab855a0f revert adding id 2019-07-08 20:06:48 +12:00
Brenda Wallace f1df90f189 Remove debugger 2019-07-08 20:05:48 +12:00
Brenda Wallace bff31ddb5c Removed extra blank lines 2019-07-08 20:04:27 +12:00
Brenda Wallace 6fc9a858a9 Merge branch 'dev' into likeable-photos 2019-07-08 20:03:41 +12:00
Brenda Wallace f638d0c2d3 rubocop lint 2019-07-08 20:03:27 +12:00
Brenda Wallace 61047df429 Merge branch 'dev' into following-page 2019-07-08 20:02:47 +12: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 a66add6568 Merge branch 'dev' into likeable-photos 2019-07-08 20:02:09 +12:00
Brenda Wallace cbed8cc259 likes for photos 2019-07-08 20:00:55 +12:00
Brenda Wallace 8baf8757ca Merge branch 'dev' into following-page 2019-07-08 17:07:55 +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
Brenda Wallace 253c0cb939 Merge branch 'dev' into following-page 2019-07-08 16:44:03 +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 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