mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-12 18:31:40 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,807 Commits 57 Branches 82 Tags
cf0485c4480ef6091b285ea36c1936bb783fbbca
Commit Graph

273 Commits

Author SHA1 Message Date
Brenda Wallace
0823e971ed Tidy up indexes and add links to data/api 2019-11-18 10:23:07 +13:00
Brenda Wallace
b2e90cddc6 Merge branch 'dev' into weeks 2019-10-25 13:41:30 +13:00
André Aubin
a3fa774d84 Force ssl on gravatar-ultimate gem 2019-10-24 23:51:52 +00:00
Brenda Wallace
2d6d02d0b3 added in_weeks helper 2019-10-24 21:03:30 +13:00
Brenda Wallace
1a0e30491f Removed unused methods 2019-10-24 19:04:37 +13:00
Brenda Wallace
38713af603 plantings timeline with icons 2019-10-24 16:36:16 +13:00
Brenda Wallace
b0c8b11246 📝 Inline editing and display tidy ups (#2200) 
* Inline editing and display tidy ups
 2019-10-08 11:06:53 +13:00
Brenda Wallace
7b5698f977 👩‍🌾 Import openfarm data (#2177) 
* Pull in openfarm icons, photos, info
* Truncating member location
* tidying up harvest display, and reducing duplication in css styles
* Tiny crop chip
* only show crop charts if there is data to show
* Make the styles more Growstuff
* Fixed links to openfarm
* Updating specs to cope with new photo sources
fix broken garden timeline on some pages
* Update homepage blurb
* Import crop companions
* More fluid page
* use thumbnail unless the source is flickr
* Messing with homepage
* Added crop growing_degree_days
* expect full size url on photos helper spec
* formatted dates from seeds#show
* tidy up places#show
* Move progress bar
* Quicker buttons for approve/reject crops
* Remove kaminari gem
* use crop cards on hierarchy page
* more crops on crops#index
* Wrap photo creation in transaction
* Wrap crop companions in a transaction
 2019-09-28 17:23:25 +12:00
Brenda Wallace
12c1002dc6 Removing unused notifications code 2019-08-08 09:31:53 +12:00
Brenda Wallace
ba1c3a7159 add the notifications helper back 2019-08-07 16:20:10 +12:00
Brenda Wallace
01b53a0e69 continuing to replace notifications with conversations 2019-07-23 09:37:57 +12:00
Brenda Wallace
af0d84d9f1 Updating likes js code 2019-07-12 09:28:45 +12:00
Brenda Wallace
3e4a9f0292 Ebay link using https 2019-07-10 09:03:05 +00:00
Brenda Wallace
ec974cdfee Merge branch 'dev' into following-page 2019-07-09 00:31:32 +12:00
Brenda Wallace
6ad694cf30 Tidy up member edit 2019-07-08 21:56:37 +12:00
Brenda Wallace
253c0cb939 Merge branch 'dev' into following-page 2019-07-08 16:44:03 +12:00
Brenda Wallace
f7af2bf816 Higher res photo placeholder 2019-07-08 04:43:03 +00: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
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
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
528e4c2c85 button to get to timeline 2019-07-07 22:08:42 +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
Brenda Wallace
b176ba59dc removed byline method 
avoiding use of htmlseafe
 2019-06-26 11:21:40 +12:00
Brenda Wallace
06ae5ecd6f DRY buttons 2019-06-26 09:12:39 +12:00
Brenda Wallace
3f24fbe181 rubocop linting 2019-06-24 18:38:28 +12:00
Brenda Wallace
fcf4e0f15d Icons from icon8, used with permission 2019-06-17 10:42:47 +12:00
Brenda Wallace
44fbae6776 Use comments for blog icon 
So it doesn't look like an edit button
 2019-06-14 21:30:04 +12:00
Brenda Wallace
f98c33e688 wrap long line 2019-06-14 16:38:20 +12:00
Brenda Wallace
bd6533ccc3 Revert "Revert "DRY the photos helper"" 
This reverts commit 7f7f2cae47.
 2019-06-14 12:01:33 +12:00
Brenda Wallace
7f7f2cae47 Revert "DRY the photos helper" 
This reverts commit 798fff43cf.
 2019-06-14 11:52:10 +12:00
Brenda Wallace
798fff43cf DRY the photos helper 2019-06-14 11:20:06 +12:00
Brenda Wallace
c0b2a8431b Reinstate likes 2019-06-14 11:01:16 +12:00
Brenda Wallace
f8e9cd8fbf Tidy up photo associations on photos#show 2019-06-14 10:11:55 +12:00
Brenda Wallace
92ae1a7bd2 Merge branch 'dev' into upgrade/bootstrap 2019-06-13 20:52:25 +12:00
Daniel O'Connor
949c57bf7d Line length 2019-06-13 07:58:52 +00:00
Brenda Wallace
0d02f5758b actions menu for harvests 2019-06-09 15:53:01 +12:00
Brenda Wallace
8d3e080afb classes for gardens button 2019-06-08 15:38:39 +12:00
Brenda Wallace
9b62d4609b added back the plantings quick actions menu 2019-06-08 10:29:17 +12:00
Brenda Wallace
49069f4c4a seeds button helper, for actions links 2019-06-07 20:36:14 +12:00
Brenda Wallace
16f9f4c66e plantings actions as dropdown menu 2019-06-04 20:02:02 +12:00
Brenda Wallace
f94199676c fullsize garden images 2019-06-03 22:23:49 +12:00
Brenda Wallace
a18f0f4d38 rubocop lint 2019-05-24 20:15:01 +12:00
Brenda Wallace
3559780fb4 Plant something button 2019-05-21 13:37:43 +12:00
codefactor-io
0d9d7efbe7 [CodeFactor] Apply fixes 2019-05-19 08:35:36 +00:00