mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-04-15 12:30:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,174 Commits 55 Branches 77 Tags
ac3679fa18b4c90dedfd08eb447458bb10fa3f0d
Commit Graph

7174 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
ac3679fa18 Remove duplicate and empty css definitions 2019-07-10 11:37:41 +12:00
Brenda Wallace
0a07442317 Remove badge override 2019-07-10 11:36:03 +12:00
Brenda Wallace
97246b8632 Merge pull request #2066 from Growstuff/imgbot 
[ImgBot] Optimize images
 2019-07-09 23:59:25 +12:00
ImgBotApp
cf787cd278 [ImgBot] Optimize images 
/app/assets/images/open_service.png -- 1.08kb -> 0.40kb (63.12%)
 2019-07-09 10:38:04 +00:00
Brenda Wallace
69c9754664 Merge pull request #2064 from Br3nda/fix-1989 
Fix 1989
 2019-07-09 22:21:55 +12:00
Brenda Wallace
b1c6560a8f Merge branch 'dev' into fix-1989 2019-07-09 22:10:30 +12:00
Brenda Wallace
87558982b1 Merge branch 'map-fix' into dev 2019-07-09 14:15:04 +12:00
Brenda Wallace
fb4ed1f637 Merge branch 'fix/2011' into dev 2019-07-09 14:14:42 +12:00
Brenda Wallace
35fe92a7db Merge branch 'fix-inbox-menu' into dev 2019-07-09 14:14:31 +12:00
Brenda Wallace
3e89ca95ed Merge branch 'dev' into fix-1989 2019-07-09 13:18:02 +12:00
Brenda Wallace
38ebbd0adb Make headers consistent 
fixes #2011
 2019-07-09 01:00:19 +00:00
Brenda Wallace
7b87f8e4db Add flash messages to controllers 2019-07-09 09:19:27 +12:00
Brenda Wallace
68bc237dd9 Wrap for readbility 2019-07-09 09:12:52 +12:00
Brenda Wallace
f127dd18ba fix display of inbox item in menu 
fixes #2046
 2019-07-09 09:11:49 +12:00
Brenda Wallace
fa8cc5a499 Expect https in footer spec 2019-07-09 08:04:32 +12:00
Brenda Wallace
827e871a22 Merge branch 'dev' into fix-1989 2019-07-09 01:12:47 +12:00
Brenda Wallace
465a07c377 Merge pull request #2038 from Br3nda/following-page 
Show activity from people i follow
 2019-07-09 01:11:38 +12:00
Brenda Wallace
ec974cdfee Merge branch 'dev' into following-page 2019-07-09 00:31:32 +12:00
Brenda Wallace
833f46eea8 Merge branch 'dev' into fix-1989 2019-07-09 00:30:12 +12:00
Brenda Wallace
4f0fca3634 Merge pull request #2054 from Br3nda/tidy-member-edit 
Tidy up member edit
 2019-07-09 00:29:31 +12:00
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 Wallace
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
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
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
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
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