mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-05 22:57:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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