mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-28 03:34:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,529 Commits 54 Branches 76 Tags
08caa2ed321810f3fa8d5f5e99078a872991efaf
Commit Graph

615 Commits

Author SHA1 Message Date
Awesome Code
132a961008 Auto corrected by following Lint Ruby RSpec/HookArgument 2020-03-04 00:37:36 +00:00
Awesome Code
4cbe6ca244 Auto corrected by following Lint Ruby RSpec/DescribedClass 2020-03-03 22:33:13 +00:00
Martina Simicic
b0a5223d97 Account for finished planting when counting days of life 2020-02-04 10:50:00 +13:00
codefactor-io
34ddf8e98f [CodeFactor] Apply fixes 2020-01-21 13:12:28 +13:00
Brenda Wallace
6cce74cf4d tests we find home page records for plantings 2020-01-12 09:52:47 +13:00
Brenda Wallace
709ca5a04f Fix seeds ES query 2020-01-11 23:10:33 +13:00
Brenda Wallace
c6988e2189 Re-instate the plantings quick actions 2020-01-05 21:31:51 +13:00
codefactor-io
7e30b6b6e0 [CodeFactor] Apply fixes 2020-01-03 11:28:51 +00:00
Brenda Wallace
e24ef32fe6 like spec, don't make so many photso 2020-01-01 08:41:34 +13:00
Brenda Wallace
676345815c tests for photos searching 2019-12-31 21:02:38 +13:00
Brenda Wallace
a3215d2555 Rubocop fixes 2019-12-31 14:47:15 +13:00
Brenda Wallace
c2b4c67077 crop compantion tests 2019-12-28 09:34:04 +13:00
Brenda Wallace
8bec2a277d Merge branch 'dev' into cache/harvests 2019-12-21 16:59:47 +13:00
Brenda Wallace
9c2beb304f show days of progress (#2344) 
* show days of progress
* Update planting model spec to use age_in_days
 2019-12-21 16:49:43 +13:00
codefactor-io
e8760f9c38 [CodeFactor] Apply fixes 2019-12-20 03:33:23 +00:00
Brenda Wallace
04fd1a343a Rubocop update (#2334) 
* Update rubocop config

* Rubocop update - for rubocop 0.77

* [CodeFactor] Apply fixes

* rubocop fixes

* [CodeFactor] Apply fixes to commit 2826c2e
 2019-12-16 22:35:33 +13:00
Brenda Wallace
34fcbffd24 Fix specs 2019-12-04 21:15:50 +13:00
Brenda
607eae2a43 Small improvements to crops controller to reduce query count 2019-12-04 21:02:33 +13:00
Brenda Wallace
8678a6dd8a Fix model spec 2019-12-04 20:59:56 +13:00
Brenda Wallace
e7c30ef448 Wrapped long lines 2019-11-24 12:18:04 +13:00
Brenda Wallace
2538b71225 Planting model spec for perenial harvests 2019-11-24 11:37:33 +13:00
Brenda Wallace
5793f26b6f stub tests 2019-11-24 08:41:12 +13:00
Brenda Wallace
1697f3e758 Update model spec for location 2019-11-16 13:07:38 +13: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
6a4158ae04 👭 Crop companions (#2176) 
* Crop companions
* Use a nil license to mean no licence
* dependent for crop->crop_companions relationship
* Fix crop detail spec
 2019-09-28 10:38:01 +12:00
Brenda Wallace
777408a6dc Merge branch 'dev' into UTFGardenNames 2019-08-29 13:53:04 +12:00
Brenda Wallace
756cf1fe3a Removing unused code in specs 2019-08-18 14:51:24 +12:00
Brenda Wallace
11ef0fb694 Removed test for unused method 2019-08-11 16:31:51 +12:00
Brenda Wallace
4f74b20565 Migrate from notifications to conversations without sending emails 2019-08-11 14:17:30 +12:00
Brenda Wallace
2a3563f9fd Migration from notifications to mailboxer 2019-08-11 13:37:56 +12:00
Brenda Wallace
f676054cd6 switch to member.discard 2019-08-10 16:09:57 +12:00
Brenda Wallace
b3807100d1 fixes email sending 2019-08-10 11:47:45 +12:00
Brenda Wallace
86540c3352 Removed feature plantings code and spec 
because it's not used
 2019-08-10 10:52:49 +12:00
Brenda Wallace
7d9cbe9bf7 Merge branch 'dev' into UTFGardenNames 2019-07-21 10:14:03 +12:00
Brenda Wallace
3cd67bcc9f Fix liked photo spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
efe14d43cb read photo from a harvest's planting 2019-07-15 11:58:46 +00:00
Brenda Wallace
99c119c07f fixed looking up photo counts in spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
60a510e73f tests the default photo changes when someone likes a photo 2019-07-15 11:58:46 +00:00
Brenda Wallace
b1ebf67960 added more possible photo associations in photo model spec 2019-07-15 11:58:46 +00:00
Brenda Wallace
32695e3241 photos behave like likeable 2019-07-15 11:58:46 +00:00
Brenda Wallace
2879979db4 tests that likes are deleted when their photo is deleted 2019-07-15 11:58:46 +00:00
Brenda Wallace
5e7445f770 Merge branch 'dev' into UTFGardenNames 2019-07-04 10:56:46 +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
2949abd6bf SEt subject of post in spec, so it matches the tests 2019-06-14 11:47:15 +12:00
codefactor-io
977ff7d174 [CodeFactor] Apply fixes 2019-06-08 05:20:29 +00:00
Brenda Wallace
9b8638a3b6 tests for plantings.active scope 2019-06-08 15:38:27 +12:00
Brenda Wallace
f5f5ecdea7 Merge remote-tracking branch 'upstream/dev' into material-merge 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.sass
	app/assets/stylesheets/plantings.sass
	app/views/crops/_thumbnail.html.haml
	app/views/crops/show.html.haml
	app/views/home/_members.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
	app/views/plantings/_descendants.html.haml
	app/views/plantings/show.html.haml
	app/views/seeds/_thumbnail.html.haml
	app/views/shared/_global_actions.html.haml
	spec/models/crop_spec.rb
 2019-04-21 11:27:27 +12:00
Brenda Wallace
7b56c7a6ab Merge branch 'dev' into UTFGardenNames 2019-04-20 20:17:52 +12:00
Brenda Wallace
85ba701045 Merge branch 'dev' into feature/searchkick 2019-04-17 12:35:09 +12:00