mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-06 15:41:09 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,845 Commits 65 Branches 76 Tags
6325df25b87e00a5d2ebdab8dde94f10d17cc975
Commit Graph

3852 Commits

Author SHA1 Message Date
Brenda Wallace
6325df25b8 Make the month an int 2019-11-24 11:36:55 +13:00
Brenda Wallace
b8c1f10907 Merge remote-tracking branch 'origin/predict-perenial-harvest' into predict-perenial-harvest 2019-11-24 10:46:07 +13:00
Brenda Wallace
83f0182551 rubocop lint 2019-11-24 10:41:20 +13:00
Brenda Wallace
0f73c13622 Merge branch 'dev' into predict-perenial-harvest 2019-11-24 10:40:22 +13:00
Brenda Wallace
5b7de1ae7a Added location 2019-11-24 10:39:06 +13:00
Brenda Wallace
554adf234e Allow chaining on Harvest predictions method returns 2019-11-24 10:30:56 +13:00
Brenda Wallace
a8a522d09e rubocop style fix 2019-11-24 10:17:55 +13:00
Brenda Wallace
0bb4dbec10 Display of planting neighbours 2019-11-24 10:15:11 +13:00
Brenda Wallace
e40cca806c World neighbours 2019-11-24 09:44:35 +13:00
Brenda Wallace
70565c7202 show neighbouring plantings same crop 
also helps see where the prediction came from
 2019-11-24 09:43:25 +13:00
codefactor-io
a23963ba96 [CodeFactor] Apply fixes 2019-11-23 19:58:22 +00:00
Brenda Wallace
c0fabc7002 Reducing unnecesary and extra queries 2019-11-24 08:57:34 +13:00
Brenda Wallace
c3d626636b Added icons so sections line up 2019-11-24 08:49:00 +13:00
Brenda Wallace
1c2a88da55 Added lots of caching 2019-11-24 08:45:23 +13:00
Brenda Wallace
09a70c4742 Predict month of harvest on perennials 2019-11-23 22:21:36 +13:00
Brenda Wallace
cf0485c448 fix mobile display 2019-11-19 14:25:14 +13:00
Brenda Wallace
72e348cdf6 Fix up specs 2019-11-19 14:16:50 +13:00
Brenda Wallace
76ee0c1cd8 rubocop lint 2019-11-19 13:58:16 +13:00
Brenda Wallace
0c3149205b Put resources back into namespaces 2019-11-19 13:53:12 +13:00
Brenda Wallace
8fb4725f46 Merge remote-tracking branch 'upstream/dev' into api-docs 
Conflicts:
	app/resources/api/v1/planting_resource.rb
 2019-11-18 10:26:05 +13:00
Brenda Wallace
0823e971ed Tidy up indexes and add links to data/api 2019-11-18 10:23:07 +13:00
Brenda Wallace
4f8830676e Swagger docs 2019-11-18 10:15:06 +13:00
Brenda Wallace
818a980f6d Move jsonapi resources files 2019-11-18 10:11:53 +13:00
Brenda Wallace
7ea14bccfe Fix alt on img tag 2019-11-16 22:32:45 +13:00
Brenda Wallace
8d87f3c982 Remove console debug statement 2019-11-16 20:38:43 +13:00
Brenda Wallace
24f970f4f4 Added alt tag 2019-11-16 13:21:42 +13:00
Brenda Wallace
c87ae7be29 add photo to the map, if we have one 2019-11-16 13:20:38 +13:00
Brenda Wallace
df5b0499e4 Update spec for api resource 2019-11-16 13:05:40 +13:00
Brenda Wallace
535ddcdcff Added plantings to places map 2019-11-16 12:16:18 +13:00
Brenda Wallace
a437338961 Fix markers on crops#show map 2019-11-16 11:35:45 +13:00
Brenda Wallace
66fae333a9 Rename crops js file so it gets included correctly 
this crops.js.erb file was being ignored because a crops.coffee exists
 2019-11-16 11:21:40 +13:00
Brenda Wallace
2b7c21bf2e Fix marker on member map too 2019-11-16 11:16:53 +13:00
Brenda Wallace
f27cf0caf6 Added link to icon documentation 2019-11-16 11:11:41 +13:00
Brenda Wallace
df55a5b0a8 Add marker for leaflet maps, and use asset pipeline to serve file 2019-11-16 10:42:22 +13:00
Brenda Wallace
69d9e1e76e Merge pull request #2271 from Br3nda/jump-to-garden 
Link to jump to garden
 2019-11-15 12:16:39 +13:00
Brenda Wallace
cfef6f5eb2 Link to jump to garden 2019-11-15 11:47:32 +13:00
Brenda Wallace
75037c7e21 Order the garden names 2019-11-15 11:32:13 +13:00
ImgBotApp
be884ad1fb [ImgBot] Optimize images 
*Total -- 24.17kb -> 22.54kb (6.78%)

/app/assets/images/icons/timeline.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/finished.svg -- 2.00kb -> 1.78kb (11.09%)
/app/assets/images/icons/planting-add.svg -- 2.81kb -> 2.52kb (10.45%)
/app/assets/images/icons/seed-add.svg -- 4.21kb -> 3.91kb (7.07%)
/app/assets/images/icons/sprout-add.svg -- 3.81kb -> 3.58kb (6%)
/app/assets/images/icons/seeds.svg -- 3.45kb -> 3.29kb (4.69%)
/app/assets/images/icons/harvest-add.svg -- 4.98kb -> 4.78kb (3.9%)
/app/assets/images/icons/trade.svg -- 0.91kb -> 0.89kb (2.14%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2019-11-11 05:00:09 +00:00
Brenda Wallace
b8b579a5ba rubycop fix up 2019-11-11 17:45:37 +13:00
codefactor-io
e0ea039347 [CodeFactor] Apply fixes to commit a651f07 2019-11-11 04:42:30 +00:00
Brenda Wallace
a651f079d8 Simplify garden.name validation regexp 2019-11-11 17:41:46 +13:00
Brenda Wallace
cfaa18daaf Merge remote-tracking branch 'upstream/dev' into UTFGardenNames 2019-11-11 14:14:34 +13:00
Brenda Wallace
d0bee45c0c show all varieties (including grandchildren) 2019-11-01 21:33:43 +13:00
Brenda Wallace
b214f7ad8d linking existing plantings to their parent seeds 2019-11-01 02:23:14 +00:00
Brenda Wallace
2f2169f89a tidy up display of seeds 2019-10-28 22:12:08 +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
André Aubin
66045866b3 Switch to HTTPS for Gravatar urls 2019-10-24 23:51:52 +00:00
Brenda Wallace
9d232e26cb Update app/views/crops/_predictions.html.haml 2019-10-25 06:42:00 +13:00
Brenda Wallace
2d6d02d0b3 added in_weeks helper 2019-10-24 21:03:30 +13:00