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
6,854 Commits 55 Branches 77 Tags
58ffcb281f9c2fc6ccb24fa2bb8366d6a64aed72
Commit Graph

6854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brenda Wallace
58ffcb281f Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-14 16:06:44 +12:00
Brenda Wallace
19eae7d259 crop search form on white background 
for readability
 2019-06-14 16:06:32 +12:00
Daniel O'Connor
28f68717f5 Address code climate concerns by extracting query methods 2019-06-14 13:36:20 +09:30
Brenda Wallace
d7b973e684 Add harvest predictions to homepage blurb 2019-06-14 15:58:27 +12:00
Brenda Wallace
465c7c7b6d Move crop form error messages to alert 2019-06-14 15:54:04 +12:00
Brenda Wallace
6c23302435 Fix duplicate labels on crop form 2019-06-14 15:52:05 +12:00
Brenda Wallace
feb11811a5 badges were overlapping the menu 2019-06-14 15:35:22 +12:00
Brenda Wallace
f2e87c9863 elipsis when photo title is too long 2019-06-14 15:31:16 +12:00
Brenda Wallace
6d18400a8b turn off all link hover underlines 2019-06-14 15:22:53 +12:00
Brenda Wallace
c5988ded4e tidy up badges and progress bar 2019-06-14 15:21:06 +12:00
Brenda Wallace
533c9aefdb push the link to bottom of member cards 2019-06-14 15:14:22 +12:00
Brenda Wallace
5ec29b40d0 tidy up sci name action menu 2019-06-14 15:08:01 +12:00
Brenda Wallace
ab3f65742f better hover on members avatar 2019-06-14 15:07:44 +12:00
Brenda Wallace
62302b3fd7 Fix round display of member avatars 2019-06-14 15:06:55 +12:00
Brenda Wallace
3863c0e0e8 These colours returned 2019-06-14 15:06:39 +12:00
Brenda Wallace
35fa2122b8 padding on thumbnail photos 2019-06-14 12:20:55 +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
0af9fe0e4c Updated a wierd spec on crop.photos.size that looked wrong 2019-06-14 12:00:41 +12:00
Brenda Wallace
7f7f2cae47 Revert "DRY the photos helper" 
This reverts commit 798fff43cf.
 2019-06-14 11:52:10 +12:00
Brenda Wallace
2949abd6bf SEt subject of post in spec, so it matches the tests 2019-06-14 11:47:15 +12:00
Brenda Wallace
58e28b9311 nicer link to member gardens 2019-06-14 11:45:55 +12:00
Brenda Wallace
e0b9acc27d Tidier link to member posts 2019-06-14 11:27:43 +12:00
Brenda Wallace
6086a1aaa5 strip tags on subjects 2019-06-14 11:26:29 +12:00
Brenda Wallace
bd8ab9365d padding on member icon 2019-06-14 11:26:11 +12:00
Brenda Wallace
def468827c Update helper spec 2019-06-14 11:21:23 +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
22e7a85388 inline search form on crops#search 2019-06-14 10:54:30 +12:00
Brenda Wallace
6e9207c2ed Fix tabulation error in haml 2019-06-14 10:13:02 +12:00
Brenda Wallace
f8e9cd8fbf Tidy up photo associations on photos#show 2019-06-14 10:11:55 +12:00
Brenda Wallace
9a5ebc5260 rename photos/photo_associations to photos/associations 2019-06-14 10:06:48 +12:00
Brenda Wallace
4cedc6e262 Action menus for photos#show 2019-06-14 10:03:51 +12:00
Brenda Wallace
729254ac24 added href to link so capybara finds it 2019-06-14 10:00:28 +12:00
Brenda Wallace
c0c1b1df70 Tidy up on photos#new 2019-06-14 09:56:12 +12:00
Brenda Wallace
6db1c7b327 Merge remote-tracking branch 'refs/remotes/origin/upgrade/bootstrap' 
Conflicts:
	spec/features/harvests/harvesting_a_crop_spec.rb
 2019-06-13 23:06:51 +12:00
Brenda Wallace
52edaae43b update harvest spec to find edit behind actions menu 2019-06-13 23:05:59 +12:00
Brenda Wallace
6f036271c5 update harvest spec to find edit behind actions menu 2019-06-13 23:05:02 +12:00
Brenda Wallace
a25955714d class on member link, so spec finds it 2019-06-13 23:04:06 +12:00
Brenda Wallace
fbef77b5d0 Fix members list spec, and DRY 2019-06-13 23:00:54 +12:00
Brenda Wallace
8e986ff2c3 consistent use of card-link on crops#show 2019-06-13 22:31:53 +12:00
Brenda Wallace
37e87d3744 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-13 21:45:48 +12:00
Brenda Wallace
e801a1d7c6 Removing unused views 2019-06-13 21:06:10 +12:00
Brenda Wallace
82661c577c Removing comments views 2019-06-13 21:05:29 +12:00
Brenda Wallace
92ae1a7bd2 Merge branch 'dev' into upgrade/bootstrap 2019-06-13 20:52:25 +12:00
Brenda Wallace
d551a99da6 set text in post body to find in post rss spec 2019-06-13 20:51:27 +12:00
Brenda Wallace
220db5d28c Merge branch 'master' into dev 2019-06-13 20:36:24 +12:00
Brenda Wallace
10475cb711 Matching labels on seeds form to specs 2019-06-13 20:32:00 +12:00
Brenda Wallace
6825f8810f tidy up seeds form 2019-06-13 20:01:21 +12:00
Daniel O'Connor
949c57bf7d Line length 2019-06-13 07:58:52 +00:00
Daniel O'Connor
a1cdc2ee93 Passing rubocop 2019-06-13 07:58:52 +00:00