mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-05 06:37:25 -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
feab98e962 removing dead code 2020-01-05 21:41:16 +13:00
Brenda Wallace
c6988e2189 Re-instate the plantings quick actions 2020-01-05 21:31:51 +13:00
Brenda Wallace
e6e020dbc9 oops 2020-01-05 20:55:51 +13:00
Brenda Wallace
b7e53daeba fixes to crop photos 2020-01-05 16:57:14 +13:00
Brenda Wallace
ebb8460e44 Merge branch 'dev' into cache/harvests 2020-01-05 16:56:47 +13:00
Daniel O'Connor
88f7f09a18 Merge pull request #2360 from Growstuff/dependabot/bundler/rack-protection-2.0.8.1 
Bump rack-protection from 2.0.7 to 2.0.8.1
 2020-01-05 03:12:09 +10:30
Daniel O'Connor
fbb3eff090 Merge pull request #2364 from simicic/GH-2361_optional_garden_type 
GH-2361 Optional garden type when editing garden
 2020-01-05 03:11:18 +10:30
codefactor-io
7e30b6b6e0 [CodeFactor] Apply fixes 2020-01-03 11:28:51 +00:00
Martina Simicic
ba04c44742 Make garden type optional when editing garden 2020-01-03 09:50:33 +01:00
Brenda Wallace
2e8625d6ff Reindex harvests before harvest feature spec 2020-01-02 21:10:35 +13:00
Brenda Wallace
6acfa2827b Merge branch 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2020-01-02 21:06:33 +13:00
Brenda Wallace
d757ec4fae Reindex crops, in crop browse feature spec 2020-01-02 21:06:27 +13:00
dependabot-preview[bot]
752b90ca55 Bump rack-protection from 2.0.7 to 2.0.8.1 
Bumps [rack-protection](https://github.com/sinatra/sinatra) from 2.0.7 to 2.0.8.1.
- [Release notes](https://github.com/sinatra/sinatra/releases)
- [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinatra/sinatra/compare/v2.0.7...v2.0.8.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-02 07:35:27 +00:00
Brenda Wallace
55411ec535 Merge branch 'dev' into cache/harvests 2020-01-02 20:33:36 +13:00
dependabot-preview[bot]
8360e4ac0f Bump bullet from 6.0.2 to 6.1.0 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.0.2...6.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-02 20:33:10 +13:00
Brenda Wallace
f27ac12563 don't pass photos to crops/_photos 2020-01-02 20:29:41 +13:00
Brenda Wallace
fb0d57c98f Merge branches 'cache/harvests' and 'cache/harvests' of github.com:Br3nda/growstuff into cache/harvests 2020-01-02 20:23:37 +13:00
Brenda Wallace
ff883db279 Revert "displays photos without hitting the database" 
This reverts commit 139574c9c0.
 2020-01-02 20:23:13 +13:00
dependabot-preview[bot]
e7cf50b2ca Merge pull request #2358 from Growstuff/dependabot/bundler/faraday-0.17.3 2020-01-02 03:17:38 +00:00
dependabot-preview[bot]
7c0d184d65 Bump faraday from 0.17.1 to 0.17.3 
Bumps [faraday](https://github.com/lostisland/faraday) from 0.17.1 to 0.17.3.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/master/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v0.17.1...v0.17.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-02 02:56:42 +00:00
dependabot-preview[bot]
f666b6d100 Merge pull request #2357 from Growstuff/dependabot/bundler/comfortable_mexican_sofa-2.0.19 2020-01-02 02:54:42 +00:00
dependabot-preview[bot]
b44b0a7a5f Bump comfortable_mexican_sofa from 2.0.18 to 2.0.19 
Bumps [comfortable_mexican_sofa](https://github.com/comfy/comfortable-mexican-sofa) from 2.0.18 to 2.0.19.
- [Release notes](https://github.com/comfy/comfortable-mexican-sofa/releases)
- [Commits](https://github.com/comfy/comfortable-mexican-sofa/compare/v2.0.18...v2.0.19)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-02 02:43:35 +00:00
Brenda Wallace
b556c4b8f4 Merge branch 'dev' into cache/harvests 2020-01-02 15:42:17 +13:00
Martina Simicic
1964b7ce2e Add myself to CONTRIBUTORS.md 2020-01-02 14:18:51 +13:00
Martina Simicic
9eb5fe7947 Use specific error for raise_error expectation 2020-01-02 14:18:51 +13:00
Brenda Wallace
e1b9381a03 Merge branch 'dev' into cache/harvests 2020-01-01 20:18:33 +13:00
Brenda Wallace
6017c04b5f don't check if post is liked by member, unless the member is signed in 2020-01-01 15:54:52 +13:00
Brenda Wallace
139574c9c0 displays photos without hitting the database 2020-01-01 14:15:04 +13:00
Brenda Wallace
8a1b8be0ef Load crops from search, without hitting the database 2020-01-01 13:47:25 +13:00
Brenda Wallace
d46883f39b don't query for photos that we never read 2020-01-01 12:32:23 +13:00
Brenda Wallace
41c90acbbc added missing liked flag to photos/card 2020-01-01 11:43:59 +13:00
Brenda Wallace
76e649a0a8 update likes controller spec for new params 2020-01-01 09:26:54 +13:00
Brenda Wallace
d541a4ea0a another frozen literal 2020-01-01 09:24:59 +13:00
Brenda Wallace
6e81f2966d fixed colouring of likes button 2020-01-01 09:24:47 +13:00
Brenda Wallace
c4d02edbd1 force reindex after a like 2020-01-01 09:24:24 +13:00
Brenda Wallace
b2738afdc2 fake reindexer on posts, so it doesn't throw errors 2020-01-01 08:42:18 +13:00
Brenda Wallace
e24ef32fe6 like spec, don't make so many photso 2020-01-01 08:41:34 +13:00
Brenda Wallace
36875b620c harvest search, fixed error when some data not set on model 2020-01-01 08:41:00 +13:00
Brenda Wallace
80038c7f42 set which parts of crop are searchable 2020-01-01 08:40:43 +13:00
Brenda Wallace
63ea6752fa likes reading from hash from elastic 2020-01-01 08:40:04 +13:00
Brenda Wallace
de3c4d0f62 likes found in controller by id and type of likeable 2020-01-01 08:39:27 +13:00
Brenda Wallace
e9ff6a4388 likes in the elastic search index during spec run 2020-01-01 08:39:08 +13:00
Brenda Wallace
54778d9884 Likes popuplating from elastic, no more extra look ups 2020-01-01 08:38:27 +13:00
Brenda Wallace
f76266a716 photos controller working with ES 2019-12-31 21:46:42 +13:00
Brenda Wallace
6bc0aa7194 Adding missing frozen literals 2019-12-31 21:03:34 +13:00
Brenda Wallace
676345815c tests for photos searching 2019-12-31 21:02:38 +13:00
Brenda Wallace
95654017d1 added frozen literals 2019-12-31 14:50:31 +13:00
Brenda Wallace
a3215d2555 Rubocop fixes 2019-12-31 14:47:15 +13:00
dependabot-preview[bot]
f348d7e6c5 Bump faker from 2.9.0 to 2.10.0 
Bumps [faker](https://github.com/faker-ruby/faker) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/faker-ruby/faker/releases)
- [Changelog](https://github.com/faker-ruby/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faker-ruby/faker/compare/v2.9.0...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 23:36:34 +00:00
dependabot-preview[bot]
1c0cb8e1e8 Bump selenium-webdriver from 3.142.6 to 3.142.7 
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium) from 3.142.6 to 3.142.7.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases)
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES)
- [Commits](https://github.com/SeleniumHQ/selenium/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-30 22:08:10 +00:00