mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-06 07:07:33 -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
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
Daniel O'Connor
7bfb2061e1 Passing rubocop 2019-06-13 07:58:52 +00:00
Daniel O'Connor
f1ebc35e53 Rubocop fixes 2019-06-13 07:58:52 +00:00
Daniel O'Connor
28f262368b Rubocop fix 2019-06-13 07:58:52 +00:00
Daniel O'Connor
fedcaae08f Upgraded rubocop configuration 2019-06-13 07:58:52 +00:00
Brenda Wallace
331f568b4c upgrade rubocop 2019-06-13 07:58:52 +00:00
Brenda Wallace
6c49f1768c add extra click into spec 2019-06-13 19:51:18 +12:00
Brenda Wallace
740fdb3ec5 Merge remote-tracking branch 'origin/upgrade/bootstrap' into upgrade/bootstrap 2019-06-13 19:43:53 +12:00
Brenda Wallace
62fb1142b2 Merge branch 'dev' into upgrade/bootstrap 2019-06-13 17:53:51 +12:00
Daniel O'Connor
0bdddf8207 Merge pull request #1981 from Growstuff/dependabot/bundler/jsonapi-resources-0.9.8 
Bump jsonapi-resources from 0.9.7 to 0.9.8
 2019-06-13 14:49:28 +09:30
Daniel O'Connor
dcc10273ef Update search placeholder 2019-06-13 13:59:19 +09:30
Daniel O'Connor
347dfc3258 Apply similar layout to app/views/crops/index.html.haml 2019-06-13 13:56:53 +09:30
Daniel O'Connor
a26003940d Crop search result page - doubled breadcrumbs 2019-06-13 13:54:59 +09:30