mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-26 18:56:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,421 Commits 54 Branches 76 Tags
0e359bb3f17f56f50ceed70cb48cedb8db024ae3
Commit Graph

3063 Commits

Author SHA1 Message Date
Brenda Wallace
e9cbda13b3 Adding viewing own data 2019-04-23 10:44:36 +12:00
Brenda Wallace
0491820a35 Only show planted_at if it is set 2019-04-21 22:31:54 +12:00
Brenda Wallace
4312ef0047 FIX typo in view 2019-04-20 20:07:19 +12:00
Brenda Wallace
9ee3f514cd Adding trailing comma 
because codeclimate likes them
 2019-04-20 20:01:34 +12:00
Brenda Wallace
a2f9f2f6df Replace (revert back) to simple image_tag in photos#show 
so i don't need to update specs
 2019-04-20 19:56:23 +12:00
Brenda Wallace
e2f3723777 Remove 2019-04-20 15:14:43 +12:00
Brenda Wallace
fa9205a94e Remove ooops icons 2019-04-20 15:12:07 +12:00
Brenda Wallace
f86177e78f lint 2019-04-20 15:10:08 +12:00
Brenda Wallace
e41bc6c6f1 8 members 2019-04-20 15:06:59 +12:00
Brenda Wallace
9c01ef94ac Revert to previous code 
So i don't need to update lotsa specs
 2019-04-20 15:05:03 +12:00
Brenda Wallace
bf4c8a83e1 Update some planting show specs 2019-04-20 14:31:02 +12:00
Brenda Wallace
570c53318d Consistently using h3 2019-04-20 13:25:47 +12:00
Brenda Wallace
7c113f0e1c Back to using thumbnails 2019-04-20 10:01:18 +12:00
Brenda Wallace
e899634696 lint 2019-04-20 09:54:21 +12:00
Brenda Wallace
7ea13c40ed Isotope not needed for photo thumbnails 2019-04-20 09:54:02 +12:00
Brenda Wallace
54146a3a9f javascript lint 2019-04-20 09:47:19 +12:00
Brenda Wallace
b71df87ac3 better use of fullsize crop image 2019-04-20 09:40:31 +12:00
Brenda Wallace
03bdb45b2d Higher res photo, so it doesn't look pixelated 2019-04-20 09:36:18 +12:00
Brenda Wallace
94a2127c04 Tidy up small screen display 2019-04-20 09:35:59 +12:00
Brenda Wallace
837111f6dc Checks we have a planted_from before we pluralize it 2019-04-20 09:27:07 +12:00
Brenda Wallace
c66ee04690 Only suggest recording harvests if they planting isn't finished 2019-04-20 09:19:13 +12:00
Brenda Wallace
31c628e950 Put back our own progress bar 2019-04-20 09:18:52 +12:00
Brenda Wallace
27d12bf07e Isotope making nice layout on plantings#show 2019-04-20 09:09:07 +12:00
Brenda Wallace
89b4b3bee0 Use fas icons everywhere 2019-04-20 09:06:21 +12:00
Brenda Wallace
d4b487846d Fixed space in image name 2019-04-20 07:27:06 +12:00
Brenda Wallace
1eea251f95 Merge branch 'dev' into plantings-show 2019-04-19 10:39:26 +12:00
Brenda Wallace
32a88b4482 Merge remote-tracking branch 'origin/plantings-show' into plantings-show 2019-04-19 09:16:01 +12:00
Brenda Wallace
a2e2362594 Linter fix ups 2019-04-19 09:15:41 +12:00
Brenda Wallace
0ae33d9b03 Merge branch 'dev' into plantings-show 2019-04-13 21:02:56 +12:00
Brenda Wallace
e322c863b2 Removed unused arg to dbsearch 2019-04-13 10:20:33 +12:00
Brenda Wallace
174f54cb75 Linting 2019-04-13 10:13:36 +12:00
Brenda Wallace
347d751935 More plurals and misspellings in search specs 2019-04-13 10:03:18 +12:00
Brenda Wallace
fa1913c8b6 Split a method to reduce the complexity 2019-04-13 09:50:36 +12:00
Brenda Wallace
9683983f23 Merge branch 'dev' into feature/searchkick 2019-04-10 20:02:35 +12:00
Brenda Wallace
7ac410c499 varieties info on crops#show (#1848) 
* Tests for crop.photos
* More info on a crop's varieties, and parent
* Update spec for new crop varieties display
* Add varieties div wrapper, so test can find the area of the page
 2019-04-10 20:02:05 +12:00
Brenda Wallace
bd1a1c53f4 Removed unneeded rubocop disable 2019-04-08 21:59:44 +12:00
Brenda Wallace
ccb69c5f7d Style/lint tidy up models 2019-04-08 21:59:26 +12:00
Brenda Wallace
e165c77d64 Force autocomplete to json format 2019-04-08 21:39:20 +12:00
Brenda Wallace
74e6a7cf2f Rename @matches to @crops 2019-04-08 21:39:20 +12:00
Brenda Wallace
302e19776f code style fix up 2019-04-08 21:39:20 +12:00
Brenda Wallace
01a3654d41 Working without elastic search too 2019-04-08 21:39:20 +12:00
Brenda Wallace
77d1fc7347 Move crop searching specs from the crop model to the crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace
ca743e421d Add matching ES methods for when no elastic search configured 2019-04-08 21:39:20 +12:00
Brenda Wallace
f3ae1a8ec3 Fix dangerous sql warning 2019-04-08 21:39:20 +12:00
Brenda Wallace
789cffeca1 Eager loading 2019-04-08 21:39:20 +12:00
Brenda Wallace
150d44ad6f named arguments for search 2019-04-08 21:39:20 +12:00
Brenda Wallace
370747390a Add default pagination to crop search service 2019-04-08 21:39:20 +12:00
Brenda Wallace
61e0c2eb1d Swap elasticssearch for searchkick 2019-04-08 21:39:20 +12:00
Brenda Wallace
a58ce0f6a2 Tidy up mobile 2019-03-30 18:01:55 +13:00
Brenda Wallace
4d95130216 Move phtos to a gallery 2019-03-29 15:48:57 +13:00